deadcxap/YandexMusicDiscordBot
1
0
Fork 0
mirror of https://github.com/deadcxap/YandexMusicDiscordBot.git synced 2026-01-10 02:41:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Rewrite RawReactionActionEvent checks.

Browse Source
This commit is contained in:
Lemon4ksan
2025-02-21 19:29:59 +03:00
parent 2ecd3f5ae8
commit c20ff314c7
4 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
MusicBot/cogs/utils/voice_extension.py
View File

@@ -27,7 +27,7 @@ class VoiceExtension:
"""Send menu message to the channel and delete old menu message if exists. Return True if sent. """Send menu message to the channel and delete old menu message if exists. Return True if sent.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
disable (bool, optional): Disable menu message. Defaults to False. disable (bool, optional): Disable menu message. Defaults to False.
Raises: Raises:
@@ -96,7 +96,7 @@ class VoiceExtension:
Reset `current_menu` field in the database if not found. Reset `current_menu` field in the database if not found.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
menu_mid (int): Id of the menu message to fetch. menu_mid (int): Id of the menu message to fetch.
Returns: Returns:
@@ -142,7 +142,7 @@ class VoiceExtension:
"""Update embed and view of the current menu message. Return True if updated. """Update embed and view of the current menu message. Return True if updated.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
menu_mid (int): Id of the menu message to update. Defaults to None. menu_mid (int): Id of the menu message to update. Defaults to None.
menu_message (discord.Message | None): Message to update. If None, fetches menu from channel using `menu_mid`. Defaults to None. menu_message (discord.Message | None): Message to update. If None, fetches menu from channel using `menu_mid`. Defaults to None.
button_callback (bool, optional): Should be True if the function is being called from button callback. Defaults to False. button_callback (bool, optional): Should be True if the function is being called from button callback. Defaults to False.
@@ -270,7 +270,7 @@ class VoiceExtension:
User's vibe has type `user` and id `onyourwave`. User's vibe has type `user` and id `onyourwave`.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
type (str): Type of the item. type (str): Type of the item.
id (str | int): ID of the item. id (str | int): ID of the item.
viber_id (int | None, optional): ID of the user who started vibe. If None, uses user id in context. Defaults to None. viber_id (int | None, optional): ID of the user who started vibe. If None, uses user id in context. Defaults to None.
@@ -399,7 +399,7 @@ class VoiceExtension:
"""Return voice client for the given guild id. Return None if not present. """Return voice client for the given guild id. Return None if not present.
Args: Args:
ctx (ApplicationContext | Interaction): Command context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Command context.
Returns: Returns:
(discord.VoiceClient | None): Voice client or None. (discord.VoiceClient | None): Voice client or None.
@@ -441,7 +441,7 @@ class VoiceExtension:
Send vibe feedback for playing track if vibing. Should be called when voice requirements are met. Send vibe feedback for playing track if vibing. Should be called when voice requirements are met.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
track (Track): Track to play. track (Track): Track to play.
vc (discord.VoiceClient | None): Voice client. vc (discord.VoiceClient | None): Voice client.
menu_message (discord.Message | None): Menu message. If None, fetches menu from channel using message id from database. Defaults to None. menu_message (discord.Message | None): Menu message. If None, fetches menu from channel using message id from database. Defaults to None.
@@ -472,10 +472,13 @@ class VoiceExtension:
if not isinstance(ctx, RawReactionActionEvent) and ctx.channel: if not isinstance(ctx, RawReactionActionEvent) and ctx.channel:
channel = cast(discord.VoiceChannel, ctx.channel) channel = cast(discord.VoiceChannel, ctx.channel)
elif self.bot and isinstance(ctx, RawReactionActionEvent):
channel = cast(discord.VoiceChannel, self.bot.get_channel(ctx.channel_id))
if not retry: if not retry:
return await self.play_track(ctx, track, vc=vc, button_callback=button_callback, retry=True) return await self.play_track(ctx, track, vc=vc, button_callback=button_callback, retry=True)
logging.error(f"[VC_EXT] Failed to download track '{track.title}'")
await channel.send(f"😔 Не удалось загрузить трек. Попробуйте сбросить меню.", delete_after=15) await channel.send(f"😔 Не удалось загрузить трек. Попробуйте сбросить меню.", delete_after=15)
return None return None
@@ -500,6 +503,10 @@ class VoiceExtension:
logging.error(f"[VC_EXT] Error while playing track '{track.title}': {e}") logging.error(f"[VC_EXT] Error while playing track '{track.title}': {e}")
if not isinstance(ctx, RawReactionActionEvent): if not isinstance(ctx, RawReactionActionEvent):
await ctx.respond(f"❌ Не удалось проиграть трек. Попробуйте сбросить меню.", delete_after=15, ephemeral=True) await ctx.respond(f"❌ Не удалось проиграть трек. Попробуйте сбросить меню.", delete_after=15, ephemeral=True)
elif self.bot:
channel = cast(discord.VoiceChannel, self.bot.get_channel(ctx.channel_id))
await channel.send(f"❌ Не удалось проиграть трек. Попробуйте сбросить меню.", delete_after=15)
return None
logging.info(f"[VC_EXT] Playing track '{track.title}'") logging.info(f"[VC_EXT] Playing track '{track.title}'")
await self.db.update(gid, {'is_stopped': False}) await self.db.update(gid, {'is_stopped': False})
@@ -568,7 +575,7 @@ class VoiceExtension:
Doesn't change track if stopped. Stop playing if tracks list is empty. Doesn't change track if stopped. Stop playing if tracks list is empty.
Args: Args:
ctx (ApplicationContext | Interaction): Context ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context
vc (discord.VoiceClient, optional): Voice client. vc (discord.VoiceClient, optional): Voice client.
after (bool, optional): Whether the function is being called by the after callback. Defaults to False. after (bool, optional): Whether the function is being called by the after callback. Defaults to False.
menu_message (discord.Message | None): Menu message. If None, fetches menu from channel using message id from database. Defaults to None. menu_message (discord.Message | None): Menu message. If None, fetches menu from channel using message id from database. Defaults to None.
@@ -609,9 +616,14 @@ class VoiceExtension:
if after and guild['current_menu']: if after and guild['current_menu']:
await self.update_menu_view(ctx, menu_message=menu_message, disable=True) await self.update_menu_view(ctx, menu_message=menu_message, disable=True)
if guild['vibing'] and guild['current_track'] and not isinstance(ctx, discord.RawReactionActionEvent): if guild['vibing'] and guild['current_track']:
if not await self._my_vibe_feedback(ctx, guild, user, client, after=after): if not await self._my_vibe_feedback(ctx, guild, user, client, after=after):
await ctx.respond("❌ Что-то пошло не так. Попробуйте снова.", ephemeral=True) if not isinstance(ctx, RawReactionActionEvent):
await ctx.respond("❌ Что-то пошло не так. Попробуйте снова.", ephemeral=True)
elif self.bot:
channel = cast(discord.VoiceChannel, self.bot.get_channel(ctx.channel_id))
await channel.send("❌ Что-то пошло не так. Попробуйте снова.", delete_after=15)
return None return None
if guild['repeat'] and after: if guild['repeat'] and after:
@@ -624,7 +636,7 @@ class VoiceExtension:
logging.debug("[VC_EXT] Getting next track from queue") logging.debug("[VC_EXT] Getting next track from queue")
next_track = await self.db.get_track(gid, 'next') next_track = await self.db.get_track(gid, 'next')
if not next_track and guild['vibing'] and not isinstance(ctx, discord.RawReactionActionEvent): if not next_track and guild['vibing']:
logging.debug("[VC_EXT] No next track found, generating new vibe") logging.debug("[VC_EXT] No next track found, generating new vibe")
if not user['vibe_type'] or not user['vibe_id']: if not user['vibe_type'] or not user['vibe_id']:
logging.warning("[VC_EXT] No vibe type or vibe id found in user data") logging.warning("[VC_EXT] No vibe type or vibe id found in user data")
@@ -659,7 +671,7 @@ class VoiceExtension:
Return track title on success. Return track title on success.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
button_callback (bool, optional): Whether the command was called by a button interaction. Defaults to False. button_callback (bool, optional): Whether the command was called by a button interaction. Defaults to False.
Returns: Returns:
@@ -696,7 +708,7 @@ class VoiceExtension:
"""Get liked tracks. Return list of tracks on success. Return None if no token found. """Get liked tracks. Return list of tracks on success. Return None if no token found.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
Returns: Returns:
(list[Track] | None): List of tracks or None. (list[Track] | None): List of tracks or None.
@@ -779,7 +791,7 @@ class VoiceExtension:
"""Initialize Yandex Music client. Return client on success. Return None if no token found and respond to the context. """Initialize Yandex Music client. Return client on success. Return None if no token found and respond to the context.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
token (str | None, optional): Token. Fetched from database if not provided. Defaults to None. token (str | None, optional): Token. Fetched from database if not provided. Defaults to None.
Returns: Returns:
@@ -989,6 +1001,7 @@ class VoiceExtension:
"""Send vibe start feedback to Yandex Music. Return True on success. """Send vibe start feedback to Yandex Music. Return True on success.
Args: Args:
ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
track (Track): Track. track (Track): Track.
uid (int): User ID. uid (int): User ID.
@@ -1037,6 +1050,9 @@ class VoiceExtension:
logging.info(f"[VOICE] Failed to init YM client for user {user['_id']}") logging.info(f"[VOICE] Failed to init YM client for user {user['_id']}")
if not isinstance(ctx, RawReactionActionEvent): if not isinstance(ctx, RawReactionActionEvent):
await ctx.respond("❌ Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True) await ctx.respond("❌ Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
elif self.bot:
channel = cast(discord.VoiceChannel, self.bot.get_channel(ctx.channel_id))
await channel.send("❌ Что-то пошло не так. Попробуйте позже.", delete_after=15)
return False return False
track = guild['current_track'] track = guild['current_track']
@@ -1055,7 +1071,7 @@ class VoiceExtension:
async def _my_vibe_feedback( async def _my_vibe_feedback(
self, self,
ctx: ApplicationContext | Interaction, ctx: ApplicationContext | Interaction | RawReactionActionEvent,
guild: ExplicitGuild, guild: ExplicitGuild,
user: ExplicitUser, user: ExplicitUser,
client: YMClient, client: YMClient,
@@ -1066,7 +1082,7 @@ class VoiceExtension:
This is called when a user skips a track or when a track finishes and not when a user stops the player. This is called when a user skips a track or when a track finishes and not when a user stops the player.
Args: Args:
ctx (ApplicationContext | Interaction): Context. ctx (ApplicationContext | Interaction | RawReactionActionEvent): Context.
guild (ExplicitGuild): Guild. guild (ExplicitGuild): Guild.
user (ExplicitUser): User. user (ExplicitUser): User.
client (YMClient): Yandex Music client. client (YMClient): Yandex Music client.

10
MusicBot/cogs/voice.py
View File

@@ -93,7 +93,7 @@ class Voice(Cog, VoiceExtension):
@Cog.listener() @Cog.listener()
async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None: async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent) -> None:
logging.info(f"[VOICE] Reaction added by user {payload.user_id} in channel {payload.channel_id}") logging.debug(f"[VOICE] Reaction added by user {payload.user_id} in channel {payload.channel_id}")
if not self.typed_bot.user or not payload.member: if not self.typed_bot.user or not payload.member:
return return
@@ -160,7 +160,7 @@ class Voice(Cog, VoiceExtension):
@Cog.listener() @Cog.listener()
async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None: async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent) -> None:
logging.info(f"[VOICE] Reaction removed by user {payload.user_id} in channel {payload.channel_id}") logging.debug(f"[VOICE] Reaction removed by user {payload.user_id} in channel {payload.channel_id}")
if not self.typed_bot.user: if not self.typed_bot.user:
return return
@@ -267,7 +267,7 @@ class Voice(Cog, VoiceExtension):
channel = cast(discord.VoiceChannel, ctx.channel) channel = cast(discord.VoiceChannel, ctx.channel)
if len(channel.members) > 2 and not member.guild_permissions.manage_channels: if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
logging.info(f"Starting vote for stopping playback in guild {ctx.guild.id}") logging.info(f"Starting vote for clearing queue in guild {ctx.guild.id}")
response_message = f"{member.mention} хочет очистить историю прослушивания и очередь треков.\n\n Выполнить действие?." response_message = f"{member.mention} хочет очистить историю прослушивания и очередь треков.\n\n Выполнить действие?."
message = cast(discord.Interaction, await ctx.respond(response_message, delete_after=60)) message = cast(discord.Interaction, await ctx.respond(response_message, delete_after=60))
@@ -406,7 +406,7 @@ class Voice(Cog, VoiceExtension):
channel = cast(discord.VoiceChannel, ctx.channel) channel = cast(discord.VoiceChannel, ctx.channel)
if len(channel.members) > 2 and not member.guild_permissions.manage_channels: if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
logging.info(f"Starting vote for stopping playback in guild {ctx.guild.id}") logging.info(f"Starting vote for starting vibe in guild {ctx.guild.id}")
if _type == 'user' and _id == 'onyourwave': if _type == 'user' and _id == 'onyourwave':
station = "Моя Волна" station = "Моя Волна"
@@ -418,7 +418,7 @@ class Voice(Cog, VoiceExtension):
return return
response_message = f"{member.mention} хочет запустить станцию **{station}**.\n\n Выполнить действие?" response_message = f"{member.mention} хочет запустить станцию **{station}**.\n\n Выполнить действие?"
message = cast(discord.WebhookMessage, await ctx.respond(response_message, delete_after=60)) message = cast(discord.WebhookMessage, await ctx.respond(response_message))
await message.add_reaction('✅') await message.add_reaction('✅')
await message.add_reaction('❌') await message.add_reaction('❌')

4
MusicBot/ui/find.py
View File

@@ -88,9 +88,9 @@ class PlayButton(Button, VoiceExtension):
raise ValueError(f"Unknown item type: '{type(self.item).__name__}'") raise ValueError(f"Unknown item type: '{type(self.item).__name__}'")
if guild['vote_add'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels: if guild['vote_add'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels:
logging.debug(f"Starting vote for '{action}' (from PlayButton callback)") logging.info(f"Starting vote for '{action}' (from PlayButton callback)")
message = cast(discord.Interaction, await interaction.respond(vote_message, delete_after=30)) message = cast(discord.Interaction, await interaction.respond(vote_message, delete_after=60))
response = await message.original_response() response = await message.original_response()
await response.add_reaction('✅') await response.add_reaction('✅')

4
MusicBot/ui/menu.py
View File

@@ -322,7 +322,7 @@ class MyVibeSelect(Select, VoiceExtension):
custom_id = interaction.custom_id custom_id = interaction.custom_id
if custom_id not in ('diversity', 'mood', 'lang'): if custom_id not in ('diversity', 'mood', 'lang'):
logging.warning(f'[MENU] Unknown custom_id: {custom_id}') logging.error(f'[MENU] Unknown custom_id: {custom_id}')
return return
if not interaction.data: if not interaction.data:
@@ -335,7 +335,7 @@ class MyVibeSelect(Select, VoiceExtension):
'favorite', 'popular', 'discover', 'default', 'favorite', 'popular', 'discover', 'default',
'not-russian', 'russian', 'without-words', 'any' 'not-russian', 'russian', 'without-words', 'any'
): ):
logging.warning(f'[MENU] Unknown data_value: {data_values}') logging.error(f'[MENU] Unknown data_value: {data_values}')
return return
logging.info(f"[MENU] Settings option '{custom_id}' updated to '{data_values[0]}'") logging.info(f"[MENU] Settings option '{custom_id}' updated to '{data_values[0]}'")