impr: Enforce menu view, vote improvement and bug fixes.

MusicBot/ui/find.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Any, Literal, cast
+from typing import cast
 
 import discord
 from yandex_music import Track, Album, Artist, Playlist
@@ -27,40 +27,39 @@ class PlayButton(Button, VoiceExtension):
             return
 
         gid = interaction.guild.id
-        guild = await self.db.get_guild(gid, projection={'current_track': 1, 'current_menu': 1, 'vote_add_track': 1, 'vote_add_album': 1, 'vote_add_artist': 1, 'vote_add_playlist': 1})
+        guild = await self.db.get_guild(gid, projection={'current_track': 1, 'current_menu': 1, 'vote_add': 1})
         channel = cast(discord.VoiceChannel, interaction.channel)
         member = cast(discord.Member, interaction.user)
-        action: Literal['add_track', 'add_album', 'add_artist', 'add_playlist']
 
         if isinstance(self.item, Track):
             tracks = [self.item]
             action = 'add_track'
             vote_message = f"{member.mention} хочет добавить трек **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
-            response_message = f"Трек **{self.item.title}** был добавлен в очередь."
+            response_message = f"✅ Трек **{self.item.title}** был добавлен в очередь."
 
         elif isinstance(self.item, Album):
             album = await self.item.with_tracks_async()
             if not album or not album.volumes:
                 logging.debug("[FIND] Failed to fetch album tracks in PlayButton callback")
-                await interaction.respond("Не удалось получить треки альбома.", ephemeral=True)
+                await interaction.respond("❌ Не удалось получить треки альбома.", ephemeral=True)
                 return
 
             tracks = [track for volume in album.volumes for track in volume]
             action = 'add_album'
             vote_message = f"{member.mention} хочет добавить альбом **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
-            response_message = f"Альбом **{self.item.title}** был добавлен в очередь."
+            response_message = f"✅ Альбом **{self.item.title}** был добавлен в очередь."
 
         elif isinstance(self.item, Artist):
             artist_tracks = await self.item.get_tracks_async()
             if not artist_tracks:
                 logging.debug("[FIND] Failed to fetch artist tracks in PlayButton callback")
-                await interaction.respond("Не удалось получить треки артиста.", ephemeral=True)
+                await interaction.respond("❌ Не удалось получить треки артиста.", ephemeral=True)
                 return
 
             tracks = artist_tracks.tracks.copy()
             action = 'add_artist'
             vote_message = f"{member.mention} хочет добавить треки от **{self.item.name}** в очередь.\n\n Голосуйте за добавление."
-            response_message = f"Песни артиста **{self.item.name}** были добавлены в очередь."
+            response_message = f"✅ Песни артиста **{self.item.name}** были добавлены в очередь."
 
         elif isinstance(self.item, Playlist):
             short_tracks = await self.item.fetch_tracks_async()
@@ -72,7 +71,7 @@ class PlayButton(Button, VoiceExtension):
             tracks = [cast(Track, short_track.track) for short_track in short_tracks]
             action = 'add_playlist'
             vote_message = f"{member.mention} хочет добавить плейлист **{self.item.title}** в очередь.\n\n Голосуйте за добавление."
-            response_message = f"Плейлист **{self.item.title}** был добавлен в очередь."
+            response_message = f"✅ Плейлист **{self.item.title}** был добавлен в очередь."
 
         elif isinstance(self.item, list):
             tracks = self.item.copy()
@@ -83,12 +82,12 @@ class PlayButton(Button, VoiceExtension):
 
             action = 'add_playlist'
             vote_message = f"{member.mention} хочет добавить плейлист **Мне Нравится** в очередь.\n\n Голосуйте за добавление."
-            response_message = f"Плейлист **«Мне нравится»** был добавлен в очередь."
+            response_message = f"✅ Плейлист **«Мне нравится»** был добавлен в очередь."
 
         else:
             raise ValueError(f"Unknown item type: '{type(self.item).__name__}'")
 
-        if guild.get(f'vote_{action}') 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)")
 
             message = cast(discord.Interaction, await interaction.respond(vote_message, delete_after=30))
@@ -108,26 +107,28 @@ class PlayButton(Button, VoiceExtension):
                     'vote_content': [track.to_dict() for track in tracks]
                 }
             )
+            return
+
+        logging.debug(f"[FIND] Skipping vote for '{action}'")
+
+        if guild['current_menu']:
+            await interaction.respond(response_message, delete_after=15)
         else:
-            logging.debug(f"[FIND] Skipping vote for '{action}' (from PlayButton callback)")
+            await self.send_menu_message(interaction, disable=True)
 
-            current_menu = await self.get_menu_message(interaction, guild['current_menu']) if guild['current_menu'] else None
+        if guild['current_track'] is not None:
+            logging.debug(f"[FIND] Adding tracks to queue")
+            await self.db.modify_track(gid, tracks, 'next', 'extend')
+        else:
+            logging.debug(f"[FIND] Playing track")
+            track = tracks.pop(0)
+            await self.db.modify_track(gid, tracks, 'next', 'extend')
+            await self.play_track(interaction, track)
 
-            if guild['current_track'] is not None:
-                logging.debug(f"[FIND] Adding tracks to queue (from PlayButton callback)")
-                await self.db.modify_track(gid, tracks, 'next', 'extend')
-            else:
-                logging.debug(f"[FIND] Playing track (from PlayButton callback)")
-                track = tracks.pop(0)
-                await self.db.modify_track(gid, tracks, 'next', 'extend')
-                await self.play_track(interaction, track)
-                response_message = f"Сейчас играет: **{track.title}**!"
-
-            if current_menu and interaction.message:
-                logging.debug(f"[FIND] Deleting interaction message {interaction.message.id}: current player {current_menu.id} found")
-                await interaction.message.delete()
-            else:
-                await interaction.respond(response_message, delete_after=15)
+        if interaction.message:
+            await interaction.message.delete()
+        else:
+            logging.warning(f"[FIND] Interaction message is None")
 
 class MyVibeButton(Button, VoiceExtension):
     def __init__(self, item: Track | Album | Artist | Playlist | list[Track], *args, **kwargs):
@@ -145,14 +146,6 @@ class MyVibeButton(Button, VoiceExtension):
             logging.warning(f"[VIBE] Guild ID is None in button callback")
             return
 
-        guild = await self.db.get_guild(gid)
-        channel = cast(discord.VoiceChannel, interaction.channel)
-
-        if len(channel.members) > 2 and not guild['always_allow_menu']:
-            logging.info(f"[VIBE] Button callback declined: other members are present in the voice channel")
-            await interaction.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
-            return
-
         track_type_map = {
             Track: 'track', Album: 'album', Artist: 'artist', Playlist: 'playlist', list: 'user'
         }
@@ -178,7 +171,7 @@ class MyVibeButton(Button, VoiceExtension):
 
         next_track = await self.db.get_track(gid, 'next')
         if next_track:
-            await self._play_next_track(interaction, next_track)
+            await self._play_track(interaction, next_track)
 
 class ListenView(View):
     def __init__(self, item: Track | Album | Artist | Playlist | list[Track], *items: Item, timeout: float | None = 360, disable_on_timeout: bool = True):
@@ -217,3 +210,4 @@ class ListenView(View):
             return await super().on_timeout()
         except discord.NotFound:
             pass
+        self.stop()

MusicBot/ui/menu.py

@@ -2,7 +2,7 @@ import logging
 from typing import Self, cast
 
 from discord.ui import View, Button, Item, Select
-from discord import VoiceChannel, ButtonStyle, Interaction, ApplicationContext, RawReactionActionEvent, Embed, ComponentType, SelectOption
+from discord import VoiceChannel, ButtonStyle, Interaction, ApplicationContext, RawReactionActionEvent, Embed, ComponentType, SelectOption, Member
 
 import yandex_music.exceptions
 from yandex_music import TrackLyrics, Playlist, ClientAsync as YMClient
@@ -13,14 +13,14 @@ class ToggleButton(Button, VoiceExtension):
         super().__init__(*args, **kwargs)
         VoiceExtension.__init__(self, None)
     
-    async def callback(self, interaction: Interaction):
+    async def callback(self, interaction: Interaction) -> None:
         callback_type = interaction.custom_id
         if callback_type not in ('repeat', 'shuffle'):
             raise ValueError(f"Invalid callback type: '{callback_type}'")
         
         logging.info(f'[MENU] {callback_type.capitalize()} button callback')
         
-        if not (gid := interaction.guild_id):
+        if not (gid := interaction.guild_id) or not interaction.user:
             logging.warning('[MENU] Failed to get guild ID.')
             await interaction.respond("❌ Что-то пошло не так. Попробуйте снова.", delete_after=15, ephemeral=True)
             return
@@ -29,9 +29,36 @@ class ToggleButton(Button, VoiceExtension):
             return
 
         guild = await self.db.get_guild(gid)
+        member = cast(Member, interaction.user)
+        channel = cast(VoiceChannel, interaction.channel)
+
+        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
+            logging.info(f"[MENU] User {interaction.user.id} started vote to pause/resume track in guild {gid}")
+            
+            action = "выключить" if guild[callback_type] else "включить"
+            task = "перемешивание треков" if callback_type == 'shuffle' else "повтор трека"
+            message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {action} {task}.\n\nВыполнить действие?", delete_after=60))
+            response = await message.original_response()
+
+            await response.add_reaction('✅')
+            await response.add_reaction('❌')
+
+            await self.db.update_vote(
+                gid,
+                response.id,
+                {
+                    'positive_votes': list(),
+                    'negative_votes': list(),
+                    'total_members': len(channel.members),
+                    'action': callback_type,
+                    'vote_content': None
+                }
+            )
+            return
+        
         await self.db.update(gid, {callback_type: not guild[callback_type]})
 
-        if not await self.update_menu_view(interaction, guild, button_callback=True):
+        if not await self.update_menu_view(interaction, button_callback=True):
             await interaction.respond("❌ Что-то пошло не так. Попробуйте снова.", delete_after=15, ephemeral=True)
 
 class PlayPauseButton(Button, VoiceExtension):
@@ -44,9 +71,39 @@ class PlayPauseButton(Button, VoiceExtension):
         if not await self.voice_check(interaction, check_vibe_privilage=True):
             return
 
+        if not (gid := interaction.guild_id) or not interaction.user:
+            logging.warning('[MENU] Failed to get guild ID or user.')
+            return
+        
         if not (vc := await self.get_voice_client(interaction)) or not interaction.message:
             return
 
+        member = cast(Member, interaction.user)
+        channel = cast(VoiceChannel, interaction.channel)
+
+        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
+            logging.info(f"[MENU] User {interaction.user.id} started vote to pause/resume track in guild {gid}")
+            
+            task = "приостановить" if vc.is_playing() else "возобновить"
+            message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {task} проигрывание.\n\nВыполнить действие?", delete_after=60))
+            response = await message.original_response()
+
+            await response.add_reaction('✅')
+            await response.add_reaction('❌')
+
+            await self.db.update_vote(
+                gid,
+                response.id,
+                {
+                    'positive_votes': list(),
+                    'negative_votes': list(),
+                    'total_members': len(channel.members),
+                    'action': "play/pause",
+                    'vote_content': None
+                }
+            )
+            return
+        
         try:
             embed = interaction.message.embeds[0]
         except IndexError:
@@ -67,23 +124,61 @@ class SwitchTrackButton(Button, VoiceExtension):
         super().__init__(*args, **kwargs)
         VoiceExtension.__init__(self, None)
     
-    async def callback(self, interaction: Interaction):
+    async def callback(self, interaction: Interaction) -> None:
         callback_type = interaction.custom_id
         if callback_type not in ('next', 'previous'):
             raise ValueError(f"Invalid callback type: '{callback_type}'")
-        
+
+        if not (gid := interaction.guild_id) or not interaction.user:
+            logging.warning(f"[MENU] {callback_type.capitalize()} track button callback without guild id or user")
+            return
+
         logging.info(f'[MENU] {callback_type.capitalize()} track button callback')
 
         if not await self.voice_check(interaction, check_vibe_privilage=True):
             return
 
+        tracks_type = callback_type + '_tracks'
+        guild = await self.db.get_guild(gid, projection={tracks_type: 1, 'vote_switch_track': 1})
+
+        if not guild[tracks_type]:
+            logging.info(f"[MENU] No tracks in '{tracks_type}' list in guild {gid}")
+            await interaction.respond(f"❌ Нет треков в {'очереди' if callback_type == 'next' else 'истории'}.", delete_after=15, ephemeral=True)
+            return
+
+        member = cast(Member, interaction.user)
+        channel = cast(VoiceChannel, interaction.channel)
+
+        if guild['vote_switch_track'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels:
+            logging.info(f"[MENU] User {interaction.user.id} started vote to skip track in guild {gid}")
+
+            task = "пропустить текущий трек" if callback_type == 'next' else "вернуться к предыдущему треку"
+            message = cast(Interaction, await interaction.respond(f"{member.mention} хочет {task}.\n\nВыполнить переход?", delete_after=60))
+            response = await message.original_response()
+
+            await response.add_reaction('✅')
+            await response.add_reaction('❌')
+
+            await self.db.update_vote(
+                gid,
+                response.id,
+                {
+                    'positive_votes': list(),
+                    'negative_votes': list(),
+                    'total_members': len(channel.members),
+                    'action': callback_type,
+                    'vote_content': None
+                }
+            )
+            return
+
         if callback_type == 'next':
             title = await self.next_track(interaction, button_callback=True)
         else:
-            title = await self.prev_track(interaction, button_callback=True)
+            title = await self.previous_track(interaction, button_callback=True)
 
         if not title:
-            await interaction.respond(f"❌ Нет треков в очереди.", delete_after=15, ephemeral=True)
+            await interaction.respond(f"❌ Что-то пошло не так. Попробуйте позже.", delete_after=15, ephemeral=True)
 
 class ReactionButton(Button, VoiceExtension):
     def __init__(self, *args, **kwargs):
@@ -103,16 +198,32 @@ class ReactionButton(Button, VoiceExtension):
         if not (vc := await self.get_voice_client(interaction)) or not vc.is_playing:
             await interaction.respond("❌ Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
 
+        channel = cast(VoiceChannel, interaction.channel)
         res = await self.react_track(interaction, callback_type)
 
         if callback_type == 'like' and res[0]:
             await self._update_menu_views_dict(interaction)
             await interaction.edit(view=menu_views[gid])
+            await interaction.respond(
+                f"✅ Трек был {'добавлен в понравившиеся.' if res[1] == 'added' else 'удалён из понравившихся.'}",
+                delete_after=15, ephemeral=True
+            )
+
         elif callback_type == 'dislike' and res[0]:
-            await self.next_track(interaction, vc=vc, button_callback=True)
+
+            if len(channel.members) == 2 and not await self.next_track(interaction, vc=vc, button_callback=True):
+                await interaction.respond("✅ Воспроизведение приостановлено. Нет треков в очереди.", delete_after=15)
+
+            await self._update_menu_views_dict(interaction)
+            await interaction.edit(view=menu_views[gid])
+            await interaction.respond(
+                f"✅ Трек был {'добавлен в дизлайки.' if res[1] == 'added' else 'удалён из дизлайков.'}",
+                delete_after=15, ephemeral=True
+            )
+
         else:
-            logging.debug(f"[VC_EXT] Failed to {callback_type} track")
-            await interaction.respond("❌ Операция не удалась. Попробуйте позже.")
+            logging.debug(f"[VC_EXT] Failed to get {callback_type} tracks")
+            await interaction.respond("❌ Операция не удалась. Попробуйте позже.", delete_after=15, ephemeral=True)
 
 class LyricsButton(Button, VoiceExtension):
     def __init__(self, **kwargs):
@@ -192,7 +303,7 @@ class MyVibeButton(Button, VoiceExtension):
         if next_track:
             # Need to avoid additional feedback.
             # TODO: Make it more elegant
-            await self._play_next_track(interaction, next_track, button_callback=True)
+            await self._play_track(interaction, next_track, button_callback=True)
 
 class MyVibeSelect(Select, VoiceExtension):
     def __init__(self, *args,  **kwargs):
@@ -214,23 +325,23 @@ class MyVibeSelect(Select, VoiceExtension):
             logging.warning(f'[MENU] Unknown custom_id: {custom_id}')
             return
 
-        if not interaction.data or 'values' not in interaction.data:
+        if not interaction.data:
             logging.warning('[MENU] No data in select callback')
             return
         
-        data_value = interaction.data['values'][0]
-        if data_value not in (
+        data_values = cast(list[str] | None, interaction.data.get('values'))
+        if not data_values or data_values[0] not in (
             'fun', 'active', 'calm', 'sad', 'all',
             'favorite', 'popular', 'discover', 'default',
             'not-russian', 'russian', 'without-words', 'any'
         ):
-            logging.warning(f'[MENU] Unknown data_value: {data_value}')
+            logging.warning(f'[MENU] Unknown data_value: {data_values}')
             return
 
-        logging.info(f"[MENU] Settings option '{custom_id}' updated to {data_value}")
-        await self.users_db.update(interaction.user.id, {f'vibe_settings.{custom_id}': data_value})
+        logging.info(f"[MENU] Settings option '{custom_id}' updated to '{data_values[0]}'")
+        await self.users_db.update(interaction.user.id, {f'vibe_settings.{custom_id}': data_values[0]})
         
-        view = MyVibeSettingsView(interaction)
+        view = await MyVibeSettingsView(interaction).init()
         view.disable_all_items()
         await interaction.edit(view=view)
 
@@ -330,10 +441,15 @@ class AddToPlaylistSelect(Select, VoiceExtension):
             logging.warning('[MENU] No data in select callback')
             return
 
-        data = interaction.data['values'][0].split(';')
-        logging.debug(f"[MENU] Add to playlist select callback: {data}")
+        data_values = cast(list[str] | None, interaction.data.get('values'))
+        logging.debug(f"[MENU] Add to playlist select callback: {data_values}")
 
-        playlist = cast(Playlist, await self.ym_client.users_playlists(kind=data[0], user_id=data[1]))
+        if not data_values:
+            logging.warning('[MENU] No data in select callback')
+            return
+
+        kind, user_id = data_values[0].split(';')
+        playlist = cast(Playlist, await self.ym_client.users_playlists(kind=kind, user_id=user_id))
         current_track = await self.db.get_track(interaction.guild_id, 'current')
 
         if not current_track:
@@ -362,14 +478,19 @@ class AddToPlaylistButton(Button, VoiceExtension):
             return
 
         client = await self.init_ym_client(interaction)
-        if not client or not client.me or not client.me.account or not client.me.account.uid:
-            await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', ephemeral=True)
+        if not client:
+            await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', delete_after=15, ephemeral=True)
             return
 
         if not (vc := await self.get_voice_client(interaction)) or not vc.is_playing:
             await interaction.respond("❌ Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
             return
 
+        playlists = await client.users_playlists_list()
+        if not playlists:
+            await interaction.respond('❌ У вас нет плейлистов.', delete_after=15, ephemeral=True)
+            return
+
         view = View(
             AddToPlaylistSelect(
                 client,
@@ -379,7 +500,7 @@ class AddToPlaylistButton(Button, VoiceExtension):
                     SelectOption(
                         label=playlist.title or "Без названия",
                         value=f"{playlist.kind or "-1"};{playlist.uid}"
-                    ) for playlist in await client.users_playlists_list(client.me.account.uid)
+                    ) for playlist in playlists
                 ]
             )
         )
@@ -427,10 +548,9 @@ class MenuView(View, VoiceExtension):
         self.add_item(self.next_button)
         self.add_item(self.shuffle_button)
         
-        if not isinstance(self.ctx, RawReactionActionEvent) and len(cast(VoiceChannel, self.ctx.channel).members) > 2:
-            self.dislike_button.disabled = True
-        elif likes and current_track and str(current_track['id']) in [str(like.id) for like in likes]:
-            self.like_button.style = ButtonStyle.success
+        if not isinstance(self.ctx, RawReactionActionEvent) and len(cast(VoiceChannel, self.ctx.channel).members) == 2:
+            if likes and current_track and str(current_track['id']) in [str(like.id) for like in likes]:
+                self.like_button.style = ButtonStyle.success
 
         if not current_track:
             self.lyrics_button.disabled = True
@@ -444,7 +564,7 @@ class MenuView(View, VoiceExtension):
         self.add_item(self.dislike_button)
         self.add_item(self.lyrics_button)
         self.add_item(self.add_to_playlist_button)
-        
+
         if self.guild['vibing']:
             self.add_item(self.vibe_settings_button)
         else:
@@ -469,3 +589,4 @@ class MenuView(View, VoiceExtension):
                 logging.debug('[MENU] Successfully deleted menu message')
             else:
                 logging.debug('[MENU] No menu message found')
+            self.stop()