From 1b085366fc013ed54ce44d174e315eee987ddcc4 Mon Sep 17 00:00:00 2001 From: "suspendedtundra2@gmail.com" Date: Mon, 8 Apr 2024 04:06:43 -0500 Subject: [PATCH 1/2] fix: fixed erroneous SQL code --- src/utils/db_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/db_utils.py b/src/utils/db_utils.py index 5589374..984aa99 100644 --- a/src/utils/db_utils.py +++ b/src/utils/db_utils.py @@ -143,7 +143,7 @@ async def insert_new_member(discord_id: int, uuid: str, username: str): async def update_member(discord_id: int, uuid: str, username: str): discord_idExists = await select_one("SELECT uuid from members WHERE discord_id = (?)", (discord_id,)) if discord_idExists: - await bot.db.execute("UPDATE members SET uuid = (?) and username = (?) WHERE discord_id = (?)", + await bot.db.execute("UPDATE members SET uuid = ?, username = ? WHERE discord_id = ?", (uuid, username, discord_id)) await bot.db.commit() else: From 7562f8aa527880277e4deb63505f6f3306fde005 Mon Sep 17 00:00:00 2001 From: "suspendedtundra2@gmail.com" Date: Mon, 8 Apr 2024 04:07:05 -0500 Subject: [PATCH 2/2] feat: rolecheck makes a request to mojang api if possible --- src/func/General.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/func/General.py b/src/func/General.py index 5783c0b..0f6eaf5 100644 --- a/src/func/General.py +++ b/src/func/General.py @@ -20,7 +20,7 @@ resident_req, dnkl_entries_not_found, positive_responses, allies) from src.utils.db_utils import insert_new_giveaway, select_all, get_db_username_from_uuid, \ - get_db_uuid_username_from_discord_id, insert_new_member, select_one + get_db_uuid_username_from_discord_id, insert_new_member, select_one, update_member from src.utils.discord_utils import (create_ticket, get_ticket_creator, log_event, name_grabber, has_tag_perms) @@ -107,6 +107,11 @@ async def rolecheck(ctx, send_ping: bool): nick = await name_grabber(discord_member) uuid, username = await get_db_uuid_username_from_discord_id(discord_member.id) + if not uuid and username: + username, uuid = await get_mojang_profile(username) + if username and uuid: + await update_member(discord_member.id, uuid, username) + if not uuid and not username: await discord_member.remove_roles(bot.member_role, bot.ally, bot.guest, bot.active_role) await discord_member.add_roles(bot.new_member_role)