From 351fd94f188e06105a47975bab3a1ba3f4acd8c0 Mon Sep 17 00:00:00 2001 From: Skillet Date: Tue, 1 Aug 2023 22:17:23 -0400 Subject: [PATCH] fixes --- autowl/Cogs/Group.py | 9 ++++----- autowl/Cogs/Whitelist.py | 10 +++++----- autowl/bot.py | 5 ++++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/autowl/Cogs/Group.py b/autowl/Cogs/Group.py index d7d99ec..327f085 100644 --- a/autowl/Cogs/Group.py +++ b/autowl/Cogs/Group.py @@ -30,13 +30,12 @@ class Group(commands.Cog, name="group"): name=role.name, roleID=role.id, permissions=perms ) - squadjs = mysql.connector.connect(user='squadjs', password=self.client.mysqlpass, - host='asgard.orion-technologies.io', database='squadjs', use_pure=False) + self.client.squadjs.connect() membsup = [] for memb in role.members: membsup.append(memb.id) if len(membsup) > 0: - memupcur = squadjs.cursor(buffered=True) + memupcur = self.client.squadjs.cursor(buffered=True) in_params = ','.join(['%s'] * len(membsup)) sqlstate = "SELECT * FROM DBLog_SteamUsers WHERE discordID IN (%s)" % in_params log.info(sqlstate) @@ -46,8 +45,8 @@ class Group(commands.Cog, name="group"): for data in udata: self.client.whitelistGrps[role.id].addMember(config.WhitelistMember(data[2], data[1], data[0])) - squadjs.commit() - squadjs.close() + self.client.squadjs.commit() + self.client.squadjs.close() @app_commands.command() async def add( diff --git a/autowl/Cogs/Whitelist.py b/autowl/Cogs/Whitelist.py index 7f08362..f69a3b0 100644 --- a/autowl/Cogs/Whitelist.py +++ b/autowl/Cogs/Whitelist.py @@ -18,13 +18,13 @@ class Whitelist(commands.Cog): @app_commands.command() async def link(self, interaction: discord.Interaction, steam64: str): - squadjs = mysql.connector.connect(user='squadjs', password=self.client.mysqlpass, host='asgard.orion-technologies.io', database='squadjs', use_pure=False) + self.client.squadjs.connect() if not interaction.guild: await interaction.response.send_message( "This command must be ran within a discord server!" ) return - updatecur = squadjs.cursor(buffered=True) + updatecur = self.client.squadjs.cursor(buffered=True) try: updatecur.execute(self.client.squadjs_updateDiscordID, (interaction.user.id, steam64)) rowsaffected = updatecur.rowcount @@ -38,7 +38,7 @@ class Whitelist(commands.Cog): self.client.whitelistGrps[urole.id].members[f"{interaction.user.id}"].steam64 = steam64 self.client.whitelistGrps[urole.id].updateGroup() await interaction.response.send_message("SteamID already linked, roles updated.") - squadjs.commit() + self.client.squadjs.commit() return except mysql.connector.Error as err: log.error("MYSQL error!") @@ -48,6 +48,6 @@ class Whitelist(commands.Cog): if urole.id in self.client.whitelistGrps.keys(): disusername = interaction.user.nick if interaction.user.nick is not None else interaction.user.name self.client.whitelistGrps[urole.id].addMember(config.WhitelistMember(interaction.user.id, disusername, steam64)) - squadjs.commit() - squadjs.close() + self.client.squadjs.commit() + self.client.squadjs.close() await interaction.response.send_message(f"discord is linked to steamID, roles updated.") diff --git a/autowl/bot.py b/autowl/bot.py index 4834c18..9cf8f7a 100644 --- a/autowl/bot.py +++ b/autowl/bot.py @@ -39,7 +39,8 @@ class Bot(commands.Bot): intents=intents, help_command=commands.DefaultHelpCommand(dm_help=True), ) - self.mysqlpass = mysqlpass + self.squadjs = mysql.connector.connect(user='squadjs', password=mysqlpass, + host='asgard.orion-technologies.io', database='squadjs', use_pure=False) async def on_command(self, ctx: commands.Context): log.info(f"{ctx.author} ({ctx.author.id}) invoked command: {ctx.command.name}, {ctx.message}") @@ -60,6 +61,7 @@ class Bot(commands.Bot): async def on_member_update(self, before: discord.Member, after: discord.Member): disusername = after.nick if after.nick is not None else after.name + self.squadjs.connect() findcur = self.squadjs.cursor(buffered=True) findcur.execute(self.squadjs_findByDiscordID, [f"{after.id}"]) if findcur.arraysize <= 0: @@ -92,6 +94,7 @@ class Bot(commands.Bot): continue self.whitelistGrps[addroleid].addMember(config.WhitelistMember(after.id, disusername, userdata[0])) self.squadjs.commit() + self.squadjs.close() async def setup_hook(self): log.info("Setting up bot")