sigonasr2/miyu-bot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

create generic reaction message implementation

Browse Source
This commit is contained in:
qwewqa 2020-12-21 21:00:47 -05:00
parent b9403a85a3
commit d8a1e17a2f
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
miyu_bot/commands/cogs/music.py
View File

@ -9,6 +9,7 @@ from discord.ext import commands
from main import asset_manager
from miyu_bot.commands.common.fuzzy_matching import romanize, FuzzyMap
from miyu_bot.commands.common.reaction_message import make_tabbed_message
class Music(commands.Cog):
@ -18,7 +19,7 @@ class Music(commands.Cog):
self.music = self.get_music()
def get_music(self):
music = FuzzyMap(lambda m: m.is_released)
music = FuzzyMap(lambda m: m.is_released and not m.is_tutorial)
for m in asset_manager.music_master.values():
music[f'{m.name} {m.special_unit_name}'] = m
return music
@ -123,21 +124,7 @@ class Music(commands.Cog):
790050636225052694,
]
for emote_id in reaction_emote_ids:
await message.add_reaction(self.bot.get_emoji(emote_id))
def check(rxn, usr):
return usr == ctx.author and rxn.emoji.id in reaction_emote_ids
while True:
try:
reaction, user = await self.bot.wait_for('reaction_add', timeout=60, check=check)
self.logger.debug(f'Reaction {reaction} from user {user}.')
emote_index = reaction_emote_ids.index(reaction.emoji.id)
await message.edit(embed=embeds[emote_index])
await message.remove_reaction(reaction, user)
except asyncio.TimeoutError:
break
asyncio.ensure_future(make_tabbed_message(ctx, message, reaction_emote_ids, embeds))
def get_chart_embed_info(self, song):
embeds = []

32
miyu_bot/commands/common/reaction_message.py Normal file
View File

@ -0,0 +1,32 @@
import asyncio
from typing import List, Callable, Awaitable
from discord import Message, Embed
from discord.ext.commands import Context
async def make_tabbed_message(ctx: Context, message: Message, emote_ids: List[int], embeds: List[Embed], timeout=300):
async def callback(index, _ctx, _message):
await message.edit(embed=embeds[index])
await make_reaction_message(ctx, message, emote_ids, callback, timeout)
async def make_reaction_message(ctx: Context, message: Message, emote_ids: List[int],
callback: Callable[[int, Context, Message], Awaitable[None]], timeout = 300):
for emote_id in emote_ids:
await message.add_reaction(ctx.bot.get_emoji(emote_id))
def check(rxn, usr):
return usr == ctx.author and rxn.emoji.id in emote_ids and rxn.message.id == message.id
while True:
try:
reaction, user = await ctx.bot.wait_for('reaction_add', timeout=timeout, check=check)
emote_index = emote_ids.index(reaction.emoji.id)
await callback(emote_index, ctx, message)
await message.remove_reaction(reaction, user)
except asyncio.TimeoutError:
for emote_id in emote_ids:
await message.remove_reaction(ctx.bot.get_emoji(emote_id), ctx.bot.user)
break