Misc cleanup

Fully removed TTS
Patched up a couple of inconsistencies
Changed a few notes
Changed all ' to " (with a few exceptions)
Used f"" more often
Minor code edits
(The NSFW module was so neglected)
This was really needed, and could use more cleanup (rewriting a few oddly / poorly written functions)

Author: 9382

__start__.py

@@ -3,7 +3,7 @@
 from time import sleep
 import asyncio
 import os
-auth = dotenv_values()['BOTAUTH']
+auth = dotenv_values()["BOTAUTH"]
 print("Starting...",os.getcwd())
 try:
     from main import client,log
@@ -22,21 +22,21 @@ def log(content):
     except Exception as exc:
         log("[!] client.run exited: "+str(exc))
 log("Checking for updates for client...")
-for i in os.listdir('update'): #What a mess
+for i in os.listdir("update"): #What a mess
     log("[Updater] "+i)
     if i == "__start__.py":
-        log("Please update __start__ manually instead of through auto-update. Trust me, you dont want that headache")
+        log("Please update __start__ manually instead of through auto-update")
         continue
     trueName = i.replace("^","/")
     if trueName != i:
         log("Sub-folder detected: "+str(i.split("^")))
-    newFile = open('update/'+i,newline='').read()
+    newFile = open("update/"+i,newline="").read()
     backup = None
     if os.path.isfile(i):
-        backup = open(trueName,newline='').read()
+        backup = open(trueName,newline="").read()
     else:
         log("No backup can be made for "+trueName)
-    oldFile = open(trueName,"w",newline='')
+    oldFile = open(trueName,"w",newline="")
     try:
         oldFile.write(newFile)
         log("Successfully written update for "+trueName)
@@ -51,10 +51,10 @@ def log(content):
         else:
             log(f"[!] Update for {trueName} failed (No backup): "+str(exc))
     else:
-        os.remove('update/'+i)
+        os.remove("update/"+i)
     oldFile.close()
 log("Rebooting...")
 if platform.startswith("win"): #win32/win64
-    os.system('start __start__.py')
+    os.system("start __start__.py")
 else: #Assume linux - use sh
-    os.system('./start.sh')
+    os.system("./start.sh")

main.py

@@ -14,8 +14,8 @@
 import os
 prefix = "##"
 DevID = 260016427900076033
-logChannels = {'errors':872153712347467776,'boot-ups':872208035093839932} # These are different from the guild-defined LogChannel channels, these are essentially telemetry
-colours = {'info':0x5555DD,'error':0xFF0000,'success':0x00FF00,'warning':0xFFAA00,'plain':0xAAAAAA}
+logChannels = {"errors":872153712347467776,"boot-ups":872208035093839932} # These are different from the guild-defined LogChannel channels, these are essentially telemetry
+colours = {"info":0x5555DD,"error":0xFF0000,"success":0x00FF00,"warning":0xFFAA00,"plain":0xAAAAAA}
 
 #Base functions
 def exists(table,value): #Wanna reduce the try except spam checking for possible values
@@ -25,53 +25,54 @@ def exists(table,value): #Wanna reduce the try except spam checking for possible
     except:
         return False
 def tempFile(extension="txt"):
-    name = "storage/temp/"+str(time.time())+"."+extension
+    name = f"storage/temp/{str(time.time())}.{extension}"
     open(name,"x")
     return name
 def currentDate():
-    return str(datetime.fromtimestamp(time.time()//1)) #Long function list be like
+    return str(datetime.fromtimestamp(time.time()//1))
 def log(content):
     print(f"[Log {currentDate()[11:]}]",content)
     try:
-        open("storage/logs/"+currentDate()[:10]+".log","a").write(f"[{currentDate()[11:]}] "+content+"\n")
+        open(f"storage/logs/{currentDate()[:10]}.log","a").write(f"[{currentDate()[11:]}] {content}\n")
+        return True
     except Exception as exc:
-        print("[Log] Failed to log!",exc)
-log("Starting main - the time is "+str(time.time())+" or "+currentDate())
+        print("[Log] Failed to log!",currentDate(),exc)
+log(f"Starting main - the time is {str(time.time())} or {currentDate()}")
 def safeWriteToFile(filename,content,encoding="UTF-8"):
     backup = None
     if os.path.isfile(filename):
         try:
             backup = open(filename,"rb").read()
         except:
-            log("[SafeWrite] Failed to open "+filename+" - Probably access issues")
-            return
+            log(f"[SafeWrite] Failed to open {filename} - Probably access issues")
+            return False
     try:
         file = open(filename,"w",encoding=encoding)
     except:
-        log("[SafeWrite] Failed to open "+filename+" - Probably access issues")
-        return
+        log(f"[SafeWrite] Failed to open {filename} - Probably access issues")
+        return False
     try:
         file.write(content)
     except Exception as exc:
         file.close()
         if backup:
             open(filename,"wb").write(backup)
-            log("[SafeWrite] Failed to write to "+filename+": "+str(exc))
+            log(f"[SafeWrite] Failed to write to {filename}: "+str(exc))
         else:
-            log("[SafeWrite] Failed to write to "+filename+" with no backup available: "+str(exc))
-        return
+            log(f"[SafeWrite] Failed to write to {filename} with no backup available: "+str(exc))
+        return False
     print("[SafeWrite] Successfully wrote to "+filename)
     return True
-multList = {"s":1,"m":60,"h":3600,"d":86400}
+timeMultList = {"s":1,"m":60,"h":3600,"d":86400}
 def strToTimeAdd(duration):
     timeMult = duration[-1].lower()
     timeAmount = duration[:-1]
     try:
         timeAmount = int(timeAmount)
     except:
         return False,"timeAmount must be an integer"
-    if timeMult in multList:
-        return True,timeAmount*multList[timeMult]
+    if timeMult in timeMultList:
+        return True,timeAmount*timeMultList[timeMult]
     else:
         return False,"Time period must be s, m, h or d"
 def simplifySeconds(seconds): #Feels like it could be cleaner, but eh
@@ -95,7 +96,7 @@ def simplifySeconds(seconds): #Feels like it could be cleaner, but eh
         returnString = (p==0 and str(days)+" day(s)") or (p==1 and str(days)+" day(s) and "+returnString) or str(days)+" day(s), "+returnString
     return returnString
 fromdict = discord.Embed.from_dict
-numRegex = regex.compile('\d+')
+numRegex = regex.compile("\d+")
 findMediaRegex = regex.compile("https?://((cdn|media)\.discordapp\.(com|net)/attachments/|tenor\.com/view/)")
 
 #GMT
@@ -175,7 +176,7 @@ def RemoveChannelClear(self,channel): # Read above
     async def AddToFilter(self,msg,buffer):
         if buffer == None: # Failsafe, just in case
             return
-        print("[Filter] Msg Filtered ->",msg.content,buffer)
+        print("[Filter] Msg Filtered ->",buffer,msg.content)
         if buffer <= 0:
             try:
                 await msg.delete()
@@ -347,17 +348,17 @@ async def Run(self,msg,args,bypassRL=False):
         return True,0
 async def doTheCheck(msg,args,commandTable): #Dont wanna type this 3 times
     arg0 = args[0]
-    if '\n' in arg0:
-        args[0] = arg0.split('\n')[0]
-        args.insert(1,arg0.split('\n')[1])
+    if "\n" in arg0:
+        args[0] = arg0.split("\n")[0]
+        args.insert(1,arg0.split("\n")[1])
     c = msg.content
     for command in commandTable:
         cregion = len(prefix+command) #command region
         if prefix+command == c[:cregion] and (not exists(c,cregion) or c[cregion] == " " or c[cregion] == "\n"):
             success,result = await commandTable[command].Run(msg,args)
             if not success:
                 if result != -1: # If first repeat:
-                    await msg.channel.send(embed=fromdict({'title':'Slow Down','description':'That command is limited for '+simplifySeconds(math.floor(result))+' more seconds','color':colours['warning']}),delete_after=result)
+                    await msg.channel.send(embed=fromdict({"title":"Slow Down","description":f"That command is limited for {simplifySeconds(math.floor(result))} more seconds","color":colours["warning"]}),delete_after=result)
             return True
 
 #Reaction listening
@@ -430,7 +431,7 @@ async def cloneChannel(channelid):
             gmt.ChannelLimits.pop(channelid)
         await channel.delete()
         newchannel.position = channel.position #Because clone doesnt include position
-        await newchannel.send(embed=fromdict({'title':'Success','description':channel.name+' has been re-made and cleared','color':colours['success']}),delete_after=60)
+        await newchannel.send(embed=fromdict({"title":"Success","description":channel.name+" has been re-made and cleared","color":colours["success"]}),delete_after=60)
         print("[CloneChannel] Successfully cloned channel",channel.name)
         return newchannel
     except Exception as exc:
@@ -439,7 +440,7 @@ def findVoiceClient(guildId): #Find the relevant voice client object for the spe
     for voiceObj in client.voice_clients:
         if voiceObj.guild.id == guildId:
             return voiceObj
-VCList = {}
+VCList = {} #Unmaintained and possibly broken
 async def connectToVC(channel,idleTimeout=60,ignorePlaying=False):
     vc = findVoiceClient(channel.guild.id)
     if vc:
@@ -466,33 +467,33 @@ async def on_error(error,*args,**kwargs):
         try:
             causingCommand = args[0].content
         except:
-            causingCommand = args[0]
+            causingCommand = str(args[0])
     else:
         causingCommand = "<none>"
-    log("[Fatal Error] Causing command: "+str(causingCommand)+"\nError:")
+    log(f"[Fatal Error] Causing command: {causingCommand}\nError:")
     traceback.print_exc(file=sys.stderr)
     try: #Logging
         errorFile = tempFile()
-        file = open(errorFile,"w",encoding="UTF-8",newline='') #Linux doesnt support ansi?
+        file = open(errorFile,"w",encoding="UTF-16",newline="") #UTF-16 just incase it all goes to hell
         try:
             traceback.print_exc(file=file)
         except Exception as exc:
             log("[Fatal Error] Error Log file failed to write: "+str(exc))
             pass
         file.close()
-        await client.get_channel(logChannels['errors']).send("Error in client\nTime: "+currentDate()+"\nCausing command: "+str(causingCommand),file=discord.File(errorFile))
+        await client.get_channel(logChannels["errors"]).send(f"Error in client\nTime: {currentDate()}\nCausing command: {causingCommand}",file=discord.File(errorFile))
         os.remove(errorFile)
     except Exception as exc:
-        log("[Fatal Error] Failed to log: "+currentDate()+str(exc))
+        log(f"[Fatal Error] Failed to log error: {currentDate()} {str(exc)}")
 uptime = 0
 @client.event
 async def on_ready():
     global uptime
-    await client.change_presence(activity=discord.Game(name='##cmds'))
-    log('connected v'+discord.__version__)
+    await client.change_presence(activity=discord.Game(name="##cmds"))
+    log("connected v"+discord.__version__)
     uptime = time.time()//1
     try: #Notifying of start-up
-        await client.get_channel(logChannels['boot-ups']).send("Ive connected at "+currentDate())
+        await client.get_channel(logChannels["boot-ups"]).send("Ive connected at "+currentDate())
     except:
         log("Failed to alert of bootup at "+currentDate())
 @client.event
@@ -501,15 +502,15 @@ async def on_message(msg):
         if msg.guild:
             await getMegaTable(msg).FilterMessage(msg)
         elif msg.author.id != client.user.id:
-            await msg.channel.send(embed=fromdict({'title':'Not here','description':'This bot can only be used in a server, and not dms','color':colours['error']}))
+            await msg.channel.send(embed=fromdict({"title":"Not here","description":"This bot can only be used in a server, and not dms","color":colours["error"]}))
         return
     gmt = getMegaTable(msg)
     await gmt.FilterMessage(msg)
     if type(msg.author) == discord.User: #Webhook
         return
-    if await gmt.CheckConfirmation(msg):
-        return
-    args = msg.content.split(' ') #Please keep in mind the first argument is the calling command
+    if await gmt.CheckConfirmation(msg): #Confirmations arent commands, simple as that
+        return await checkHistoryClear(msg)
+    args = msg.content.split(" ") #Please keep in mind the first argument is the calling command
     if msg.author.id == DevID:
         if await doTheCheck(msg,args,devCommands):
             return
@@ -518,26 +519,26 @@ async def on_message(msg):
             return
     if await doTheCheck(msg,args,userCommands):
         return
-    await checkHistoryClear(msg) #Since its fired after a command, add a backup here
+    await checkHistoryClear(msg) #Since its fired after a command, add a backup check here
 @client.event
 async def on_raw_message_edit(msg): #On message edit to avoid bypassing
     try:
-        messageObj = await discord.PartialMessage(channel=client.get_channel(int(msg.data['channel_id'])),id=int(msg.data['id'])).fetch()
+        messageObj = await discord.PartialMessage(channel=client.get_channel(int(msg.data["channel_id"])),id=int(msg.data["id"])).fetch()
     except:
-        pass #Dont care if this errors since it bloody will and its not an issue
+        pass
     else:
         await getMegaTable(messageObj).FilterMessage(messageObj)
 @client.event
 async def on_reaction_add(reaction,user):
-    if user.id == client.user.id: #If its me
+    if user.id == client.user.id: #If its the bot
         return
     ListenListCache = ReactionListenList
     for listener in ListenListCache:
         await listener.Check(reaction.message,user,reaction.emoji)
 @client.event
 async def on_guild_join(guild):
-    guildMegaTable[guild.id] = GuildObject(guild.id) # Force default settings
-    getMegaTable(guild).InviteTrack = await getGuildInviteStats(guild)
+    guildMegaTable[guild.id] = GuildObject(guild.id) #Force default settings
+    getMegaTable(guild).InviteTrack = await getGuildInviteStats(guild) #Does this even work?
 @client.event
 async def on_member_join(member):
     guild = member.guild
@@ -615,12 +616,12 @@ async def constantChannelCheck(): #For queued channel clearing
 async def updateConfigFiles(): #So i dont have pre-coded values
     try:
         for guild in client.guilds:
-            safeWriteToFile("storage/settings/"+str(guild.id)+".json",json.dumps(getMegaTable(guild).CreateSave()))
+            safeWriteToFile(f"storage/settings/{str(guild.id)}.json",json.dumps(getMegaTable(guild).CreateSave()))
     except Exception as exc:
         log("[!] UpdateConfig Exception: "+str(exc))
 updateConfigFiles.start()
 @tasks.loop(seconds=2)
-async def VCCheck():
+async def VCCheck(): #Auto disconnect
     try:
         for vc in VCList:
             if vc.is_playing():
@@ -630,7 +631,7 @@ async def VCCheck():
     except Exception as exc:
         log("[!] VCCheck Exception: "+str(exc))
 VCCheck.start()
-@tasks.loop(seconds=5)
+@tasks.loop(seconds=15)
 async def keepGuildInviteUpdated():
     for guild in client.guilds:
         gmt = getMegaTable(guild)
@@ -639,14 +640,14 @@ async def keepGuildInviteUpdated():
 keepGuildInviteUpdated.start()
 
 #User Commands
-async def forceUpdate(msg,args):
+async def forceUpdate(msg,args): #(Safely) close the bot down for updating
     global stopCycling
     log("Client was force-exited via forceUpdate() "+str(time.time()))
     log("Hanging until messageCheck has finished its cycle or 20s, whatever is shorter")
     stopCycling = True
     sleepTime = 0
     while True:
-        if finishedLastCycle == True or sleepTime>=20: #? idk
+        if finishedLastCycle == True or sleepTime>=20: #Timeout worries
             break
         sleepTime+=1
         await asyncio.sleep(1)
@@ -691,13 +692,13 @@ async def cmds(msg,args):
 Command(["commands","cmds"],cmds,1,"List all commands",{"group":False},None,"General")
 async def publicVote(msg,args):
     if len(args) < 2:
-        await msg.channel.send(embed=fromdict({'title':'Error','description':'You gotta include the thing to vote on','color':colours['error']}),delete_after=30)
+        await msg.channel.send(embed=fromdict({"title":"Error","description":"You gotta include the thing to vote on","color":colours["error"]}),delete_after=10)
         return
     attachments = msg.attachments
     imageUrl = (exists(attachments,0) and attachments[0].url) or ""
     author = msg.author
     wantedReactions = []
-    findWantedReaction = regex.compile('^{[^\]]+}$')
+    findWantedReaction = regex.compile("^{[^\]]+}$")
     index = -1
     for i in args: #Get user-defined reactions ( [:reaction:] )
         index += 1
@@ -708,8 +709,8 @@ async def publicVote(msg,args):
     msgContent = ""
     for i in args:
         if i: #mhm
-            msgContent = msgContent + i + " "
-    voteMsg = await msg.channel.send(embed=fromdict({'author':{'name':author.name+"#"+author.discriminator+' is calling a vote','icon_url':str(author.avatar_url)},'description':msgContent,'image':{'url':imageUrl},'color':colours['info']}))
+            msgContent = msgContent+i+" "
+    voteMsg = await msg.channel.send(embed=fromdict({"author":{"name":f"{author.name}#{author.discriminator} is calling a vote","icon_url":str(author.avatar_url)},"description":msgContent,"image":{"url":imageUrl},"color":colours["info"]}))
     try:
         await msg.delete()
     except:
@@ -726,7 +727,7 @@ async def publicVote(msg,args):
 Command("vote",publicVote,10,"Make a public vote about anything with an optional image",{"text":True,"imagefile":False},None,"General")
 
 #Module importing
-log('attempting import')
+log("attempting import")
 ''' Load modules from the modules folder
 Only use this for storing commands, as load order is random
 This is so i dont clog up the entirety of this main script with like 2k lines '''
@@ -753,14 +754,14 @@ async def loadModulesAsync(msg,args):
 
 #Finish off - load configs
 log("done commands")
-for i in os.listdir('storage/settings'):
+for i in os.listdir("storage/settings"):
     try:
-        j = json.loads(open('storage/settings/'+i).read())
+        j = json.loads(open("storage/settings/"+i).read())
     except:
         log("[JSON] Load failed for file "+i)
     else:
         try:
-            getMegaTable(j['Guild']).LoadSave(j)
+            getMegaTable(j["Guild"]).LoadSave(j)
         except:
             log("[JSON] Guild index failed for file "+i)
 log("loaded config")