diff --git a/emojiinfo/emojiinfo.py b/emojiinfo/emojiinfo.py index 3dd8188..f1f947a 100644 --- a/emojiinfo/emojiinfo.py +++ b/emojiinfo/emojiinfo.py @@ -16,13 +16,13 @@ class EmojiInfo(commands.Cog): __author__ = ["[cswimr](https://www.coastalcommits.com/cswimr)"] __git__ = "https://www.coastalcommits.com/cswimr/SeaCogs" - __version__ = "1.0.1" + __version__ = "1.0.2" __documentation__ = "https://seacogs.coastalcommits.com/emojiinfo/" def __init__(self, bot: Red) -> None: super().__init__() self.bot: Red = bot - self.logger: RedTraceLogger = getLogger(name="red.SeaCogs.Emoji") + self.logger: RedTraceLogger = getLogger(name="red.SeaCogs.EmojiInfo") def format_help_for_context(self, ctx: commands.Context) -> str: pre_processed = super().format_help_for_context(ctx) or "" @@ -35,7 +35,6 @@ class EmojiInfo(commands.Cog): ] return "\n".join(text) - async def fetch_twemoji(self, unicode_emoji) -> str: base_url = "https://cdn.jsdelivr.net/gh/jdecked/twemoji@latest/assets/72x72/" emoji_codepoint = "-".join([hex(ord(char))[2:] for char in unicode_emoji]) @@ -76,35 +75,26 @@ class EmojiInfo(commands.Cog): aliases = f"{bold('Aliases:')} {', '.join(emoji.aliases)}\n" if emoji.aliases else "" group = f"{bold('Group:')} {emoji.group}\n" - return ( - f"{name}" - f"{emoji_id}" - f"{bold('Native:')} {emoji.is_unicode_emoji()}\n" - f"{group}" - f"{aliases}" - f"{bold('Animated:')} {emoji.animated}\n" - f"{bold('Markdown:')} {markdown}\n" - f"{bold('URL:')} [Click Here]({emoji_url})" - ), emoji_url + return (f"{name}{emoji_id}{bold('Native:')} {emoji.is_unicode_emoji()}\n{group}{aliases}{bold('Animated:')} {emoji.animated}\n{bold('Markdown:')} {markdown}\n{bold('URL:')} [Click Here]({emoji_url})"), emoji_url @app_commands.command(name="emoji") - @app_commands.describe( - emoji="What emoji would you like to get information on?", - ephemeral="Would you like the response to be hidden?" - ) + @app_commands.describe(emoji="What emoji would you like to get information on?", ephemeral="Would you like the response to be hidden?") async def emoji_slash(self, interaction: discord.Interaction, emoji: str, ephemeral: bool = True) -> None: """Retrieve information about an emoji.""" await interaction.response.defer(ephemeral=ephemeral) try: emoji: PartialEmoji = PartialEmoji.from_str(self, value=emoji) - string, emoji_url, = await self.get_emoji_info(emoji) + ( + string, + emoji_url, + ) = await self.get_emoji_info(emoji) self.logger.verbose(f"Emoji:\n{string}") except (IndexError, UnboundLocalError): return await interaction.followup.send("Please provide a valid emoji!") if await self.bot.embed_requested(channel=interaction.channel): - embed = embed = discord.Embed(title="Emoji Information", description=string, color = await self.fetch_primary_color(emoji_url) or await self.bot.get_embed_color(interaction.channel)) + embed = discord.Embed(title="Emoji Information", description=string, color=await self.fetch_primary_color(emoji_url) or await self.bot.get_embed_color(interaction.channel)) embed.set_thumbnail(url=emoji_url) await interaction.followup.send(embed=embed) @@ -116,13 +106,16 @@ class EmojiInfo(commands.Cog): """Retrieve information about an emoji.""" try: emoji: PartialEmoji = PartialEmoji.from_str(self, value=emoji) - string, emoji_url, = await self.get_emoji_info(emoji) + ( + string, + emoji_url, + ) = await self.get_emoji_info(emoji) self.logger.verbose(f"Emoji:\n{string}") except (IndexError, UnboundLocalError): return await ctx.send("Please provide a valid emoji!") if await ctx.embed_requested(): - embed = embed = discord.Embed(title="Emoji Information", description=string, color = await self.fetch_primary_color(emoji_url) or await ctx.embed_color) + embed = discord.Embed(title="Emoji Information", description=string, color=await self.fetch_primary_color(emoji_url) or await ctx.embed_color) embed.set_thumbnail(url=emoji_url) await ctx.send(embed=embed)