Skip to content

Improves the get_user_text function to fetch user and member #1324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improves the get_user_text function to fetch user and member #1324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
770bd6a
Improves the get_user_text function to fetch user and member
ajax146 May 5, 2025
c4af004
Adds handling for deleted users
ajax146 May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions techsupport_bot/commands/duck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ async def friends(self: Self, ctx: commands.Context) -> None:
embed.color = embed_colors.green()

embed.add_field(
name=self.get_user_text(duck_user),
name=await self.get_user_text(duck_user, ctx.guild),
value=f"Friends: `{duck_user.befriend_count}`",
inline=False,
)
Expand Down Expand Up @@ -597,18 +597,20 @@ async def record(self: Self, ctx: commands.Context) -> None:
channel=ctx.channel,
)
return
record_user = (
record_user_entry = (
await self.bot.models.DuckUser.query.where(
self.bot.models.DuckUser.speed_record == record_time
)
.where(self.bot.models.DuckUser.guild_id == str(ctx.guild.id))
.gino.first()
)

embed = discord.Embed(title="Duck Speed Record")
embed.color = embed_colors.green()
embed.add_field(name="Time", value=f"{str(record_time)} seconds")
embed.add_field(name="Record Holder", value=f"<@{record_user.author_id}>")
embed.add_field(
name="Record Holder",
value=await self.get_user_text(record_user_entry, ctx.guild),
)
embed.set_thumbnail(url=self.DUCK_PIC_URL)

await ctx.send(embed=embed)
Expand Down Expand Up @@ -659,7 +661,7 @@ async def killers(self: Self, ctx: commands.Context) -> None:
embed.color = embed_colors.green()

embed.add_field(
name=self.get_user_text(duck_user),
name=await self.get_user_text(duck_user, ctx.guild),
value=f"Kills: `{duck_user.kill_count}`",
inline=False,
)
Expand All @@ -671,23 +673,30 @@ async def killers(self: Self, ctx: commands.Context) -> None:

await ui.PaginateView().send(ctx.channel, ctx.author, embeds)

def get_user_text(self: Self, duck_user: bot.models.DuckUser) -> str:
async def get_user_text(
self: Self, duck_user: bot.models.DuckUser, guild: discord.Guild
) -> str:
"""Gets the name of a user formatted to be displayed across the extension

Args:
duck_user (bot.models.DuckUser): The database entry of the user to format
guild (discord.Guild): The guild to fetch duck records from

Returns:
str: The username in a pretty string format, ready to print
"""
user = self.bot.get_user(int(duck_user.author_id))
if user:
user_text = f"{user.display_name}"
user_text_extra = f"({user.name})" if user.name != user.display_name else ""
else:
user_text = "<Unknown>"
user_text_extra = ""
return f"{user_text}{user_text_extra}"
try:
user_object = await self.bot.fetch_user(duck_user.author_id)
except discord.NotFound:
return f"`Account not found` ({duck_user.author_id})"
display_name = user_object.global_name
try:
member_object = await guild.fetch_member(user_object.id)
display_name = member_object.display_name
except discord.NotFound:
...

return f"`{display_name}` (`{user_object.name}`)"

@auxiliary.with_typing
@commands.guild_only()
Expand Down