Fixed error when track is not found.

jokelbaf · Mar 9, 2023 · 5d2f08c · 5d2f08c
1 parent 0f29950
commit 5d2f08c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 16 deletions.
diff --git a/Config.py b/Config.py
@@ -1,7 +1,7 @@
 """
 SanyaBot configuration. Includes texts for descriptions, 
 images, Bot configuration like «Developer Mode» and 
-some permament data like links and credentials.
+some permanent data like links and credentials.
 """
 
 import discord, os

diff --git a/cogs/Music.py b/cogs/Music.py
@@ -156,21 +156,26 @@ async def player_play(self, ctx: commands.Context, *, song: str = None):
                 else:
                     try:
                         song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
-                        await vc.message.edit(
-                            embed=Embeds.Music.music_player_connected(vc.language, song, ctx)
-                        )
-                        await ctx.reply(
-                            embed=Embeds.Music.track_added_ctx(user.language, ctx, song), mention_author=False
-                        )
-                        await vc.play(song)
                     except:
                         return await ctx.reply(
                             embed=Embeds.Music.song_not_found(user.language), mention_author=False
                         )
+                    await vc.message.edit(
+                        embed=Embeds.Music.music_player_connected(vc.language, song, ctx)
+                    )
+                    await ctx.reply(
+                        embed=Embeds.Music.track_added_ctx(user.language, ctx, song), mention_author=False
+                    )
+                    await vc.play(song)
 
                 await ctx.guild.change_voice_state(channel=ctx.author.voice.channel, self_deaf=True, self_mute=False)
             else:
-                song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                try:
+                    song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                except:
+                    return await ctx.reply(
+                        embed=Embeds.Music.song_not_found(user.language), mention_author=False
+                    )
                 await vc.queue.put_wait(song)
                 await ctx.reply(
                     embed=Embeds.Music.track_added_ctx(user.language, ctx, song), mention_author=False
@@ -713,7 +718,12 @@ async def play(self, ctx: discord.ApplicationContext, song: str):
                     )
                 else:
                     try:
-                        song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                        try:
+                            song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                        except:
+                            return await ctx.followup.send(
+                                embed=Embeds.Music.song_not_found(user.language)
+                            )
                         await vc.message.edit(
                             embed=Embeds.Music.music_player_connected(vc.language, song, ctx)
                         )
@@ -722,16 +732,18 @@ async def play(self, ctx: discord.ApplicationContext, song: str):
                         )
                         await vc.play(song)
                     except:
-                        msg = await ctx.followup.send(
-                            embed=Embeds.Music.choose_platform(user.language)
+                        return await ctx.followup.send(
+                            embed=Embeds.Music.song_not_found(user.language)
                         )
-                        await msg.edit(view=Views.PlayersMenu(self.bot, ctx, msg, song))
-                        setattr(vc, "message_id", msg.id)
-                        setattr(vc, "message", msg)
 
                 await ctx.guild.change_voice_state(channel=ctx.author.voice.channel, self_deaf=True, self_mute=False)
             else:
-                song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                try:
+                    song = await wavelink.YouTubeTrack.search(query=song, return_first=True)
+                except:
+                    return await ctx.followup.send(
+                        embed=Embeds.Music.song_not_found(user.language)
+                    )
                 await vc.queue.put_wait(song)
                 await ctx.followup.send(
                     embed=Embeds.Music.track_added_ctx(user.language, ctx, song)