impr: Add missing votes.

MusicBot/ui/find.py

@@ -26,8 +26,11 @@ class PlayButton(Button, VoiceExtension):
         if not await self.voice_check(interaction):
             return
 
-        gid = interaction.guild.id
-        guild = await self.db.get_guild(gid, projection={'current_track': 1, 'current_menu': 1, 'vote_add': 1})
+        guild = await self.db.get_guild(interaction.guild.id, projection={'current_track': 1, 'current_menu': 1, 'vote_add': 1, 'vibing': 1})
+        if guild['vibing']:
+            await interaction.respond("❌ Нельзя добавлять треки в очередь, пока запущена волна.", ephemeral=True, delete_after=15)
+            return
+
         channel = cast(discord.VoiceChannel, interaction.channel)
         member = cast(discord.Member, interaction.user)
 
@@ -97,7 +100,7 @@ class PlayButton(Button, VoiceExtension):
             await response.add_reaction('❌')
 
             await self.db.update_vote(
-                gid,
+                interaction.guild.id,
                 response.id,
                 {
                     'positive_votes': list(),
@@ -116,11 +119,11 @@ class PlayButton(Button, VoiceExtension):
 
         if guild['current_track']:
             logging.debug(f"[FIND] Adding tracks to queue")
-            await self.db.modify_track(gid, tracks, 'next', 'extend')
+            await self.db.modify_track(interaction.guild.id, 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.db.modify_track(interaction.guild.id, tracks, 'next', 'extend')
             if not await self.play_track(interaction, track):
                 await interaction.respond('❌ Не удалось воспроизвести трек.', ephemeral=True, delete_after=15)
 
@@ -137,14 +140,18 @@ class MyVibeButton(Button, VoiceExtension):
     
     async def callback(self, interaction: discord.Interaction):
         logging.debug(f"[VIBE] Button callback for '{type(self.item).__name__}'")
+
         if not await self.voice_check(interaction):
             return
 
-        gid = interaction.guild_id
-        if not gid:
-            logging.warning(f"[VIBE] Guild ID is None in button callback")
+        if not interaction.guild_id or not interaction.user:
+            logging.warning(f"[VIBE] Guild ID or user is None in button callback")
             return
 
+        guild = await self.db.get_guild(interaction.guild_id, projection={'current_menu': 1, 'vibing': 1})
+        if guild['vibing']:
+            await interaction.respond('❌ Волна уже запущена. Остановите её с помощью команды /voice stop.', ephemeral=True, delete_after=15)
+            return
 
         track_type_map = {
             Track: 'track', Album: 'album', Artist: 'artist', Playlist: 'playlist', list: 'user'
@@ -162,14 +169,49 @@ class MyVibeButton(Button, VoiceExtension):
         else:
             _id = 'onyourwave'
 
-        guild = await self.db.get_guild(gid, projection={'current_menu': 1})
+        member = cast(discord.Member, interaction.user)
+        channel = cast(discord.VoiceChannel, interaction.channel)
+        
+        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
+            logging.info(f"Starting vote for starting vibe in guild {interaction.guild_id}")
+
+            match self.item:
+                case Track():
+                    response_message = f"{member.mention} хочет запустить волну по треку **{self.item['title']}**.\n\n Выполнить действие?"
+                case Album():
+                    response_message = f"{member.mention} хочет запустить волну по альбому **{self.item['title']}**.\n\n Выполнить действие?"
+                case Artist():
+                    response_message = f"{member.mention} хочет запустить волну по исполнителю **{self.item['name']}**.\n\n Выполнить действие?"
+                case Playlist():
+                    response_message = f"{member.mention} хочет запустить волну по плейлисту **{self.item['title']}**.\n\n Выполнить действие?"
+                case list():
+                    response_message = f"{member.mention} хочет запустить станцию **Моя Волна**.\n\n Выполнить действие?"
+
+            message = cast(discord.Interaction, await interaction.respond(response_message))
+            response = await message.original_response()
+
+            await response.add_reaction('✅')
+            await response.add_reaction('❌')
+            
+            await self.db.update_vote(
+                interaction.guild_id,
+                response.id,
+                {
+                    'positive_votes': list(),
+                    'negative_votes': list(),
+                    'total_members': len(channel.members),
+                    'action': 'vibe_station',
+                    'vote_content': [track_type_map[type(self.item)], _id, interaction.user.id]
+                }
+            )
+            return
+
         if not guild['current_menu'] and not await self.send_menu_message(interaction, disable=True):
             await interaction.respond('❌ Не удалось отправить сообщение.', ephemeral=True, delete_after=15)
 
         await self.update_vibe(interaction, track_type_map[type(self.item)], _id)
 
-        next_track = await self.db.get_track(gid, 'next')
-        if next_track:
+        if (next_track := await self.db.get_track(interaction.guild_id, 'next')):
             await self.play_track(interaction, next_track)
 
 class ListenView(View):
@@ -191,6 +233,7 @@ class ListenView(View):
             link_web = f"https://music.yandex.ru/playlist/{item.playlist_uuid}"
         elif isinstance(item, list):  # Can't open other person's likes
             self.add_item(PlayButton(item, label="Слушать в голосовом канале", style=ButtonStyle.gray))
+            self.add_item(MyVibeButton(item, label="Моя Волна", style=ButtonStyle.gray, emoji="🌊", row=1))
             return
 
         self.button1: Button = Button(label="Слушать в приложении", style=ButtonStyle.gray, url=link_app, row=0)

MusicBot/ui/menu.py

@@ -2,7 +2,10 @@ 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, Member, HTTPException
+from discord import (
+    Interaction, ApplicationContext, RawReactionActionEvent,
+    VoiceChannel, ButtonStyle, Embed, ComponentType, SelectOption, Member, HTTPException
+)
 
 import yandex_music.exceptions
 from yandex_music import TrackLyrics, Playlist, ClientAsync as YMClient
@@ -275,11 +278,45 @@ class MyVibeButton(Button, VoiceExtension):
         if not await self.voice_check(interaction):
             return
 
-        if not interaction.guild_id:
-            logging.warning('[MENU] No guild id in button callback')
+        if not interaction.guild_id or not interaction.user:
+            logging.warning('[MENU] No guild id or user in button callback')
             return
         
+        member = cast(Member, interaction.user)
+        channel = cast(VoiceChannel, interaction.channel)
         track = await self.db.get_track(interaction.guild_id, 'current')
+        
+        if len(channel.members) > 2 and not member.guild_permissions.manage_channels:
+            logging.info(f"Starting vote for starting vibe in guild {interaction.guild_id}")
+
+            if track:
+                response_message = f"{member.mention} хочет запустить волну по треку **{track['title']}**.\n\n Выполнить действие?"
+                _type = 'track'
+                _id = track['id']
+            else:
+                response_message = f"{member.mention} хочет запустить станцию **Моя Волна**.\n\n Выполнить действие?"
+                _type = 'user'
+                _id = 'onyourwave'
+
+            message = cast(Interaction, await interaction.respond(response_message))
+            response = await message.original_response()
+
+            await response.add_reaction('✅')
+            await response.add_reaction('❌')
+            
+            await self.db.update_vote(
+                interaction.guild_id,
+                response.id,
+                {
+                    'positive_votes': list(),
+                    'negative_votes': list(),
+                    'total_members': len(channel.members),
+                    'action': 'vibe_station',
+                    'vote_content': [_type, _id, interaction.user.id]
+                }
+            )
+            return
+
         if track:
             logging.info(f"[MENU] Playing vibe for track '{track["id"]}'")
             res = await self.update_vibe(
@@ -460,18 +497,32 @@ class AddToPlaylistSelect(Select, VoiceExtension):
         if not current_track:
             return
 
+        tracks = [track.id for track in playlist.tracks]
+        track_in_playlist = current_track['id'] in tracks
+        
+        if track_in_playlist:
+            index = tracks.index(current_track['id'])
+            res = await self.ym_client.users_playlists_delete_track(
+                kind=f"{playlist.kind}",
+                from_=index,
+                to=index + 1,
+                revision=playlist.revision or 1
+            )
+        else:
             res = await self.ym_client.users_playlists_insert_track(
                 kind=f"{playlist.kind}",
                 track_id=current_track['id'],
                 album_id=current_track['albums'][0]['id'],
-            revision=playlist.revision or 1,
-            user_id=f"{playlist.uid}"
+                revision=playlist.revision or 1
             )
 
-        if res:
-            await interaction.respond('✅ Добавлено в плейлист', delete_after=15, ephemeral=True)
-        else:
+        if not res:
             await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', delete_after=15, ephemeral=True)
+        elif track_in_playlist:
+            await interaction.respond('🗑 Трек был удалён из плейлиста.', delete_after=15, ephemeral=True)
+        else:
+            await interaction.respond('📩 Трек был добавлен в плейлист.', delete_after=15, ephemeral=True)
+            
 
 class AddToPlaylistButton(Button, VoiceExtension):
     def __init__(self, **kwargs):
@@ -482,6 +533,11 @@ class AddToPlaylistButton(Button, VoiceExtension):
         if not await self.voice_check(interaction) or not interaction.guild_id:
             return
 
+        current_track = await self.db.get_track(interaction.guild_id, 'current')
+        if not current_track:
+            await interaction.respond('❌ Нет воспроизводимого трека.', delete_after=15, ephemeral=True)
+            return
+
         client = await self.init_ym_client(interaction)
         if not client:
             await interaction.respond('❌ Что-то пошло не так. Попробуйте позже.', delete_after=15, ephemeral=True)