Various formatting

Hopefully this will make the static analysis tool happier

.github/workflows/codeql-analysis.yml

@@ -18,7 +18,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [main]
   schedule:
-    - cron: '29 1 * * 1'
+    - cron: "29 1 * * 1"
 
 jobs:
   analyze:
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: ["python"]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

checks.py

@@ -21,9 +21,11 @@ creative_designer = 771748500576141332
 master_builder = 769659653121900550
 server_chat = 769843495045169163
 
+
 class no_permission(commands.MissingPermissions):
     pass
 
+
 def is_staff():
     def predicate(ctx):
         user = ctx.message.author
@@ -34,6 +36,7 @@ def is_staff():
             raise no_permission(['IS_STAFF_MEMBER'])
     return commands.check(predicate)
 
+
 def is_dev():
     def predicate(ctx):
         user = ctx.message.author
@@ -43,6 +46,7 @@ def is_dev():
             raise no_permission(['BOT_DEVELOPER'])
     return commands.check(predicate)
 
+
 def is_mod_or_has_perms(**permissions):
     def predicate(ctx):
         user = ctx.message.author
@@ -53,6 +57,7 @@ def is_mod_or_has_perms(**permissions):
             raise no_permission(['IS_MOD_OR_HAS_PERMS'])
     return commands.check(predicate)
 
+
 def is_executive():
     def predicate(ctx):
         user = ctx.message.author
@@ -74,6 +79,7 @@ def is_tf_developer():
             raise no_permission(['IS_TOTALFREEDOM_DEVELOPER'])
     return commands.check(predicate)
 
+
 def is_liaison():
     def predicate(ctx):
         user = ctx.message.author
@@ -84,6 +90,7 @@ def is_liaison():
             raise no_permission(['IS_SERVER_LIAISON'])
     return commands.check(predicate)
 
+
 def is_creative_designer():
     def predicate(ctx):
         user = ctx.message.author
@@ -94,6 +101,7 @@ def is_creative_designer():
             raise no_permission(['IS_CREATIVE_DESIGNER'])
     return commands.check(predicate)
 
+
 def is_senior():
     def predicate(ctx):
         user = ctx.message.author

commands/help.py

@@ -4,6 +4,7 @@ import discord
 from discord.ext import commands
 from functions import get_avatar
 
+
 class Help(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -48,8 +49,10 @@ class Help(commands.Cog):
                     command_list += f'**{ctx.prefix}{command.name}** - {command.help}\n'
             if command_list:
                 em.add_field(name=cog, value=command_list, inline=False)
-        em.set_footer(text=f'Requested by {ctx.message.author}', icon_url=get_avatar(ctx.message.author))
+        em.set_footer(text=f'Requested by {ctx.message.author}', icon_url=get_avatar(
+            ctx.message.author))
         await ctx.send(embed=em)
 
+
 def setup(bot):
     bot.add_cog(Help(bot))

commands/miscellaneous.py

@@ -10,6 +10,7 @@ from discord.ext import commands
 from checks import *
 from functions import *
 
+
 class Miscellaneous(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -58,11 +59,15 @@ class Miscellaneous(commands.Cog):
                 command += f'{args[x]} '
             time_sent = str(datetime.utcnow().replace(microsecond=0))[11:]
 
-            self.bot.telnet_object.session.write(bytes(command, 'ascii') + b"\r\n")
+            self.bot.telnet_object.session.write(
-            self.bot.telnet_object.session.read_until(bytes(f'{time_sent} INFO]:', 'ascii'), 2)
+                bytes(command, 'ascii') + b"\r\n")
+            self.bot.telnet_object.session.read_until(
+                bytes(f'{time_sent} INFO]:', 'ascii'), 2)
             if ctx.channel == ctx.guild.get_channel(server_chat):
-                self.bot.telnet_object.session.read_until(bytes('\r\n', 'ascii'), 2)
+                self.bot.telnet_object.session.read_until(
-            next_line = self.bot.telnet_object.session.read_until(bytes('\r\n', 'ascii'), 2)
+                    bytes('\r\n', 'ascii'), 2)
+            next_line = self.bot.telnet_object.session.read_until(
+                bytes('\r\n', 'ascii'), 2)
             em.description = f"Response from server: {next_line.decode('utf-8')}"
         else:
             em.description = f'Command **{args[0]}** not found.'
@@ -84,5 +89,6 @@ class Miscellaneous(commands.Cog):
             await ctx.send(f'''```py
 {type(e).__name__}: {e}```''')
 
+
 def setup(bot):
     bot.add_cog(Miscellaneous(bot))

commands/moderation.py

@@ -7,6 +7,7 @@ from functions import *
 
 muted_role_id = 769659653121900546
 
+
 class Moderation(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -76,5 +77,6 @@ class Moderation(commands.Cog):
             print(data['reaction_roles'])
             write_json('config', data)
 
+
 def setup(bot):
     bot.add_cog(Moderation(bot))

commands/server_commands.py

@@ -7,6 +7,7 @@ from datetime import datetime
 from functions import *
 from unicode import *
 
+
 class ServerCommands(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -115,12 +116,14 @@ class ServerCommands(commands.Cog):
             command += f'{arg} '
         try:
             if args[0] in ['mute', 'stfu', 'gtfo', 'ban', 'unban', 'unmute', 'smite', 'noob', 'tban', 'tempban', 'warn', 'mv', 'kick', 'cc', 'say']:
-                self.bot.telnet_object.session.write(bytes(command, 'ascii') + b"\r\n")
+                self.bot.telnet_object.session.write(
+                    bytes(command, 'ascii') + b"\r\n")
             elif args[0] == 'slconfig':
                 if args[1] not in ['add', 'remove']:
                     raise no_permission(['IS_SENIOR_ADMIN'])
                 else:
-                    self.bot.telnet_object.session.write(bytes(command, 'ascii') + b"\r\n")
+                    self.bot.telnet_object.session.write(
+                        bytes(command, 'ascii') + b"\r\n")
             else:
                 raise no_permission(['IS_SENIOR_ADMIN'])
         except Exception as e:
@@ -160,14 +163,14 @@ class ServerCommands(commands.Cog):
                 em.description = f'{attempt}'
                 await ctx.send(embed=em)
 
-    
     @commands.command()
     @is_staff()
     async def restart(self, ctx):
         'Restarts the server'
         em = discord.Embed()
         try:
-            self.bot.telnet_object.session.write(bytes('restart', 'ascii') + b"\r\n")
+            self.bot.telnet_object.session.write(
+                bytes('restart', 'ascii') + b"\r\n")
         except Exception as e:
             em.title = 'Command error'
             em.colour = 0xFF0000
@@ -187,7 +190,8 @@ class ServerCommands(commands.Cog):
         '''await ctx.send(f'```:[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: {ctx.author.name} issued server command: /{command}```')'''
         em = discord.Embed()
         try:
-            self.bot.telnet_object.session.write(bytes(command, 'ascii') + b"\r\n")
+            self.bot.telnet_object.session.write(
+                bytes(command, 'ascii') + b"\r\n")
         except Exception as e:
             em.title = 'Command error'
             em.colour = 0xFF0000
@@ -204,7 +208,8 @@ class ServerCommands(commands.Cog):
         'Gets the current status of the Server'
         em = discord.Embed()
         try:
-            requests.get("http://play.totalfreedom.me:28966/list?json=true", timeout=5).json()
+            requests.get(
+                "http://play.totalfreedom.me:28966/list?json=true", timeout=5).json()
         except:
             em.description = 'Server is offline'
             em.colour = 0xFF0000
@@ -219,7 +224,8 @@ class ServerCommands(commands.Cog):
         em = discord.Embed()
         em.title = "Player List"
         try:
-            json = requests.get("http://play.totalfreedom.me:28966/list?json=true", timeout=5).json()
+            json = requests.get(
+                "http://play.totalfreedom.me:28966/list?json=true", timeout=5).json()
             if json["online"] == 0:
                 em.description = "There are no online players"
             else:
@@ -230,11 +236,13 @@ class ServerCommands(commands.Cog):
                         rank = rank.split('_')
                         for word in range(len(rank)):
                             rank[word] = rank[word].capitalize()
-                        em = format_list_entry(em, json[rank], f'{" ".join(rank)}')
+                        em = format_list_entry(
+                            em, json[rank], f'{" ".join(rank)}')
 
         except:
             em.description = 'Server is offline'
         await ctx.send(embed=em)
+
     @commands.command()
     async def ip(self, ctx):
         'Returns the server IP'
@@ -247,7 +255,8 @@ class ServerCommands(commands.Cog):
         """Archive all in-game reports older than 24 hours"""
         count = 0
         reports_channel = self.bot.get_channel(reports_channel_id)
-        archived_reports_channel = self.bot.get_channel(archived_reports_channel_id)
+        archived_reports_channel = self.bot.get_channel(
+            archived_reports_channel_id)
         await ctx.channel.trigger_typing()
         async for report in reports_channel.history(limit=100):
             try:
@@ -275,5 +284,6 @@ class ServerCommands(commands.Cog):
                 fixed += 1
         await ctx.send(f'Fixed **{fixed}** reports')
 
+
 def setup(bot):
     bot.add_cog(ServerCommands(bot))

events.py

@@ -18,6 +18,7 @@ telnet_username = "root"
 telnet_password = "root"
 print = logscript.logging.getLogger().critical
 
+
 class Events(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
@@ -31,7 +32,8 @@ class Events(commands.Cog):
         telnet_password = config['TELNET_PASSWORD']
 
         self.bot.reaction_roles = []
-        self.bot.telnet_object = telnet(telnet_ip, telnet_port, telnet_username, telnet_password)
+        self.bot.telnet_object = telnet(
+            telnet_ip, telnet_port, telnet_username, telnet_password)
         self.bot.telnet_object.connect()
 
         print(f'[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [TELNET] Bot logged into Telnet as: {self.bot.telnet_object.username}')
@@ -89,21 +91,24 @@ class Events(commands.Cog):
         if before.guild.id != guild_id:
             return
         users = removed_user_mentions(before.mentions, after.mentions)
-        roles = removed_role_mentions(before.role_mentions, after.role_mentions)
+        roles = removed_role_mentions(
+            before.role_mentions, after.role_mentions)
         if users:
             users = ", ".join([str(member) for member in users])
         if roles:
             roles = ", ".join([role.name for role in roles])
         if not users and not roles:
             return
-        embed = discord.Embed(description="In {}".format(before.channel.mention))
+        embed = discord.Embed(
+            description="In {}".format(before.channel.mention))
         if users:
             embed.add_field(name="Users", value=users, inline=True)
         if roles:
             embed.add_field(name="Roles", value=roles, inline=True)
         embed.color = 0xFF0000
         embed.title = "Message Edit"
-        embed.set_footer(text=str(before.author), icon_url=get_avatar(before.author))
+        embed.set_footer(text=str(before.author),
+                         icon_url=get_avatar(before.author))
         channel = before.guild.get_channel(mentions_channel_id)
         await channel.send(embed=embed)
 
@@ -121,14 +126,16 @@ class Events(commands.Cog):
             roles = ", ".join([role.name for role in message.role_mentions])
         if not users and not roles:
             return
-        embed = discord.Embed(description="In {}".format(message.channel.mention))
+        embed = discord.Embed(
+            description="In {}".format(message.channel.mention))
         if users is not None:
             embed.add_field(name="Users", value=users, inline=True)
         if roles is not None:
             embed.add_field(name="Roles", value=roles, inline=True)
         embed.color = 0xFF0000
         embed.title = "Message Deletion"
-        embed.set_footer(text=str(message.author), icon_url=get_avatar(message.author))
+        embed.set_footer(text=str(message.author),
+                         icon_url=get_avatar(message.author))
         channel = message.guild.get_channel(mentions_channel_id)
         await channel.send(embed=embed)
 
@@ -145,7 +152,8 @@ class Events(commands.Cog):
     async def on_command_completion(self, ctx):
         print(f'[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [Commands] {ctx.author} (ID: {ctx.author.id}) ran: {ctx.message.content} in guild: {ctx.guild.name}')
         bot_logs_channel = self.bot.get_channel(bot_logs_channel_id)
-        log = discord.Embed(title='Logging', description=f'{ctx.author} (ID: {ctx.author.id}) ran: {ctx.message.content}', colour=0xA84300)
+        log = discord.Embed(
+            title='Logging', description=f'{ctx.author} (ID: {ctx.author.id}) ran: {ctx.message.content}', colour=0xA84300)
         await bot_logs_channel.send(embed=log)
 
     @commands.Cog.listener()
@@ -169,7 +177,8 @@ class Events(commands.Cog):
                         await report.add_reaction(clipboard)
                     elif payload.emoji.name == confirm:
                         embed = report.embeds[0]
-                        archived_reports_channel = self.bot.get_channel(archived_reports_channel_id)
+                        archived_reports_channel = self.bot.get_channel(
+                            archived_reports_channel_id)
                         await report.delete()
                         await archived_reports_channel.send("Handled by " + guild.get_member(payload.user_id).mention, embed=embed)
 
@@ -182,5 +191,6 @@ class Events(commands.Cog):
                 if msg_id == payload.message_id and emoji == str(payload.emoji.name):
                     await self.bot.get_guild(payload.guild_id).get_member(payload.user_id).remove_roles(self.bot.get_guild(payload.guild_id).get_role(role_id), reason='reaction')
 
+
 def setup(bot):
     bot.add_cog(Events(bot))

functions.py

@@ -5,16 +5,20 @@ import requests
 from discord.ext import commands
 from checks import *
 
+
 def format_list_entry(embed, list, name):
-    embed.add_field(name="{} ({})".format(name, len(list)), value=", ".join(list), inline=False)
+    embed.add_field(name="{} ({})".format(name, len(list)),
+                    value=", ".join(list), inline=False)
     return embed
 
+
 def did_mention_other_user(users, author):
     for user in users:
         if user is not author:
             return True
     return False
 
+
 def removed_user_mentions(old, new):
     users = []
     for user in old:
@@ -22,6 +26,7 @@ def removed_user_mentions(old, new):
             users.append(user)
     return users
 
+
 def removed_role_mentions(old, new):
     roles = []
     for role in old:
@@ -29,6 +34,7 @@ def removed_role_mentions(old, new):
             roles.append(role)
     return roles
 
+
 def get_avatar(user, animate=True):
     if user.avatar_url:
         avatar = str(user.avatar_url).replace(".webp", ".png")
@@ -38,20 +44,24 @@ def get_avatar(user, animate=True):
         avatar = avatar.replace(".gif", ".png")
     return avatar
 
+
 def read_json(file_name):
     with open(f'/root/totalfreedom/{file_name}.json', 'r') as file:
         data = json.load(file)
     return data
 
+
 def write_json(file_name, data):
     with open(f'/root/totalfreedom/{file_name}.json', 'w') as file:
         json.dump(data, file, indent=4)
     return data
 
+
 def hit_endpoint(command):
     url = [CENSORED_URL]
     payload = {}
     headers = {}
 
-    response = json.loads(requests.request("GET", url, headers=headers, data = payload, timeout=100).text)
+    response = json.loads(requests.request(
+        "GET", url, headers=headers, data=payload, timeout=100).text)
     return response['response']

logscript.py

@@ -1,3 +1,4 @@
 import logging
 
-logging.basicConfig(level=logging.CRITICAL, format='%(message)s',handlers=[logging.FileHandler('log.log', 'a')])
+logging.basicConfig(level=logging.CRITICAL, format='%(message)s', handlers=[
+                    logging.FileHandler('log.log', 'a')])

main.py

@@ -18,7 +18,8 @@ load_dotenv()
 botToken = os.getenv('botToken')
 
 intents = discord.Intents.all()
-bot = commands.Bot(command_prefix=os.getenv('prefix'), description='TotalFreedom bot help command', intents=intents)
+bot = commands.Bot(command_prefix=os.getenv('prefix'),
+                   description='TotalFreedom bot help command', intents=intents)
 
 
 extensions = [
@@ -34,9 +35,11 @@ if __name__ == '__main__':
     for extension in extensions:
         try:
             bot.load_extension(extension)
-            print(f"[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [Extensions] {extension} loaded successfully")
+            print(
+                f"[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [Extensions] {extension} loaded successfully")
         except Exception as e:
-            print(f"[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [Extensions] {extension} didn't load {e}")
+            print(
+                f"[{str(datetime.utcnow().replace(microsecond=0))[11:]} INFO]: [Extensions] {extension} didn't load {e}")
 
 
 @bot.event
@@ -63,7 +66,8 @@ async def on_message(message):
                 try:
                     bot.telnet_object.connect()
                 except Exception as fuckup:
-                    print(f'Second attempt failed to reconnect telnet: {fuckup}')
+                    print(
+                        f'Second attempt failed to reconnect telnet: {fuckup}')
     if not bypass:
         if re.search('discord\.gg\/[a-zA-z0-9\-]{1,16}', message.content) or re.search('discordapp\.com\/invite\/[a-z0-9]+/ig', message.content):
             await message.delete()

telnet.py

@@ -2,6 +2,7 @@ import time
 
 from telnetlib import Telnet
 
+
 class telnet:
     def __init__(self, ip, port, username, password):
         self.ip = ip