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

MusicBot/cogs/voice.py

@@ -39,7 +39,6 @@ class Voice(Cog, VoiceExtension):
 
     voice = discord.SlashCommandGroup("voice", "Команды, связанные с голосовым каналом.")
     queue = discord.SlashCommandGroup("queue", "Команды, связанные с очередью треков.")
-    track = discord.SlashCommandGroup("track", "Команды, связанные с треками в голосовом канале.")
 
     def __init__(self, bot: discord.Bot):
         VoiceExtension.__init__(self, bot)
@@ -48,7 +47,7 @@ class Voice(Cog, VoiceExtension):
     @Cog.listener()
     async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState) -> None:
         gid = member.guild.id
-        guild = await self.db.get_guild(gid, projection={'current_menu': 1, 'always_allow_menu': 1})
+        guild = await self.db.get_guild(gid, projection={'current_menu': 1})
 
         channel = after.channel or before.channel
         if not channel:
@@ -87,18 +86,7 @@ class Voice(Cog, VoiceExtension):
                 'repeat': False, 'shuffle': False, 'is_stopped': True
             })
             vc.stop()
-        elif len(channel.members) > 2 and not guild['always_allow_menu']:
-            if guild['current_menu']:
-                logging.info(f"[VOICE] Disabling current menu for guild {gid} due to multiple members")
 
-                await self.db.update(gid, {'current_menu': None, 'repeat': False, 'shuffle': False, 'vibing': False})
-                try:
-                    message = await channel.fetch_message(guild['current_menu'])
-                    await message.delete()
-                    await channel.send("Меню отключено из-за большого количества участников.", delete_after=15)
-                except (discord.NotFound, discord.Forbidden):
-                    pass
-            
             if member.guild.id in menu_views:
                 menu_views[member.guild.id].stop()
                 del menu_views[member.guild.id]
@@ -138,7 +126,7 @@ class Voice(Cog, VoiceExtension):
         if not guild_id:
             return
 
-        guild = await self.db.get_guild(guild_id, projection={'votes': 1, 'current_track': 1})
+        guild = await self.db.get_guild(guild_id)
         votes = guild['votes']
 
         if str(payload.message_id) not in votes:
@@ -158,54 +146,9 @@ class Voice(Cog, VoiceExtension):
         required_votes = 2 if total_members <= 5 else 4 if total_members <= 10 else 6 if total_members <= 15 else 9
         if len(vote_data['positive_votes']) >= required_votes:
             logging.info(f"[VOICE] Enough positive votes for message {payload.message_id}")
-
-            if vote_data['action'] == 'next':
-                logging.info(f"[VOICE] Skipping track for message {payload.message_id}")
-
-                title = await self.next_track(payload)
-                await message.clear_reactions()
-                await message.edit(content=f"Сейчас играет: **{title}**!", delete_after=15)
-                del votes[str(payload.message_id)]
-
-            elif vote_data['action'] == 'add_track':
-                logging.info(f"[VOICE] Adding track for message {payload.message_id}")
-                await message.clear_reactions()
-
-                track = vote_data['vote_content']
-                if not track:
-                    logging.info(f"[VOICE] Recieved empty vote context for message {payload.message_id}")
-                    return
-
-                await self.db.modify_track(guild_id, track, 'next', 'append')
-
-                if guild['current_track']:
-                    await message.edit(content=f"Трек был добавлен в очередь!", delete_after=15)
-                else:
-                    title = await self.next_track(payload)
-                    await message.edit(content=f"Сейчас играет: **{title}**!", delete_after=15)
-
-                del votes[str(payload.message_id)]
-
-            elif vote_data['action'] in ('add_album', 'add_artist', 'add_playlist'):
-                logging.info(f"[VOICE] Performing '{vote_data['action']}' action for message {payload.message_id}")
-
-                await message.clear_reactions()
-                
-                tracks = vote_data['vote_content']
-                if not tracks:
-                    logging.info(f"[VOICE] Recieved empty vote context for message {payload.message_id}")
-                    return
-
-                await self.db.update(guild_id, {'is_stopped': False})
-                await self.db.modify_track(guild_id, tracks, 'next', 'extend')
-
-                if guild['current_track']:
-                    await message.edit(content=f"Контент был добавлен в очередь!", delete_after=15)
-                else:
-                    title = await self.next_track(payload)
-                    await message.edit(content=f"Сейчас играет: **{title}**!", delete_after=15)
-
-                del votes[str(payload.message_id)]
+            await message.delete()
+            await self.proccess_vote(payload, guild, channel, vote_data)
+            del votes[str(payload.message_id)]
 
         elif len(vote_data['negative_votes']) >= required_votes:
             logging.info(f"[VOICE] Enough negative votes for message {payload.message_id}")
@@ -224,9 +167,10 @@ class Voice(Cog, VoiceExtension):
         guild_id = payload.guild_id
         if not guild_id:
             return
+
         guild = await self.db.get_guild(guild_id, projection={'votes': 1})
         votes = guild['votes']
-        
+
         if str(payload.message_id) not in votes:
             logging.info(f"[VOICE] Message {payload.message_id} not found in votes")
             return
@@ -257,38 +201,33 @@ class Voice(Cog, VoiceExtension):
 
         await self.db.update(guild_id, {'votes': votes})
     
-    @voice.command(name="menu", description="Создать меню проигрывателя. Доступно только если вы единственный в голосовом канале.")
+    @voice.command(name="menu", description="Создать или обновить меню проигрывателя.")
     async def menu(self, ctx: discord.ApplicationContext) -> None:
         logging.info(f"[VOICE] Menu command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-        if not await self.voice_check(ctx):
-            return
-
-        guild = await self.db.get_guild(ctx.guild.id, projection={'always_allow_menu': 1})
-        channel = cast(discord.VoiceChannel, ctx.channel)
-
-        if len(channel.members) > 2 and not guild['always_allow_menu']:
-            logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
-            await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
-            return
-
-        await self.send_menu_message(ctx)
+        if await self.voice_check(ctx):
+            await self.send_menu_message(ctx)
 
     @voice.command(name="join", description="Подключиться к голосовому каналу, в котором вы сейчас находитесь.")
     async def join(self, ctx: discord.ApplicationContext) -> None:
         logging.info(f"[VOICE] Join command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
 
         member = cast(discord.Member, ctx.author)
-        guild = await self.db.get_guild(ctx.guild.id, projection={'allow_connect': 1})
+        guild = await self.db.get_guild(ctx.guild.id, projection={'allow_change_connect': 1})
+        vc = await self.get_voice_client(ctx)
 
-        if not member.guild_permissions.manage_channels and not guild['allow_connect']:
+        if not member.guild_permissions.manage_channels and not guild['allow_change_connect']:
             response_message = "❌ У вас нет прав для выполнения этой команды."
-        elif (vc := await self.get_voice_client(ctx)) and vc.is_connected():
+        elif vc and vc.is_connected():
             response_message = "❌ Бот уже находится в голосовом канале. Выключите его с помощью команды /voice leave."
         elif isinstance(ctx.channel, discord.VoiceChannel):
-            await ctx.channel.connect(timeout=15)
-            response_message = "Подключение успешно!"
+            try:
+                await ctx.channel.connect()
+            except TimeoutError:
+                response_message = "❌ Не удалось подключиться к голосовому каналу."
+            else:
+                response_message = "✅ Подключение успешно!"
         else:
-            response_message = "❌ Вы должны отправить команду в голосовом канале."
+            response_message = "❌ Вы должны отправить команду в чате голосового канала."
 
         logging.info(f"[VOICE] Join command response: {response_message}")
         await ctx.respond(response_message, delete_after=15, ephemeral=True)
@@ -298,22 +237,22 @@ class Voice(Cog, VoiceExtension):
         logging.info(f"[VOICE] Leave command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
 
         member = cast(discord.Member, ctx.author)
-        guild = await self.db.get_guild(ctx.guild.id, projection={'allow_connect': 1})
-        
-        if not member.guild_permissions.manage_channels and not guild['allow_connect']:
+        guild = await self.db.get_guild(ctx.guild.id, projection={'allow_change_connect': 1})
+
+        if not member.guild_permissions.manage_channels and not guild['allow_change_connect']:
             logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to execute leave command in guild {ctx.guild.id}")
             await ctx.respond("❌ У вас нет прав для выполнения этой команды.", delete_after=15, ephemeral=True)
             return
 
         if (vc := await self.get_voice_client(ctx)) and await self.voice_check(ctx) and vc.is_connected:
-            res = await self.stop_playing(ctx, full=True)
-            if res:
-                await vc.disconnect(force=True)
-                await ctx.respond("Отключение успешно!", delete_after=15, ephemeral=True)
-                logging.info(f"[VOICE] Successfully disconnected from voice channel in guild {ctx.guild.id}")
-                return
-            else:
+            res = await self.stop_playing(ctx, vc=vc, full=True)
+            if not res:
                 await ctx.respond("❌ Не удалось отключиться.", delete_after=15, ephemeral=True)
+                return
+
+            await vc.disconnect(force=True)
+            await ctx.respond("✅ Отключение успешно!", delete_after=15, ephemeral=True)
+            logging.info(f"[VOICE] Successfully disconnected from voice channel in guild {ctx.guild.id}")
         else:
             await ctx.respond("❌ Бот не подключен к голосовому каналу.", delete_after=15, ephemeral=True)
 
@@ -329,7 +268,7 @@ class Voice(Cog, VoiceExtension):
             await ctx.respond("❌ У вас нет прав для выполнения этой команды.", delete_after=15, ephemeral=True)
         elif await self.voice_check(ctx):
             await self.db.update(ctx.guild.id, {'previous_tracks': [], 'next_tracks': []})
-            await ctx.respond("Очередь и история сброшены.", delete_after=15, ephemeral=True)
+            await ctx.respond("✅ Очередь и история сброшены.", delete_after=15, ephemeral=True)
             logging.info(f"[VOICE] Queue and history cleared in guild {ctx.guild.id}")
 
     @queue.command(description="Получить очередь треков.")
@@ -346,55 +285,7 @@ class Voice(Cog, VoiceExtension):
 
         logging.info(f"[VOICE] Queue embed sent to user {ctx.author.id} in guild {ctx.guild.id}")
 
-    @track.command(description="Приостановить текущий трек.")
-    async def pause(self, ctx: discord.ApplicationContext) -> None:
-        logging.info(f"[VOICE] Pause command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-
-        member = cast(discord.Member, ctx.author)
-        channel = cast(discord.VoiceChannel, ctx.channel)
-
-        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
-            logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to pause the track in guild {ctx.guild.id}")
-            await ctx.respond("❌ Вы не можете остановить воспроизведение, пока в канале находятся другие пользователи.", delete_after=15, ephemeral=True)
-
-        elif await self.voice_check(ctx) and (vc := await self.get_voice_client(ctx)) is not None:
-            if not vc.is_paused():
-                vc.pause()
-
-                menu = await self.db.get_current_menu(ctx.guild.id)
-                if menu:
-                    await self.update_menu_full(ctx, menu)
-
-                logging.info(f"[VOICE] Track paused in guild {ctx.guild.id}")
-                await ctx.respond("Воспроизведение приостановлено.", delete_after=15, ephemeral=True)
-            else:
-                logging.info(f"[VOICE] Track already paused in guild {ctx.guild.id}")
-                await ctx.respond("Воспроизведение уже приостановлено.", delete_after=15, ephemeral=True)
-
-    @track.command(description="Возобновить текущий трек.")
-    async def resume(self, ctx: discord.ApplicationContext) -> None:
-        logging.info(f"[VOICE] Resume command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-
-        member = cast(discord.Member, ctx.author)
-        channel = cast(discord.VoiceChannel, ctx.channel)
-
-        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
-            logging.info(f"[VOICE] User {ctx.author.id} does not have permissions to resume the track in guild {ctx.guild.id}")
-            await ctx.respond("❌ Вы не можете остановить воспроизведение, пока в канале находятся другие пользователи.", delete_after=15, ephemeral=True)
-
-        elif await self.voice_check(ctx) and (vc := await self.get_voice_client(ctx)):
-            if vc.is_paused():
-                vc.resume()
-                menu = await self.db.get_current_menu(ctx.guild.id)
-                if menu:
-                    await self.update_menu_full(ctx, menu)
-                logging.info(f"[VOICE] Track resumed in guild {ctx.guild.id}")
-                await ctx.respond("Воспроизведение восстановлено.", delete_after=15, ephemeral=True)
-            else:
-                logging.info(f"[VOICE] Track is not paused in guild {ctx.guild.id}")
-                await ctx.respond("Воспроизведение не на паузе.", delete_after=15, ephemeral=True)
-
-    @track.command(description="Прервать проигрывание, удалить историю, очередь и текущий плеер.")
+    @voice.command(description="Прервать проигрывание, удалить историю, очередь и текущий плеер.")
     async def stop(self, ctx: discord.ApplicationContext) -> None:
         logging.info(f"[VOICE] Stop command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
 
@@ -408,115 +299,10 @@ class Voice(Cog, VoiceExtension):
         elif await self.voice_check(ctx):
             res = await self.stop_playing(ctx, full=True)
             if res:
-                await ctx.respond("Воспроизведение остановлено.", delete_after=15, ephemeral=True)
+                await ctx.respond("✅ Воспроизведение остановлено.", delete_after=15, ephemeral=True)
             else:
                 await ctx.respond("❌ Произошла ошибка при остановке воспроизведения.", delete_after=15, ephemeral=True)
 
-    @track.command(description="Переключиться на следующую песню в очереди.")
-    async def next(self, ctx: discord.ApplicationContext) -> None:
-        logging.info(f"[VOICE] Next command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-        if not await self.voice_check(ctx):
-            return
-
-        gid = ctx.guild.id
-        guild = await self.db.get_guild(gid, projection={'next_tracks': 1, 'vote_next_track': 1})
-        if not guild['next_tracks']:
-            logging.info(f"[VOICE] No tracks in queue in guild {ctx.guild.id}")
-            await ctx.respond("❌ Нет песенен в очереди.", delete_after=15, ephemeral=True)
-            return
-
-        member = cast(discord.Member, ctx.author)
-        channel = cast(discord.VoiceChannel, ctx.channel)
-
-        if guild['vote_next_track'] and len(channel.members) > 2 and not member.guild_permissions.manage_channels:
-            logging.info(f"[VOICE] User {ctx.author.id} started vote to skip track in guild {ctx.guild.id}")
-
-            message = cast(discord.Interaction, await ctx.respond(f"{member.mention} хочет пропустить текущий трек.\n\nВыполнить переход?", delete_after=30))
-            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': 'next',
-                    'vote_content': None
-                }
-            )
-        else:
-            logging.info(f"[VOICE] Skipping vote for user {ctx.author.id} in guild {ctx.guild.id}")
-
-            await self.db.update(gid, {'is_stopped': False})
-            title = await self.next_track(ctx)
-            await ctx.respond(f"Сейчас играет: **{title}**!", delete_after=15)
-
-    @track.command(description="Добавить трек в избранное или убрать, если он уже там.")
-    async def like(self, ctx: discord.ApplicationContext) -> None:
-        logging.info(f"[VOICE] Like command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-
-        if not await self.voice_check(ctx):
-            return
-
-        vc = await self.get_voice_client(ctx)
-        if not vc or not vc.is_playing:
-            logging.info(f"[VOICE] No current track in {ctx.guild.id}")
-            await ctx.respond("Нет воспроизводимого трека.", delete_after=15, ephemeral=True)
-            return
-
-        result = await self.react_track(ctx, 'like')
-        if not result[0]:
-            logging.warning(f"Like command failed for user {ctx.author.id} in guild {ctx.guild.id}")
-            await ctx.respond("❌ Операция не удалась.", delete_after=15, ephemeral=True)
-        elif result[1] == 'removed':
-            logging.info(f"[VOICE] Track removed from favorites for user {ctx.author.id} in guild {ctx.guild.id}")
-            await ctx.respond("Трек был удалён из избранного.", delete_after=15, ephemeral=True)
-        elif result[1] == 'added':
-            logging.info(f"[VOICE] Track added to favorites for user {ctx.author.id} in guild {ctx.guild.id}")
-            await ctx.respond(f"Трек **{result}** был добавлен в избранное.", delete_after=15, ephemeral=True)
-        else:
-            raise ValueError(f"Unknown like command result: '{result}'")
-    
-    @track.command(name='vibe', description="Запустить Мою Волну по текущему треку.")
-    async def track_vibe(self, ctx: discord.ApplicationContext) -> None:
-        logging.info(f"[VOICE] Vibe (track) command invoked by user {ctx.author.id} in guild {ctx.guild.id}")
-        if not await self.voice_check(ctx):
-            return
-
-        guild = await self.db.get_guild(ctx.guild.id, projection={'always_allow_menu': 1, 'current_track': 1, 'current_menu': 1, 'vibing': 1})
-        channel = cast(discord.VoiceChannel, ctx.channel)
-
-        if len(channel.members) > 2 and not guild['always_allow_menu']:
-            logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
-            await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
-            return
-
-        if guild['vibing']:
-            logging.info(f"[VOICE] Action declined: vibing is already enabled in guild {ctx.guild.id}")
-            await ctx.respond("❌ Моя Волна уже включена. Используйте /track stop, чтобы остановить воспроизведение.", ephemeral=True)
-            return
-
-        if not guild['current_track']:
-            logging.info(f"[VOICE] No current track in {ctx.guild.id}")
-            await ctx.respond("❌ Нет воспроизводимого трека.", ephemeral=True)
-            return
-
-        feedback = await self.update_vibe(ctx, 'track', guild['current_track']['id'])
-        if not feedback:
-            await ctx.respond("❌ Операция не удалась. Возможно, у вес нет подписки на Яндекс Музыку.", ephemeral=True)
-            return
-
-        if not guild['current_menu']:
-            await self.send_menu_message(ctx, disable=True)
-
-        next_track = await self.db.get_track(ctx.guild_id, 'next')
-        if next_track:
-            await self._play_next_track(ctx, next_track)
-
     @voice.command(name='vibe', description="Запустить Мою Волну.")
     @discord.option(
         "запрос",
@@ -531,18 +317,14 @@ class Voice(Cog, VoiceExtension):
         if not await self.voice_check(ctx):
             return
 
-        guild = await self.db.get_guild(ctx.guild.id, projection={'always_allow_menu': 1, 'current_menu': 1, 'vibing': 1})
-        channel = cast(discord.VoiceChannel, ctx.channel)
+        guild = await self.db.get_guild(ctx.guild.id, projection={'current_menu': 1, 'vibing': 1})
 
-        if len(channel.members) > 2 and not guild['always_allow_menu']:
-            logging.info(f"[VOICE] Action declined: other members are present in the voice channel")
-            await ctx.respond("❌ Вы не единственный в голосовом канале.", ephemeral=True)
-            return
         if guild['vibing']:
             logging.info(f"[VOICE] Action declined: vibing is already enabled in guild {ctx.guild.id}")
-            await ctx.respond("❌ Моя Волна уже включена. Используйте /track stop, чтобы остановить воспроизведение.", ephemeral=True)
+            await ctx.respond("❌ Моя Волна уже включена. Используйте /track stop, чтобы остановить воспроизведение.", delete_after=15, ephemeral=True)
             return
 
+        await ctx.defer(invisible=False)
         if name:
             token = await users_db.get_ym_token(ctx.user.id)
             if not token:
@@ -564,27 +346,29 @@ class Voice(Cog, VoiceExtension):
 
             if not content:
                 logging.debug(f"[VOICE] Station {name} not found")
-                await ctx.respond("❌ Станция не найдена.", ephemeral=True)
+                await ctx.respond("❌ Станция не найдена.", delete_after=15, ephemeral=True)
                 return
 
             _type, _id = content.ad_params.other_params.split(':') if content.ad_params else (None, None)
 
             if not _type or not _id:
                 logging.debug(f"[VOICE] Station {name} has no ad params")
-                await ctx.respond("❌ Станция не найдена.", ephemeral=True)
+                await ctx.respond("❌ Станция не найдена.", delete_after=15, ephemeral=True)
                 return
-
-            feedback = await self.update_vibe(ctx, _type, _id)
         else:
-            feedback = await self.update_vibe(ctx, 'user', 'onyourwave')
+            _type, _id = 'user', 'onyourwave'
+
+        feedback = await self.update_vibe(ctx, _type, _id)
 
         if not feedback:
-            await ctx.respond("❌ Операция не удалась. Возможно, у вес нет подписки на Яндекс Музыку.", ephemeral=True)
+            await ctx.respond("❌ Операция не удалась. Возможно, у вес нет подписки на Яндекс Музыку.", delete_after=15, ephemeral=True)
             return
 
-        if not guild['current_menu']:
+        if guild['current_menu']:
+            await ctx.respond("✅ Моя Волна включена.", delete_after=15, ephemeral=True)
+        else:
             await self.send_menu_message(ctx, disable=True)
 
         next_track = await self.db.get_track(ctx.guild_id, 'next')
         if next_track:
-            await self._play_next_track(ctx, next_track)
+            await self._play_track(ctx, next_track)