Refactor embed handling across multiple commands to utilize SafeEmbed for consistent user footer management. Introduce set_user_footer and set_user_footer_with_text methods for improved avatar handling and clarity in embed creation.

Author: Zingzy

cogs/cross_pollinate_cog.py

@@ -450,12 +450,7 @@ async def generate_cross_pollinate_embed(
     embed.set_image(url=f"attachment://{file_name}")
 
     if not private:
-        embed.set_footer(
-            text=f"🐝 Cross-pollinated by {interaction.user.display_name}",
-            icon_url=interaction.user.avatar.url
-            if interaction.user.avatar
-            else interaction.user.default_avatar.url,
-        )
+        embed.set_user_footer(interaction, "🐝 Cross-pollinated by")
 
     return embed
 

cogs/multi_pollinate_cog.py

@@ -263,7 +263,7 @@ async def generate_for_model(i, model):
             value=f"```{time_taken.total_seconds():.2f}s```",
         )
 
-        embeds[0].set_footer(text=f"Generated by {interaction.user}")
+        embeds[0].set_user_footer(interaction, "Generated by")
 
         if private:
             await interaction.followup.send(embeds=embeds, files=files, ephemeral=True)
@@ -331,4 +331,6 @@ async def multiimagine_command_error(
 
 async def setup(bot) -> None:
     await bot.add_cog(Multi_pollinate(bot))
-    print("Multi-Imagine cog loaded")
+    discord_logger.log_bot_event(
+        action="cog_setup", status="success", details={"cog": "Multi_pollinate"}
+    )

cogs/random_cog.py

@@ -104,7 +104,8 @@ async def random_image_command(
 
         embed.set_image(url="attachment://image.png")
 
-        embed.set_footer(text=f"Generated by {interaction.user}")
+        if not private:
+            embed.set_user_footer(interaction, "🎲 Generated by")
 
         if private:
             await interaction.followup.send(embed=embed, ephemeral=True)

main.py

@@ -9,6 +9,7 @@
 from utils.logger import discord_logger, logger
 from utils.fs import list_py_files
 from utils.models import fetch_and_log_models
+from utils.embed_utils import SafeEmbed
 import traceback
 
 load_dotenv(override=True)
@@ -126,7 +127,7 @@ async def on_message(message) -> None:
         return
 
     if bot.user in message.mentions and message.type is not discord.MessageType.reply:
-        embed = discord.Embed(
+        embed = SafeEmbed(
             description=f"Hello, I am the Pollinations.ai Bot. I am here to help you with your AI needs. **To Generate Images click </pollinate:{config.bot.commands['pollinate_id']}> or </multi-pollinate:{config.bot.commands['multi_pollinate_id']}>, to Cross-Pollinate Images click </cross-pollinate:{config.bot.commands['cross_pollinate_id']}>, or type `/help` for more commands**.",
             color=int(config.ui.colors.success, 16),
         )
@@ -212,7 +213,7 @@ async def on_command_error(ctx, error):
 
     # Send error message to user
     await ctx.send(
-        embed=discord.Embed(
+        embed=SafeEmbed(
             title="Error", description=str(error), color=int(config.ui.colors.error, 16)
         ),
     )
@@ -227,7 +228,7 @@ async def before_invoke(ctx) -> None:
 @bot.command()
 async def ping(ctx) -> None:
     try:
-        embed = discord.Embed(title="Pong!", color=int(config.ui.colors.success, 16))
+        embed = SafeEmbed(title="Pong!", color=int(config.ui.colors.success, 16))
         message = await ctx.send(embed=embed)
 
         end: float = time.perf_counter()
@@ -256,10 +257,7 @@ async def ping(ctx) -> None:
             value=f"{hours} hours {minutes} minutes {seconds} seconds",
             inline=False,
         )
-        embed.set_footer(
-            text=f"Information requested by: {ctx.author.name}",
-            icon_url=ctx.author.avatar.url,
-        )
+        embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name}")
         embed.set_thumbnail(
             url="https://uploads.poxipage.com/7q5iw7dwl5jc3zdjaergjhpat27tws8bkr9fgy45_938843265627717703-webp"
         )
@@ -274,7 +272,7 @@ async def ping(ctx) -> None:
             context={"command": "ping"},
         )
         await ctx.send(
-            embed=discord.Embed(
+            embed=SafeEmbed(
                 title="Error",
                 description="An error occurred while processing the command.",
                 color=int(config.ui.colors.error, 16),
@@ -290,7 +288,7 @@ async def help(ctx) -> None:
     except AttributeError:
         profilePicture = config.bot.avatar_url
 
-    embed = discord.Embed(
+    embed = SafeEmbed(
         title="Pollinations.ai Bot Commands",
         description="Here is the list of the available commands:",
         color=int(config.ui.colors.success, 16),
@@ -300,27 +298,21 @@ async def help(ctx) -> None:
     for i in commands_.keys():
         embed.add_field(name=i, value=commands_[i], inline=False)
 
-    embed.set_footer(
-        text=f"Information requested by: {ctx.author.name}",
-        icon_url=ctx.author.avatar.url,
-    )
+    embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name}")
 
     await ctx.send(embed=embed)
 
 
 @bot.hybrid_command(name="invite", description="Invite the bot to your server")
 async def invite(ctx) -> None:
-    embed = discord.Embed(
+    embed = SafeEmbed(
         title="Invite the bot to your server",
         url=config.ui.bot_invite_url,
         description="Click the link above to invite the bot to your server",
         color=int(config.ui.colors.success, 16),
     )
 
-    embed.set_footer(
-        text=f"Information requested by: {ctx.author.name}",
-        icon_url=ctx.author.avatar.url,
-    )
+    embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name}")
 
     await ctx.send(embed=embed)
 
@@ -333,7 +325,7 @@ async def about(ctx) -> None:
     except AttributeError:
         profilePicture = config.bot.avatar_url
 
-    embed = discord.Embed(
+    embed = SafeEmbed(
         title="About Pollinations.ai Bot 🙌",
         url=config.ui.api_provider_url,
         description="I am the official Pollinations.ai Bot. I can generate AI Images from your prompts ✨.",
@@ -391,6 +383,8 @@ async def about(ctx) -> None:
         icon_url=config.ui.bot_creator_avatar,
     )
 
+    embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name}")
+
     await ctx.send(embed=embed)
 
 
@@ -402,7 +396,7 @@ async def models(ctx) -> None:
     except AttributeError:
         profilePicture = config.bot.avatar_url
 
-    embed = discord.Embed(
+    embed = SafeEmbed(
         title="🤖 Available AI Models",
         description="Here are all the AI models currently available for image generation:",
         color=int(config.ui.colors.success, 16),
@@ -450,12 +444,7 @@ async def models(ctx) -> None:
         inline=False,
     )
 
-    embed.set_footer(
-        text=f"Information requested by: {ctx.author.name} • Models last updated",
-        icon_url=ctx.author.avatar.url
-        if ctx.author.avatar
-        else ctx.author.default_avatar.url,
-    )
+    embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name} • Models last updated")
 
     await ctx.send(embed=embed)
 

utils/embed_utils.py

@@ -120,6 +120,65 @@ def set_footer(
         super().set_footer(text=text, icon_url=icon_url)
         return self
 
+    def set_user_footer(
+        self, 
+        interaction: discord.Interaction, 
+        prefix: str = "Generated by"
+    ) -> "SafeEmbed":
+        """
+        Set footer with user information and proper avatar handling.
+        
+        Args:
+            interaction: Discord interaction object
+            prefix: Text prefix before the username (default: "Generated by")
+        
+        Example:
+            embed.set_user_footer(interaction, "🐝 Cross-pollinated by")
+        """
+        footer_text = f"{prefix} {interaction.user.display_name}"
+        
+        # Handle avatar URL with proper fallback
+        icon_url = (
+            interaction.user.avatar.url 
+            if interaction.user.avatar 
+            else interaction.user.default_avatar.url
+        )
+        
+        return self.set_footer(text=footer_text, icon_url=icon_url)
+
+    def set_user_footer_with_text(
+        self,
+        interaction_or_ctx,
+        text: str
+    ) -> "SafeEmbed":
+        """
+        Set footer with custom text and user avatar.
+        
+        Args:
+            interaction_or_ctx: Discord interaction object or command context
+            text: Custom footer text
+        
+        Example:
+            embed.set_user_footer_with_text(interaction, f"{interaction.user} used /{interaction.command.name}")
+            embed.set_user_footer_with_text(ctx, f"Information requested by: {ctx.author.name}")
+        """
+        # Handle both interaction and context objects
+        if hasattr(interaction_or_ctx, 'user'):
+            # It's an interaction
+            user = interaction_or_ctx.user
+        else:
+            # It's a context
+            user = interaction_or_ctx.author
+            
+        # Handle avatar URL with proper fallback
+        icon_url = (
+            user.avatar.url 
+            if user.avatar 
+            else user.default_avatar.url
+        )
+        
+        return self.set_footer(text=text, icon_url=icon_url)
+
     @_truncate_args(name=256)
     def set_author(
         self, *, name: str, url: Optional[str] = None, icon_url: Optional[str] = None
@@ -217,8 +276,8 @@ async def generate_pollinate_embed(
     else:
         embed.set_image(url=dic["url"])
 
-    embed.set_footer(text=f"Generated by {interaction.user}")
-
+    embed.set_user_footer(interaction, "Generated by")
+    
     return embed
 
 
@@ -249,16 +308,7 @@ async def generate_error_message(
         inline=False,
     )
 
-    try:
-        embed.set_footer(
-            text=f"{interaction.user} used /{interaction.command.name}",
-            icon_url=interaction.user.avatar,
-        )
-    except Exception:
-        embed.set_footer(
-            text=f"{interaction.user} used /{interaction.command.name}",
-            icon_url=interaction.user.default_avatar,
-        )
+    embed.set_user_footer_with_text(interaction, f"{interaction.user} used /{interaction.command.name}")
 
     return embed