Skip to content

v3.0.7 #79

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

Merged
ddc merged 1 commit into from
Feb 26, 2026
Merged

v3.0.7 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 26 additions & 26 deletions src/gw2/cogs/characters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,32 +28,32 @@ async def characters(ctx):
gw2 characters
"""

await ctx.message.channel.typing()
gw2_key_dal = Gw2KeyDal(ctx.bot.db_session, ctx.bot.log)
rs = await gw2_key_dal.get_api_key_by_user(ctx.message.author.id)
if not rs:
msg = gw2_messages.NO_API_KEY
msg += gw2_messages.key_add_info_help(ctx.prefix)
msg += gw2_messages.key_more_info_help(ctx.prefix)
return await bot_utils.send_error_msg(ctx, msg)

api_key = str(rs[0]["key"])
gw2_api = Gw2Client(ctx.bot)
is_valid_key = await gw2_api.check_api_key(api_key)
if not isinstance(is_valid_key, dict):
msg = f"{is_valid_key.message}\n"
msg += gw2_messages.INVALID_API_KEY_HELP_MESSAGE
msg += gw2_messages.key_add_info_help(ctx.prefix)
msg += gw2_messages.key_more_info_help(ctx.prefix)
return await bot_utils.send_error_msg(ctx, msg)

permissions = str(rs[0]["permissions"])
if "characters" not in permissions or "account" not in permissions:
return await bot_utils.send_error_msg(ctx, gw2_messages.API_KEY_NO_PERMISSION, True)

progress_msg = await gw2_utils.send_progress_embed(
ctx, "Please wait, I'm fetching your character data... (this may take a moment)"
)
async with ctx.typing():
gw2_key_dal = Gw2KeyDal(ctx.bot.db_session, ctx.bot.log)
rs = await gw2_key_dal.get_api_key_by_user(ctx.message.author.id)
if not rs:
msg = gw2_messages.NO_API_KEY
msg += gw2_messages.key_add_info_help(ctx.prefix)
msg += gw2_messages.key_more_info_help(ctx.prefix)
return await bot_utils.send_error_msg(ctx, msg)

api_key = str(rs[0]["key"])
gw2_api = Gw2Client(ctx.bot)
is_valid_key = await gw2_api.check_api_key(api_key)
if not isinstance(is_valid_key, dict):
msg = f"{is_valid_key.message}\n"
msg += gw2_messages.INVALID_API_KEY_HELP_MESSAGE
msg += gw2_messages.key_add_info_help(ctx.prefix)
msg += gw2_messages.key_more_info_help(ctx.prefix)
return await bot_utils.send_error_msg(ctx, msg)

permissions = str(rs[0]["permissions"])
if "characters" not in permissions or "account" not in permissions:
return await bot_utils.send_error_msg(ctx, gw2_messages.API_KEY_NO_PERMISSION, True)

progress_msg = await gw2_utils.send_progress_embed(
ctx, "Please wait, I'm fetching your character data... (this may take a moment)"
)

try:
# Fetch account info and all characters in parallel
Expand Down
Loading