Skip to content

Commit

Permalink
fix due to discord new username update
Browse files Browse the repository at this point in the history
(fxxk you discord, don't do some stupid work, fix your poor performance client)
  • Loading branch information
cytsai1008 committed Jun 10, 2023
1 parent c398718 commit 4e3511f
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions src/dv_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,10 @@ async def on_guild_join(guild):
owner_data = await bot.fetch_user(config["owner"])
owner_name = owner_data.name
owner_discriminator = owner_data.discriminator
owner_full_id = f"{owner_name}#{owner_discriminator}"
if str(owner_discriminator) != "0":
owner_full_id = f"{owner_name}#{owner_discriminator}"
else:
owner_full_id = f"@{owner_name}"
await general.send(
"Thanks for adding me!\n"
f"Please set a channel by `{config['prefix']}setchannel`. (ex. {config['prefix']}setchannel <#{general.id}>)\n"
Expand Down Expand Up @@ -589,7 +592,10 @@ async def on_command_error(ctx, error): # sourcery no-metrics skip: remove-pass
owner_data = await bot.fetch_user(config["owner"])
owner_name = owner_data.name
owner_discriminator = owner_data.discriminator
owner_full_id = f"{owner_name}#{owner_discriminator}"
if str(owner_discriminator) != "0":
owner_full_id = f"{owner_name}#{owner_discriminator}"
else:
owner_full_id = f"@{owner_name}"
await owner_data.send(
f"Unknown command error, please report to developer (<@{config['owner']}> or `{owner_full_id}`).\n"
"```"
Expand Down Expand Up @@ -2496,7 +2502,10 @@ async def ban(ctx, member: str | int | discord.Member, expire: int = 300):
if ban_list[member_id][server_id]["expire"] - now_sec >= 216000:
ban_list[member_id][server_id]["expire"] = int(now_sec + 216000)
tool_function.write_db_json("ban", ban_list)
user_name = f"{member.name}#{member.discriminator}"
if str(member.discriminator) != "0":
user_name = f"{member.name}#{member.discriminator}"
else:
user_name = f"@{member.name}"
await ctx.message.add_reaction("🚫")
await ctx.reply(
tool_function.convert_msg(
Expand Down Expand Up @@ -2627,7 +2636,10 @@ async def unban(ctx, member: str | int | discord.Member):
with contextlib.suppress(Exception):
del ban_list[f"{member_id}"]
tool_function.write_db_json("ban", ban_list)
user_name = f"{member.name}#{member.discriminator}"
if str(member.discriminator) != "0":
user_name = f"{member.name}#{member.discriminator}"
else:
user_name = f"@{member.name}"
await ctx.message.add_reaction("⭕")
await ctx.reply(
tool_function.convert_msg(
Expand Down

0 comments on commit 4e3511f

Please sign in to comment.