From 2734b436ad7d7ea4289e33913b159aa5b95346c6 Mon Sep 17 00:00:00 2001 From: Purpur <43528123+Pemigrade@users.noreply.github.com> Date: Sun, 10 Jan 2021 05:56:02 -0600 Subject: [PATCH] Update linking.py --- cogs/linking.py | 225 +++++++++++++++++++----------------------------- 1 file changed, 87 insertions(+), 138 deletions(-) diff --git a/cogs/linking.py b/cogs/linking.py index 4b21429..657949a 100644 --- a/cogs/linking.py +++ b/cogs/linking.py @@ -3,14 +3,13 @@ import discord import requests import json import logging -import sys from discord.ext import commands, tasks from discord.ext.commands import has_permissions, MissingPermissions from dotenv import load_dotenv import aiohttp import asyncio -class Linking(commands.Cog): +class Linking_updater(commands.Cog): def __init__(self, bot): self.bot = bot @@ -21,148 +20,98 @@ class Linking(commands.Cog): self.client_role_id = int(os.getenv('client_role_id')) self.subuser_role_id = int(os.getenv('subuser_role_id')) self.verified_role_id = int(os.getenv('verified_role_id')) - - @commands.Cog.listener() - async def on_message(self, message): - if message.author != self.bot.user and message.guild == None: - channel = message.channel - await channel.send("Processing, please wait...") - # Potential API key, so tries it out - if len(message.content) == 48: - url = "https://panel.birdflop.com/api/client/account" + @tasks.loop(minutes=10) + async def linking_updater(self): + logging.info("Synchronizing roles") + file = open('users.json', 'r') + data = json.load(file) + file.close() + guild = self.bot.get_guild(guild_id) + i = -1 + print("1") + for client in data['users']: + print("2") + i += 1 + member = guild.get_member(client['discord_id']) + if member: + print("3") + api_key = client['client_api_key'] + url = "https://panel.birdflop.com/api/client" headers = { 'Accept': 'application/json', - 'Content-Type': 'application/json', - 'Authorization': 'Bearer ' + message.content, + 'Authorization': 'Bearer ' + api_key, } - - # response = requests.get(url, headers=headers) - async with aiohttp.ClientSession() as session: async with session.get(url, headers=headers) as response: - - # If API token is verified to be correct: + print("4") if response.status == 200: - - # Formats response of account in JSON format - json_response = await response.json() - - # Loads contents of users.json - file = open('users.json', 'r') - data = json.load(file) - file.close() - - # Checks if user exists. If so, skips adding them to users.json - client_id_already_exists = False - discord_id_already_exists = False - for user in data['users']: - if user['client_id'] == json_response['attributes']['id']: - client_id_already_exists = True - logging.info("Client ID already exists") - if user['discord_id'] == message.author.id: - discord_id_already_exists = True - logging.info("Discord ID already exists") - if client_id_already_exists == False and discord_id_already_exists == False: - data['users'].append({ - 'discord_id': message.author.id, - 'client_id': json_response['attributes']['id'], - 'client_api_key': message.content - }) - json_dumps = json.dumps(data, indent=2) - # Adds user to users.json - file = open('users.json', 'w') - file.write(json_dumps) - file.close() - - guild = self.bot.get_guild(self.guild_id) - member = guild.get_member(message.author.id) - if member: - - url = "https://panel.birdflop.com/api/client" - - headers = { - 'Accept': 'application/json', - 'Authorization': 'Bearer ' + message.content, - } - - async with aiohttp.ClientSession() as session: - async with session.get(url, headers=headers) as response: - - # If API token is verified to be correct, continues - if response.status == 200: - - # Formats response for servers in JSON format - servers_json_response = await response.json() - - user_client = False - user_subuser = False - user_crabwings = False - user_duckfeet = False - user_elktail = False - for server in servers_json_response['data']: - server_owner = server['attributes']['server_owner'] - if server_owner == True: - user_client = True - elif server_owner == False: - user_subuser = True - server_node = server['attributes']['node'] - if server_node == "Crabwings - NYC": - user_crabwings = True - elif server_node == "Duckfeet - EU": - user_duckfeet = True - elif server_node == "Elktail - EU": - user_elktail = True - if user_client == True: - role = discord.utils.get(guild.roles, id=self.client_role_id) - await member.add_roles(role) - if user_subuser == True: - role = discord.utils.get(guild.roles, id=self.subuser_role_id) - await member.add_roles(role) - if user_crabwings == True: - role = discord.utils.get(guild.roles, id=self.crabwings_role_id) - await member.add_roles(role) - if user_duckfeet == True: - role = discord.utils.get(guild.roles, id=self.duckfeet_role_id) - await member.add_roles(role) - if user_elktail == True: - role = discord.utils.get(guild.roles, id=self.elktail_role_id) - await member.add_roles(role) - role = discord.utils.get(guild.roles, id=self.verified_role_id) - await member.add_roles(role) - - await channel.send( - 'Your Discord account has been linked to your panel account! You may unlink your Discord and panel accounts by reacting in the #verification channel or by deleting your Verification API key.') - logging.info("Success message sent to " + message.author.name + "#" + str( - message.author.discriminator) + " (" + str( - message.author.id) + ")" + ". User linked to API key " + message.content + " and client_id " + str( - json_response['attributes']['id'])) - elif discord_id_already_exists: - await channel.send( - 'Sorry, your Discord account is already linked to a panel account. If you would like to link your Discord account to a different panel account, please unlink your Discord account first by reacting in the #verification channel.') - logging.info("Duplicate Discord message sent to " + message.author.name + "#" + str( - message.author.discriminator) + " (" + str( - message.author.id) + ")" + " for using API key " + message.content + " linked to client_id " + str( - json_response['attributes']['id'])) - elif client_id_already_exists: - await channel.send( - 'Sorry, your panel account is already linked to a Discord account. If you would like to link your panel account to a different Discord account, please unlink your panel account first by deleting its Verification API key and waiting up to 10 minutes.') - logging.info("Duplicate panel message sent to " + message.author.name + "#" + str( - message.author.discriminator) + " (" + str( - message.author.id) + ")" + " for using API key " + message.content + " linked to client_id " + str( - json_response['attributes']['id'])) + print("5") + # Formats response for servers in JSON format + servers_json_response = await response.json() + + user_client = False + user_subuser = False + user_crabwings = False + user_duckfeet = False + user_elktail = False + for server in servers_json_response['data']: + server_owner = server['attributes']['server_owner'] + if server_owner == True: + user_client = True + elif server_owner == False: + user_subuser = True + server_node = server['attributes']['node'] + if server_node == "Crabwings - NYC": + user_crabwings = True + elif server_node == "Duckfeet - EU": + user_duckfeet = True + elif server_node == "Elktail - EU": + user_elktail = True + role = discord.utils.get(guild.roles, id=self.client_role_id) + if user_client == True: + await member.add_roles(role) + else: + await member.remove_roles(role) + role = discord.utils.get(guild.roles, id=self.subuser_role_id) + if user_subuser == True: + await member.add_roles(role) + else: + await member.remove_roles(role) + role = discord.utils.get(guild.roles, id=self.crabwings_role_id) + if user_crabwings == True: + await member.add_roles(role) + else: + await member.remove_roles(role) + role = discord.utils.get(guild.roles, id=self.duckfeet_role_id) + if user_duckfeet == True: + await member.add_roles(role) + else: + await member.remove_roles(role) + role = discord.utils.get(guild.roles, id=self.elktail_role_id) + if user_elktail == True: + await member.add_roles(role) + else: + await member.remove_roles(role) else: - # Says if API key is the corect # of characters but invalid - await channel.send("Sorry, that appears to be an invalid API key.") - logging.info( - 'invalid sent to ' + message.author.name + "#" + str(message.author.discriminator) + " (" + str( - message.author.id) + ")") + data['users'].pop(i) + json_dumps = json.dumps(data, indent=2) + file = open('users.json', 'w') + file.write(json_dumps) + file.close() + await member.edit(roles=[]) + logging.info("removed discord_id " + str(client['discord_id']) + " with client_id " + str( + client['client_id']) + " and INVALID client_api_key " + client['client_api_key']) else: - # Says this if API key is incorrect # of characters - await channel.send( - 'Sorry, that doesn\'t appear to be an API token. An API token should be a long string resembling this: ```yQSB12ik6YRcmE4d8tIEj5gkQqDs6jQuZwVOo4ZjSGl28d46```') - logging.info("obvious incorrect sent to " + message.author.name + "#" + str( - message.author.discriminator) + " (" + str(message.author.id) + ")") - -def setup(bot): - bot.add_cog(Linking(bot)) + data['users'].pop(i) + json_dumps = json.dumps(data, indent=2) + file = open('users.json', 'w') + file.write(json_dumps) + file.close() + logging.info("removed discord_id " + str(client['discord_id']) + " with client_id " + str( + client['client_id']) + " and client_api_key " + client['client_api_key']) + + @linking_updater.before_loop + async def before_linking_updater(self): + logging.info('waiting to enter loop') + await bot.wait_until_ready()