Discord: Fix cache

dojo_plugin/pages/course.py

@@ -420,7 +420,7 @@ def update_identity(dojo):
  discord_member = get_discord_member(discord_user.discord_id)
  if not discord_member:
  return {"success": True, "warning": "Your Discord account has not joined the official Discord server"}
- add_role(discord_member["user"]["id"], discord_role)
+ add_role(discord_user.discord_id, discord_role)
 
  return {"success": True}
 

dojo_plugin/pages/discord.py

@@ -66,7 +66,7 @@ def discord_redirect():
  existing_discord_user.discord_id = discord_id
  db.session.commit()
  if get_discord_member(discord_id):
- add_role(discord_id, "White Belt")
+ add_role(discord_user.discord_id, "White Belt")
  update_awards(user)
  except IntegrityError:
  db.session.rollback()

dojo_plugin/utils/awards.py

@@ -102,8 +102,8 @@ def update_awards(user):
  db.session.commit()
  current_belts.append(belt)
 
- discord_member = get_discord_member(DiscordUsers.query.filter_by(user=user)
-  .with_entities(DiscordUsers.discord_id).scalar())
+ discord_user = DiscordUsers.query.filter_by(user=user).first()
+ discord_member = discord_user and get_discord_member(discord_user.discord_id)
  discord_roles = get_discord_roles()
  for belt in BELT_REQUIREMENTS:
  if belt not in current_belts:
@@ -112,11 +112,9 @@ def update_awards(user):
  missing_role = discord_member and discord_roles.get(belt_role) not in discord_member["roles"]
  if not missing_role:
  continue
- user_mention = f"<@{discord_member['user']['id']}>"
- message = f"{user_mention} earned their {belt_role}! :tada:"
- add_role(discord_member["user"]["id"], belt_role)
- send_message(message, "belting-ceremony")
- cache.delete_memoized(get_discord_member, discord_member["user"]["id"])
+ add_role(discord_user.discord_id, belt_role)
+ send_message(f"<@{discord_user.discord_id}> earned their {belt_role}! :tada:", "belting-ceremony")
+ cache.delete_memoized(get_discord_member, discord_user.discord_id)
 
  current_emojis = get_user_emojis(user)
  for emoji,dojo_name,dojo_id in current_emojis: