Some ordering magic

cogs/music/__init__.py

@@ -12,6 +12,7 @@ from cogs.music.interactions import MusicCommands
 from cogs.music.interactions import QUEUE_SIZE
 from cogs.music.voice_client import LavalinkVoiceClient
 from utils.classes import BaseCog
+from utils.log import logger
 
 if typing.TYPE_CHECKING:
     from bot import TuneBot
@@ -46,13 +47,19 @@ class MusicCog(BaseCog, name="Music"):
             guild = self.bot.get_guild(guild_id)
             await guild.voice_client.disconnect(force=True)
         elif isinstance(event, lavalink.events.TrackEndEvent):
-            await helper.fill_player_queue(self.bot, event.player, 1)
             channel_id = int(event.player.fetch("channel"))
             channel: TextChannel = self.bot.get_channel(channel_id)
+            await helper.fill_player_queue(self.bot, event.player, 1)
             event.player.append_history(event.track)
-            embed = track_embed.create_track_embed(
-                event.player.current, event.player.queue, event.player.history
-            )
+
+            if event.reason == "FINISHED":
+                queue = event.player.queue[1:]
+                current = event.player.queue[0]
+            else:
+                queue = event.player.queue
+                current = event.player.current
+
+            embed = track_embed.create_track_embed(current, queue, event.player.history)
             await channel.send(embed=embed)