fix: fix errors

Author: andyjjrt

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rosetta"
-version = "0.6.1"
+version = "0.9.0"
 description = "A discord music bot, with other cool stuffs"
 readme = "README.md"
 requires-python = ">=3.12"

rosetta/__main__.py

@@ -1,4 +1,5 @@
 import logging
+import os
 from pathlib import Path
 
 import discord
@@ -16,7 +17,13 @@
 intents.guilds = True
 intents.voice_states = True
 
-bot = commands.Bot(command_prefix="!", intents=intents)
+pod_name = os.environ.get("SHARD_ID", "rosetta-0")
+shard_id = int(pod_name.split("-")[-1])
+total_shards = int(os.environ.get("TOTAL_SHARDS", 1))
+
+bot = commands.Bot(
+    command_prefix="!", intents=intents, shard_id=shard_id, shard_count=total_shards
+)
 
 
 @bot.event

rosetta/commands/play.py

@@ -145,19 +145,17 @@ async def search(self, interaction: discord.Interaction, keyword: str):
             view=SearchSelectView(self, tracks, interaction),
         )
 
-    @app_commands.command(name="shuffle", description="Shuffle")
-    @app_commands.describe(ephemeral="hide response")
-    async def shuffle(self, interaction: discord.Interaction, ephemeral: bool = False):
+    async def do_shuffle(self, interaction: discord.Interaction, ephemeral: bool = False):
+        """Helper method to shuffle the queue"""
         await self.ensure_subscription(interaction)
         subscription = self.subscriptions.get(interaction.guild_id)
         random.shuffle(subscription.queue)
         await interaction.response.send_message(
             embed=SuccessEmbed(self.bot.user, "Shuffle complete"), ephemeral=ephemeral
         )
 
-    @app_commands.command(name="skip", description="Skip to next song")
-    @app_commands.describe(ephemeral="hide response")
-    async def skip(self, interaction: discord.Interaction, ephemeral: bool = False):
+    async def do_skip(self, interaction: discord.Interaction, ephemeral: bool = False):
+        """Helper method to skip to the next song"""
         await self.ensure_subscription(interaction)
         await interaction.response.defer(ephemeral=ephemeral)
         subscription = self.subscriptions.get(interaction.guild_id)
@@ -173,6 +171,16 @@ async def skip(self, interaction: discord.Interaction, ephemeral: bool = False):
                 embed=SuccessEmbed(self.bot.user, "No song left")
             )
 
+    @app_commands.command(name="shuffle", description="Shuffle")
+    @app_commands.describe(ephemeral="hide response")
+    async def shuffle(self, interaction: discord.Interaction, ephemeral: bool = False):
+        await self.do_shuffle(interaction, ephemeral)
+
+    @app_commands.command(name="skip", description="Skip to next song")
+    @app_commands.describe(ephemeral="hide response")
+    async def skip(self, interaction: discord.Interaction, ephemeral: bool = False):
+        await self.do_skip(interaction, ephemeral)
+
     @app_commands.command(name="leave", description="Leave current channel")
     async def leave(self, interaction: discord.Interaction):
         await self.ensure_subscription(interaction)
@@ -215,13 +223,16 @@ async def updateNowPlaying(self, guild_id, message_id):
         if not subscription:
             self.updateNowPlaying.cancel()
         if subscription and not subscription.checkLock:
-            message = self.bot.get_message(message_id)
-            if message:
-                await message.edit(
-                    embed=NowPlayingEmbed(
-                        track=subscription.nowPlaying, queue=subscription.queue
+            try:
+                message = await subscription.messageChannel.fetch_message(message_id)
+                if message:
+                    await message.edit(
+                        embed=NowPlayingEmbed(
+                            track=subscription.nowPlaying, queue=subscription.queue
+                        )
                     )
-                )
+            except discord.NotFound:
+                self.updateNowPlaying.cancel()
 
     async def ensure_voice(self, interaction: discord.Interaction):
         voice_client = interaction.guild.voice_client if interaction.guild else None
@@ -343,9 +354,14 @@ def __init__(
         self.original_interaction = interaction
 
     async def callback(self, interaction: discord.Interaction):
+        # Find the "Top" toggle button by custom_id
+        top_button = next(
+            (item for item in self.view.children if getattr(item, 'custom_id', None) == "Top"),
+            None
+        )
         top = (
             True
-            if self.view.get_item("Top").style == discord.ButtonStyle.success
+            if top_button and top_button.style == discord.ButtonStyle.success
             else False
         )
         self.view.clear_items()
@@ -416,8 +432,8 @@ def __init__(self, player: Player):
     @discord.ui.button(
         label="Skip", custom_id="skip", style=discord.ButtonStyle.primary, emoji="⏩"
     )
-    async def skip(self, button: discord.ui.Button, interaction: discord.Interaction):
-        await self.player.skip(interaction, True)
+    async def skip(self, interaction: discord.Interaction, button: discord.ui.Button):
+        await self.player.do_skip(interaction, True)
 
     @discord.ui.button(
         label="Shuffle",
@@ -426,9 +442,9 @@ async def skip(self, button: discord.ui.Button, interaction: discord.Interaction
         emoji="🔀",
     )
     async def shuffle(
-        self, button: discord.ui.Button, interaction: discord.Interaction
+        self, interaction: discord.Interaction, button: discord.ui.Button
     ):
-        await self.player.shuffle(interaction, True)
+        await self.player.do_shuffle(interaction, True)
 
     @discord.ui.button(
         label="Stop Sync",
@@ -437,8 +453,8 @@ async def shuffle(
         emoji="♾️",
     )
     async def stopSync(
-        self, button: discord.ui.Button, interaction: discord.Interaction
+        self, interaction: discord.Interaction, button: discord.ui.Button
     ):
         self.player.updateNowPlaying.cancel()
-        self.disable_all_items()
+        self.clear_items()
         await interaction.response.edit_message(view=self)

rosetta/utils/embeds.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 from typing import List
 
-from discord import Colour, Embed, EmbedField, EmbedFooter, User
+from discord import Colour, Embed, User
 from openai.types.completion_usage import CompletionUsage
 
 from .track import Track
@@ -12,77 +12,80 @@
 
 
 def PingEmbed(user: User, latency: float):
-    return Embed(
+    embed = Embed(
         title=":ping_pong:  Pong",
         description=f"Ball flew back in {int(latency * 1000)}ms",
         colour=Colour.teal(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def SuccessEmbed(user: User, message: str):
-    return Embed(
+    embed = Embed(
         title=f"{config['bot.emoji']['success']} Success",
         description=message,
         colour=Colour.green(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def ErrorEmbed(user: User, error: str):
-    return Embed(
+    embed = Embed(
         title=f"{config['bot.emoji']['error']} Error",
         description=error,
         colour=Colour.red(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def InfoEmbed(user: User, message: str):
-    return Embed(
+    embed = Embed(
         title=":information_source:   Info",
         description=message,
         colour=Colour.blurple(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def NowPlayingEmbed(track: Track, queue: List[Track]):
-    queueMessage = None
-    if len(queue) > 0:
-        queueMessage = [
-            EmbedField(
-                name=f"💭 Next ({len(queue)} left)",
-                value=f"{'\n'.join([f'- [{t.title}]({t.url}) `{t.time[1]}`' for t in queue[:3]])}",
-            )
-        ]
-    return Embed(
+    embed = Embed(
         title=f"{config['bot.emoji']['youtube']} Now Playing",
         description=f"[**{track.title}**]({track.url})\n\n`{track.time[0]}`{track.progress}`{track.time[1]}`\n",
-        thumbnail=track.thumbnail,
-        fields=queueMessage,
         colour=Colour.green(),
-        footer=EmbedFooter(text=track.author.name, icon_url=track.author.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_thumbnail(url=track.thumbnail)
+    if len(queue) > 0:
+        embed.add_field(
+            name=f"💭 Next ({len(queue)} left)",
+            value=f"{'\n'.join([f'- [{t.title}]({t.url}) `{t.time[1]}`' for t in queue[:3]])}",
+            inline=False
+        )
+    embed.set_footer(text=track.author.name, icon_url=track.author.avatar)
+    return embed
 
 
 def LeaveEmbed(user: User):
-    return Embed(
+    embed = Embed(
         title=":wave:  Leaving",
         description="Bye~",
         colour=Colour.teal(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def SearchEmbed(user: User, keyword: str, tracks: List[Track]):
-    return Embed(
+    embed = Embed(
         title=f':mag: Search result of **"{keyword}"**',
         description="\n".join(
             [
@@ -91,9 +94,10 @@ def SearchEmbed(user: User, keyword: str, tracks: List[Track]):
             ]
         ),
         colour=Colour.teal(),
-        footer=EmbedFooter(text=user.name, icon_url=user.avatar),
         timestamp=datetime.now(),
     )
+    embed.set_footer(text=user.name, icon_url=user.avatar)
+    return embed
 
 
 def ProcessingEmbed(user: User, message: str = "Processing..."):