remove the username format functions

okbuddyhololive · Nov 30, 2024 · b545c7c · b545c7c
1 parent cc5339e
commit b545c7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/cogs/statistics.py b/cogs/statistics.py
@@ -55,12 +55,6 @@ def word_split(self, text: str) -> List[str]:
 
         return filtered
 
-    def format_username(self, user: User) -> str:
-        if user.discriminator == "0":
-            return f"@{user.name}"
-
-        return f"{user.name}#{user.discriminator}"
-
     # actual commands
     @commands.command()
     async def count(self, ctx: commands.Context, *, keyword: str):
@@ -106,7 +100,7 @@ async def count(self, ctx: commands.Context, *, keyword: str):
             colour=Colour.blurple(),
             timestamp=ctx.message.created_at
         )
-        embed.set_footer(text=f"Invoked by {self.format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
 
         author_encountered = False
         index = 1
@@ -120,7 +114,7 @@ async def count(self, ctx: commands.Context, *, keyword: str):
             if any(word in user.name.lower() for word in self.censored):
                 continue
 
-            field_name = f"#{index} - {self.format_username(user)}"
+            field_name = f"#{index} - @{user.name}"
 
             if user.id == ctx.author.id:
                 field_name += " (You)"
@@ -143,7 +137,7 @@ async def count(self, ctx: commands.Context, *, keyword: str):
             count = occurences[str(ctx.author.id)]
 
             embed.add_field(
-                name=f"#{position} - {self.format_username(ctx.author)} (You)",
+                name=f"#{position} - @{ctx.author.name} (You)",
                 value=f"**{count}** uses",
             )
 
@@ -191,7 +185,7 @@ async def top(self, ctx: commands.Context, target: Optional[User] = None):
             timestamp=ctx.message.created_at
         )
 
-        embed.set_footer(text=f"Invoked by {self.format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.set_thumbnail(url=target.display_avatar.url)
 
         index = 1
@@ -251,7 +245,7 @@ async def bottom(self, ctx: commands.Context, target: Optional[User] = None):
             timestamp=ctx.message.created_at
         )
 
-        embed.set_footer(text=f"Invoked by {self.format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.set_thumbnail(url=target.display_avatar.url)
 
         index = 1

diff --git a/modules/help.py b/modules/help.py
@@ -1,12 +1,6 @@
 from discord.ext import commands
 from discord import Embed, Colour, User
 
-def format_username(user: User) -> str:
-    if user.discriminator == "0":
-        return f"@{user.name}"
-
-    return f"{user.name}#{user.discriminator}"
-
 class PretenderHelpCommand(commands.MinimalHelpCommand):
     async def send_bot_help(self, mapping: dict):
         ctx = self.context
@@ -25,7 +19,7 @@ async def send_bot_help(self, mapping: dict):
 
             embed.description += f"__**{cog.qualified_name if cog is not None else 'Uncategorized'}**__\n{signatures}\n"
 
-        embed.set_footer(text=f"Invoked by @{format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.timestamp = ctx.message.created_at
 
         await ctx.message.reply(embed=embed, mention_author=False)
@@ -45,7 +39,7 @@ async def send_cog_help(self, cog: commands.Cog):
         for command in cog.get_commands():
             embed.description += f"`{self.get_command_signature(command)}`\n"
 
-        embed.set_footer(text=f"Invoked by {format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.timestamp = ctx.message.created_at
 
         await ctx.message.reply(embed=embed, mention_author=False)
@@ -59,7 +53,7 @@ async def send_command_help(self, command: commands.Command):
             colour=Colour.blurple()
         )
 
-        embed.set_footer(text=f"Invoked by {format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.timestamp = ctx.message.created_at
 
         await ctx.message.reply(embed=embed, mention_author=False)
@@ -72,7 +66,7 @@ async def command_not_found(self, string: str) -> Embed:
             colour=Colour.red()
         )
 
-        embed.set_footer(text=f"Invoked by {format_username(ctx.author)}", icon_url=ctx.author.display_avatar.url)
+        embed.set_footer(text=f"Invoked by @{ctx.author.name}", icon_url=ctx.author.display_avatar.url)
         embed.timestamp = ctx.message.created_at
 
         return embed