impr: Add player repeat and shuffle, play artist and playlist. Code optimization.

MusicBot/cogs/utils/player.py

@@ -1,8 +1,34 @@
 from discord.ui import View, Button, Item
-from discord import InteractionMessage, ButtonStyle, Interaction, ApplicationContext
+from discord import ButtonStyle, Interaction, ApplicationContext
 
 from MusicBot.cogs.utils.voice import VoiceExtension
 
+class ToggleRepeatButton(Button, VoiceExtension):
+    def __init__(self, **kwargs):
+        Button.__init__(self, **kwargs)
+        VoiceExtension.__init__(self)
+    
+    async def callback(self, interaction: Interaction) -> None:
+        if not interaction.guild:
+            return
+        gid = interaction.guild.id
+        guild = self.db.get_guild(gid)
+        self.db.update(gid, {'repeat': not guild['repeat']})
+        await interaction.edit(view=Player(interaction))
+
+class ToggleShuffleButton(Button, VoiceExtension):
+    def __init__(self, **kwargs):
+        Button.__init__(self, **kwargs)
+        VoiceExtension.__init__(self)
+    
+    async def callback(self, interaction: Interaction) -> None:
+        if not interaction.guild:
+            return
+        gid = interaction.guild.id
+        guild = self.db.get_guild(gid)
+        self.db.update(gid, {'shuffle': not guild['shuffle']})
+        await interaction.edit(view=Player(interaction))
+
 class PlayPauseButton(Button, VoiceExtension):
     def __init__(self, **kwargs):
         Button.__init__(self, **kwargs)
@@ -11,24 +37,21 @@ class PlayPauseButton(Button, VoiceExtension):
     async def callback(self, interaction: Interaction) -> None:
         if not await self.voice_check(interaction):
             return
+
         vc = self.get_voice_client(interaction)
-        if vc is not None:
-            if not vc.is_paused():
-                vc.pause()
-                message = interaction.message
-                if not message:
-                    return
-                embed = message.embeds[0]
-                embed.set_footer(text='Приостановлено')
-                await interaction.edit(embed=embed)
-            else:
-                vc.resume()
-                message = interaction.message
-                if not message:
-                    return
-                embed = message.embeds[0]
-                embed.remove_footer()
-                await interaction.edit(embed=embed)
+        if not vc or not interaction.message:
+            return
+
+        embed = interaction.message.embeds[0]
+
+        if vc.is_paused():
+            vc.resume()
+            embed.remove_footer()
+        else:
+            vc.pause()
+            embed.set_footer(text='Приостановлено')
+
+        await interaction.edit(embed=embed)
 
 class NextTrackButton(Button, VoiceExtension):    
     def __init__(self, **kwargs):
@@ -54,24 +77,41 @@ class PrevTrackButton(Button, VoiceExtension):
         if not title:
             await interaction.respond(f"Нет треков в истории.", delete_after=15, ephemeral=True)
 
-class Player(View):
+class Player(View, VoiceExtension):
     
-    def __init__(self, ctx: ApplicationContext, *items: Item, timeout: float | None = 3600, disable_on_timeout: bool = True):
-        super().__init__(*items, timeout=timeout, disable_on_timeout=disable_on_timeout)
+    def __init__(self, ctx: ApplicationContext | Interaction, *items: Item, timeout: float | None = 3600, disable_on_timeout: bool = True):
+        View.__init__(self, *items, timeout=timeout, disable_on_timeout=disable_on_timeout)
+        VoiceExtension.__init__(self)
+        if not ctx.guild:
+            return
+        guild = self.db.get_guild(ctx.guild.id)
         
         self.ctx = ctx
         
-        self.repeat_button = Button(style=ButtonStyle.secondary, emoji='🔂', row=0)
-        self.shuffle_button = Button(style=ButtonStyle.secondary, emoji='🔀', row=0)
+        self.repeat_button_off = ToggleRepeatButton(style=ButtonStyle.secondary, emoji='🔂', row=0)
+        self.repeat_button_on = ToggleRepeatButton(style=ButtonStyle.success, emoji='🔂', row=0)
+        
+        self.shuffle_button_off = ToggleShuffleButton(style=ButtonStyle.secondary, emoji='🔀', row=0)
+        self.shuffle_button_on = ToggleShuffleButton(style=ButtonStyle.success, emoji='🔀', row=0)
+        
         self.play_pause_button = PlayPauseButton(style=ButtonStyle.primary, emoji='⏯', row=0)
+        
         self.next_button = NextTrackButton(style=ButtonStyle.primary, emoji='⏭', row=0)
         self.prev_button = PrevTrackButton(style=ButtonStyle.primary, emoji='⏮', row=0)
         
         self.queue_button = Button(style=ButtonStyle.primary, emoji='📋', row=1)
         
-        self.add_item(self.repeat_button)
+        if guild['repeat']:
+            self.add_item(self.repeat_button_on)
+        else:
+            self.add_item(self.repeat_button_off)
+
         self.add_item(self.prev_button)
         self.add_item(self.play_pause_button)
         self.add_item(self.next_button)
-        self.add_item(self.shuffle_button)
+        
+        if guild['shuffle']:
+            self.add_item(self.shuffle_button_on)
+        else:
+            self.add_item(self.shuffle_button_off)