Fix: Refactor message sending and enhance about command

Assign embeds and messages to local variables before sending with `inter.response.send_message` for improved readability and consistency.
Enhance the `about` command by including "total members" in the "Reach" field, providing a more comprehensive overview of the bot's presence.

Author: timhauke

src/commands/connection_commands.py

@@ -70,7 +70,8 @@ async def connect(self, inter: discord.Interaction):
 
         member = inter.guild.get_member(inter.user.id) if isinstance(inter.user, discord.User) else inter.user
         if not member or not member.voice or not member.voice.channel:
-            return await inter.response.send_message(embed=factory.error("You must be in a voice channel."), ephemeral=True)
+            error_embed = factory.error("You must be in a voice channel.")
+            return await inter.response.send_message(embed=error_embed, ephemeral=True)
 
         async with self._connect_lock:
             await self._ensure_ready()
@@ -154,7 +155,8 @@ async def voiceinfo(self, inter: discord.Interaction):
         voice_client = inter.guild.voice_client
 
         if not player or not player.is_connected or not voice_client:
-            return await inter.response.send_message(embed=factory.warning("VectoBeat is not connected."), ephemeral=True)
+            warning_embed = factory.warning("VectoBeat is not connected.")
+            return await inter.response.send_message(embed=warning_embed, ephemeral=True)
 
         embed = factory.primary("🔊 Voice Session")
         channel = voice_client.channel  # type: ignore

src/commands/info_commands.py

@@ -279,14 +279,12 @@ async def botinfo(self, inter: discord.Interaction):
         if owner_names:
             embed.add_field(name="Owner", value=owner_names, inline=True)
         embed.add_field(name="Command Count", value=f"`{len(self.bot.tree.get_commands())}`", inline=True)
-        embed.add_field(
-            name="Reach",
-            value=(
-                f"`{self._format_number(guild_count)}` guilds\n"
-                f"`{self._format_number(unique_users)}` unique users"
-            ),
-            inline=False,
-        )
+        reach_lines = [
+            f"`{self._format_number(guild_count)}` guilds",
+            f"`{self._format_number(total_members)}` total members",
+            f"`{self._format_number(unique_users)}` unique users",
+        ]
+        embed.add_field(name="Reach", value="\n".join(reach_lines), inline=False)
         runtime_meta = "\n".join(
             [
                 f"Python `{platform.python_version()}`",
@@ -355,7 +353,8 @@ async def lavalink(self, inter: discord.Interaction):
         factory = EmbedFactory(inter.guild.id if inter.guild else None)
         nodes = self._lavalink_nodes()
         if not nodes:
-            return await inter.response.send_message(embed=factory.warning("Lavalink is not connected."), ephemeral=True)
+            warning_embed = factory.warning("Lavalink is not connected.")
+            return await inter.response.send_message(embed=warning_embed, ephemeral=True)
 
         embed = factory.primary("🎛️ Lavalink Nodes")
         for node in nodes:
@@ -387,7 +386,8 @@ async def lavalink(self, inter: discord.Interaction):
     async def permissions(self, inter: discord.Interaction):
         """Display the bot's effective permissions for the current channel."""
         if not inter.guild or not inter.channel:
-            return await inter.response.send_message("This command must be invoked inside a guild channel.", ephemeral=True)
+            message = "This command must be invoked inside a guild channel."
+            return await inter.response.send_message(message, ephemeral=True)
 
         guild = inter.guild
         me = guild.me or guild.get_member(self.bot.user.id)  # type: ignore

src/commands/queue_commands.py

@@ -68,7 +68,8 @@ async def queue(self, inter: discord.Interaction):
         """Display the queue using an embed paginator."""
         factory = EmbedFactory(inter.guild.id if inter.guild else None)
         if not inter.guild:
-            return await inter.response.send_message(embed=factory.error("Guild only command."), ephemeral=True)
+            error_embed = factory.error("Guild only command.")
+            return await inter.response.send_message(embed=error_embed, ephemeral=True)
 
         player = self._player(inter.guild)
         if not player or (not player.queue and not player.current):
@@ -142,7 +143,8 @@ async def shuffle(self, inter: discord.Interaction):
 
         player = self._player(inter.guild)
         if not player or len(player.queue) < 2:
-            return await inter.response.send_message(embed=factory.warning("Need at least 2 tracks to shuffle."), ephemeral=True)
+            warning_embed = factory.warning("Need at least 2 tracks to shuffle.")
+            return await inter.response.send_message(embed=warning_embed, ephemeral=True)
 
         random.shuffle(player.queue)
         embed = factory.primary("🔀 Shuffled")
@@ -160,11 +162,13 @@ async def move(
         """Reorder a track within the queue."""
         factory = EmbedFactory(inter.guild.id if inter.guild else None)
         if not inter.guild:
-            return await inter.response.send_message(embed=factory.error("Guild only command."), ephemeral=True)
+            error_embed = factory.error("Guild only command.")
+            return await inter.response.send_message(embed=error_embed, ephemeral=True)
 
         player = self._player(inter.guild)
         if not player or not player.queue:
-            return await inter.response.send_message(embed=factory.warning("Queue is empty."), ephemeral=True)
+            warning_embed = factory.warning("Queue is empty.")
+            return await inter.response.send_message(embed=warning_embed, ephemeral=True)
 
         src_idx = src - 1
         dest_idx = dest - 1

src/events/music_events.py

@@ -255,9 +255,17 @@ async def on_queue_end(self, event: QueueEndEvent):
                         logger.error("Failed to send autoplay announcement: %s", exc)
                     return
 
-        factory = EmbedFactory(getattr(channel.guild, "id", None) if isinstance(channel, discord.abc.GuildChannel) else None)
+        if isinstance(channel, discord.abc.GuildChannel):
+            guild_id = channel.guild.id
+        else:
+            guild_id = None
+        factory = EmbedFactory(guild_id)
         try:
-            await channel.send(embed=factory.primary("Queue Finished", "Add more tracks with `/play`."), silent=True)
+            queue_message = "Add more tracks with `/play`."
+            await channel.send(
+                embed=factory.primary("Queue Finished", queue_message),
+                silent=True,
+            )
         except Exception as exc:
             logger.error("Failed to send queue finished message: %s", exc)
 
@@ -273,9 +281,14 @@ async def on_track_end(self, event: TrackEndEvent):
             channel = self._channel(player)
             if not channel:
                 return
-            factory = EmbedFactory(getattr(channel.guild, "id", None) if isinstance(channel, discord.abc.GuildChannel) else None)
+            if isinstance(channel, discord.abc.GuildChannel):
+                guild_id = channel.guild.id
+            else:
+                guild_id = None
+            factory = EmbedFactory(guild_id)
             try:
-                await channel.send(embed=factory.error("Failed to play track. The source might be unavailable."), silent=True)
+                error_embed = factory.error("Failed to play track. The source might be unavailable.")
+                await channel.send(embed=error_embed, silent=True)
             except Exception as exc:
                 logger.error("Failed to send load failure message: %s", exc)