fix: more logging

Author: timhauke

.github/instructions/codacy.instructions.md

@@ -6,6 +6,13 @@
 # Codacy Rules
 Configuration for AI behavior when interacting with Codacy's MCP Server
 
+## using any tool that accepts the arguments: `provider`, `organization`, or `repository`
+- ALWAYS use:
+ - provider: gh
+ - organization: VectoDE
+ - repository: VectoBeat
+- Avoid calling `git remote -v` unless really necessary
+
 ## CRITICAL: After ANY successful `edit_file` or `reapply` operation
 - YOU MUST IMMEDIATELY run the `codacy_cli_analyze` tool from Codacy's MCP Server for each file that was edited, with:
  - `rootPath`: set to the workspace path

src/commands/music_controls.py

@@ -7,8 +7,10 @@
 
 import discord
 import lavalink
+from aiohttp import ClientError as AiohttpClientError, ContentTypeError
 from discord import app_commands
 from discord.ext import commands
+from lavalink.errors import ClientError as LavalinkClientError
 
 from src.services.lavalink_service import LavalinkVoiceClient
 from src.utils.embeds import EmbedFactory
@@ -17,6 +19,10 @@
 VOICE_PERMISSIONS = ("connect", "speak", "view_channel")
 
 
+class TrackLookupError(Exception):
+    """Raised when Lavalink fails to provide a usable load result."""
+
+
 def ms_to_clock(ms: int) -> str:
     """Convert milliseconds into a human readable duration string."""
     seconds = max(0, int(ms // 1000))
@@ -140,19 +146,35 @@ def _tag_tracks(
                 track.requester = requester_id
         return tracks
 
+    async def _safe_get_tracks(self, identifier: str) -> lavalink.LoadResult:
+        """Fetch tracks from Lavalink with user-friendly error handling."""
+        try:
+            return await self.bot.lavalink.get_tracks(identifier)
+        except ContentTypeError as exc:
+            status = getattr(exc, "status", "unknown")
+            raise TrackLookupError(
+                f"Lavalink returned an unexpected response (HTTP {status}). Please verify the node is reachable."
+            ) from exc
+        except (AiohttpClientError, LavalinkClientError) as exc:
+            raise TrackLookupError(
+                "Unable to reach the Lavalink node. Please try again in a few moments."
+            ) from exc
+
     async def _resolve(self, query: str) -> lavalink.LoadResult:
         query = query.strip()
+        if not query:
+            raise TrackLookupError("Please provide a search query or URL.")
         if URL_REGEX.match(query):
-            result = await self.bot.lavalink.get_tracks(query)
+            result = await self._safe_get_tracks(query)
             if result.tracks:
                 return result
         last: Optional[lavalink.LoadResult] = None
         for prefix in ("ytsearch", "scsearch", "amsearch"):
-            result = await self.bot.lavalink.get_tracks(f"{prefix}:{query}")
+            result = await self._safe_get_tracks(f"{prefix}:{query}")
             if result.tracks:
                 return result
             last = result
-        return last or await self.bot.lavalink.get_tracks(query)
+        return last or await self._safe_get_tracks(query)
 
     async def _player(self, inter: discord.Interaction) -> Optional[lavalink.DefaultPlayer]:
         factory = EmbedFactory(inter.guild.id if inter.guild else None)
@@ -220,7 +242,11 @@ async def play(self, inter: discord.Interaction, query: str):
         if not player:
             return
 
-        results = await self._resolve(query)
+        try:
+            results = await self._resolve(query)
+        except TrackLookupError as exc:
+            await inter.followup.send(embed=factory.error(str(exc)), ephemeral=True)
+            return
         if results.load_type == "LOAD_FAILED":
             return await inter.followup.send(embed=factory.error("Loading the track failed."), ephemeral=True)
         if not results.tracks:

src/services/lavalink_service.py

@@ -48,14 +48,34 @@ async def connect(
             channel=self.channel, self_deaf=self_deaf, self_mute=self_mute
         )
 
+    def _is_self(self, user_id) -> bool:
+        me = getattr(self.client, "user", None)
+        if not me or user_id is None:
+            return False
+        return str(user_id) == str(me.id)
+
+    def _is_guild(self, guild_id) -> bool:
+        if guild_id is None:
+            return False
+        try:
+            return int(guild_id) == self.guild_id
+        except (TypeError, ValueError):
+            return False
+
     async def on_voice_server_update(self, data):
+        if not self._is_guild(data.get("guild_id")):
+            return
+
         payload = {
             "t": "VOICE_SERVER_UPDATE",
             "d": data,
         }
         await self.lavalink.voice_update_handler(payload)
 
     async def on_voice_state_update(self, data):
+        if not self._is_guild(data.get("guild_id")) or not self._is_self(data.get("user_id")):
+            return
+
         channel_id = data.get("channel_id")
 
         if not channel_id: