Cleanup and fixup 2

Round 2
cleaned up the modules this time
just misc stuff really

Author: 9382

modules/Deathbattle.py

@@ -8,7 +8,7 @@ def __init__(self,hitMsg,dmgMin,dmgMax):
     def __str__(self):
         return self.hitMsg
     def format(self,attacker,victim,damage):
-        return self.hitMsg.format(attacker="__**"+str(attacker)+"**__",victim="__**"+str(victim)+"**__",damage="__**"+str(damage)+" dmg**__")
+        return self.hitMsg.format(attacker=f"__**{attacker}**__",victim=f"__**{victim}**__",damage=f"__**{damage} dmg**__")
     def hit(self):
         return random.randint(self.dmgMin,self.dmgMax)
 class user:

modules/Dev.py

@@ -18,7 +18,7 @@ async def d_execa(msg,args):
     try:
         await globals()[args[2]]()
     except Exception as exc:
-        print("[Dev] Nice custom async exec, but it failed. Command:",msg.content[10:],"Exception:",exc)
+        print("[Dev] Nice custom async exec, but it failed. Command:",args[2],"Exception:",exc)
         await msg.channel.send(":-1: "+str(exc))
     else:
         print("[Dev] Successful async exec")
@@ -32,6 +32,12 @@ async def sendLogFile(msg,args):
         await msg.channel.send("No such log file "+str(exists(args,1) and args[1]))
 Command("sendlog",sendLogFile,0,"Sends the log file specified if it exists",{"log":True},None,"dev")
 
+async def getPing(msg,args):
+    startTime = time.time()
+    message = await msg.channel.send("<???> ms")
+    await message.edit(content=str(round((time.time()-startTime)*1000))+" ms")
+Command("ping",getPing,0,"Uses the time it takes to send a message to calculate its ping",{},None,"dev")
+
 async def currentDateAsync(msg,args):
     await msg.channel.send(currentDate())
 Command("cdate",currentDateAsync,0,"Sends the current date and time as a message",{},None,"dev")
@@ -46,7 +52,7 @@ async def presetAudioTest(msg,args):
         return
     if not exists(args,1):
         args.insert(1,"sigma")
-    file = "storage/temp/"+args[1]+".mp3"
+    file = f"storage/temp/{args[1]}.mp3"
     vc = await connectToVC(msg.author.voice.channel,idleTimeout=1,ignorePlaying=True) #Join
     if not vc:
         await msg.channel.send("Couldnt join the vc, probably cause i was busy")
@@ -86,9 +92,3 @@ async def imageComp(msg,args): #Just a POC, not used meaningfully
     await msg.channel.send(targetUser.name+" in a box",file=discord.File(fileName))
     os.remove(fileName)
 Command("imaget",imageComp,0,"An experiment with image editing",{"user":False},None,"dev")
-
-async def getPing(msg,args):
-    startTime = time.time()
-    message = await msg.channel.send("<???> ms")
-    await message.edit(content=str(round((time.time()-startTime)*1000))+" ms")
-Command("ping",getPing,0,"Uses the time it takes to send a message to calculate its ping",{},None,"dev")

modules/Moderation.py

@@ -36,11 +36,11 @@ async def list_func(msg,args):
         return
     parser = None
     if section in ["WordBlockList","MediaFilters","ChannelClearList","QueuedChannels"]:
-        parser = lambda i,k,v : f"{str(i)}. `{k}` -> {simplifySeconds(v)}"
+        parser = lambda i,k,v : f"{i}. `{k}` -> {simplifySeconds(v)}"
     if section in ["NSFWBlockList","ProtectedMessages"]:
-        parser = lambda i,v : f"{str(i)}. `{v}`"
+        parser = lambda i,v : f"{i}. `{v}`"
     if section == "ChannelLimits":
-        parser = lambda i,k,v : f"{str(i)}. `{k}` -> {str(v)} Messages"
+        parser = lambda i,k,v : f"{i}. `{k}` -> {v} Messages"
     array = getattr(getMegaTable(msg),section)
     finalString = []
     index = 1
@@ -55,7 +55,7 @@ async def list_func(msg,args):
     if finalString == []:
         await msg.channel.send(embed=fromdict({"title":"No Content","description":"Nothing under this catagory","color":colours["warning"]}),delete_after=15)
     else:
-        getMegaTable(msg).ProtectedMessages.append((await createPagedEmbed(msg.author,msg.channel,"List of moderation content",finalString,8,(section=="QueuedChannels" and "(This is how long until the next cycle)") or "")).id)
+        getMegaTable(msg).ProtectedMessages.append((await createPagedEmbed(msg.author,msg.channel,"List of moderation content",finalString,8,(section=="QueuedChannels" and "(How long until the next cycle)") or "")).id)
 Command("list",list_func,0,"View the list of settings to do with the server's administration",{"subsection":False},None,"admin")
 
 async def refilter(msg,args):
@@ -84,7 +84,7 @@ async def protectMessage(msg,args): #Prevents a message from being filtered
         await msg.channel.send(embed=fromdict({"title":"Error","description":"You must provide the message ID to protect","color":colours["error"]}),delete_after=10)
         return
     try:
-        msgid = int(msgid)//1
+        msgid = int(msgid)
     except:
         await msg.channel.send(embed=fromdict({"title":"Error","description":"message ID must be a number","color":colours["error"]}),delete_after=10)
     else:
@@ -196,7 +196,7 @@ async def controlMessageLimit(msg,args,removing):
         if msgLimit <= 0:
             await channel.send(embed=fromdict({"title":"No","description":"1 or more, no less","color":colours["error"]}),delete_after=10)
         gmt.ChannelLimits[str(channel.id)] = msgLimit #JSON Logic
-        await channel.send(embed=fromdict({"title":"Success","description":f"All messages after #{str(msgLimit)} will be auto-deleted","color":colours["success"]}))
+        await channel.send(embed=fromdict({"title":"Success","description":f"All messages after #{msgLimit} will be auto-deleted","color":colours["success"]}))
     else:
         if exists(gmt.ChannelLimits,channel.id):
             gmt.ChannelLimits.pop(channel.id)
@@ -224,15 +224,15 @@ async def clearAllInvites(msg,args,silent=False):
     if silent:
         return True,f"{str(successRate)}/{str(totalCount)}"
     else:
-        await msg.channel.send(embed=fromdict({"title":"Success","description":f"{str(successRate)} out of {str(totalCount)} invites were successfully cleared","color":colours["success"]}))
+        await msg.channel.send(embed=fromdict({"title":"Success","description":f"{successRate} out of {totalCount} invites were successfully cleared","color":colours["success"]}))
 async def clearInvitesConfirm(msg,args):
     await getMegaTable(msg).CreateConfirmation(msg,args,clearAllInvites)
 Command("clearinvites",clearInvitesConfirm,5,"Clears all invites in the server, deleting them",{},None,"admin")
 
-async def panic(msg,args):
+async def panic(msg,args): #Unfinished!
     finalString = ""
     success,result = await clearAllInvites(msg,args,True)
-    finalString += "Invite clear: "+(success and "Sucessfully cleared "+result+" invites\n") or "Failed\n"
+    finalString += "Invite clear: "+(success and f"Sucessfully cleared {result} invites\n") or "Failed\n"
     await msg.channel.send(embed=fromdict({"title":"Panic results:","description":finalString,"color":colours["info"]}))
 async def confirmPanic(msg,args):
     await getMegaTable(msg).CreateConfirmation(msg,args,panic)

modules/NSFW.py

@@ -91,20 +91,17 @@ async def getPostList(msg,sitetype,tags):
                 anyMessageFiltered = True
     if len(returnContent) == 0:
         if anyMessageFiltered:
-            await msg.channel.send(embed=fromdict({"title":"Post Blocked","description":"The recieved post contained one or more blocked tags","color":colours["error"]})) #No
+            await msg.channel.send(embed=fromdict({"title":"Post Blocked","description":"The recieved post contained one or more blocked tags","color":colours["error"]}),delete_after=15) #No
         else:
-            await msg.channel.send(embed=fromdict({"title":"No Posts","description":"No posts were found under your requested tags","color":colours["error"]})) #Consider adding delete_after
+            await msg.channel.send(embed=fromdict({"title":"No Posts","description":"No posts were found under your requested tags","color":colours["error"]}),delete_after=15)
         return
     return returnContent
 async def nsfwScrape(msg,args,sitetype): #I spent hours on this and idk if i should be happy about it
     if not msg.channel.is_nsfw():
         await msg.channel.send(embed=fromdict({"title":"Disallowed","description":"You can only use NSFW commands in channels marked as NSFW","color":colours["error"]}),delete_after=10)
         return
-    tags = ""
-    for i in args[1:]: #Avoid calling command
-        tags = tags+i+"+" #A trailing + is fine
     try:
-        postList = await getPostList(msg,sitetype,tags) #HTTP Requests, therefore try: it
+        postList = await getPostList(msg,sitetype,"+".join(args[1:])) #HTTP Requests, therefore try: it
     except Exception as exc:
         log(f"[NSFW] {sitetype} GetPosts Exception: "+str(exc))
         await msg.channel.send(embed=fromdict({"title":"Unexpected Error","description":"Something unexpected went wrong, hopefully it wont happen again","color":colours["error"]}),delete_after=10)

modules/Tests.py

@@ -1,13 +1,11 @@
 #Seperate script to improve ##cmds ordering and for convenience
 TestCommandList = []
 def AddCommand(a,b,c,d,e,f):
-    cmdObject = Command(a,b,c,d,e,f,"dev")
-    if a != "d -test onerror":
-        TestCommandList.append(cmdObject)
+    TestCommandList.append(Command(a,b,c,d,e,f,"dev"))
 
-async def horribleCoding(msg,args):
-    [] # This is just designed to error
-AddCommand("d -test error",horribleCoding,0,"Forces an error to test the error logging",{},None)
+async def forceOnError(msg,args):
+    await on_error(msg)
+AddCommand("d -test onerror",forceOnError,0,"Forces an error to test the error logging",{},None)
 async def forceOnReady(msg,args):
     await on_ready()
 AddCommand("d -test onready",forceOnReady,0,"Runs the on_ready function",{},None)
@@ -19,12 +17,12 @@ async def testConfirmations(msg,args):
 AddCommand("d -test confirmations",testConfirmations,0,"Tests the Confirmations feature",{},None)
 async def testReactionListener2(msg,emoji,score):
     score += 1
-    await msg.edit(content=f"This message + {str(score)}")
+    await msg.edit(content=f"This message + {score}")
     await UpdateReactionWatch(msg,"all",score)
 async def testReactionListener(msg,args):
     message = await msg.channel.send("This message + 0")
     await message.add_reaction("⬅️")
-    WatchReaction(message,msg.author,"⬅",testReactionListener2,0)
+    WatchReaction(message,msg.author,"⬅️",testReactionListener2,0)
 AddCommand("d -test reactions",testReactionListener,0,"Tests the Reaction Listener",{},None)
 async def testPagedEmbed(msg,args): #user, channel, title, content, pagelimit
     await createPagedEmbed(msg.author,msg.channel,msg.author.name,["A","B","C","D","E","F","G","H","I","J"],4)
@@ -41,9 +39,9 @@ async def testAll(msg,args):
             else:
                 print("Failed run of",command.Name)
         except Exception as exc:
-            print("Critical fail run of",command.Name,":",exc)
+            print(f"Critical fail run of {command.Name}: {exc}")
         score[0] += 1
-    await msg.channel.send(f"All tests finished: Final score {str(score[1])} out of {str(score[0])}")
+    await msg.channel.send(f"All tests finished: Final score {score[1]} out of {score[0]}")
     print("Test-All final score",score)
 Command("d -test all",testAll,0,"Runs all 'd -test' commands and returns the success score",{},None,"dev")
 AddCommand = None
@@ -86,7 +84,7 @@ def __init__(self,content=None,embed=None,gid=None,uid=None):
     async def delete(self):
         print("Tried to delete message",self.id,self.content)
 
-async def AdvancedTest(msg,args):
+async def AdvancedTest(msg,args): #Possibly OTT
     print("Trying advanced test")
     fm = FakeMessage
     await on_message(fm("##blockword testing 1s",gid=-1)) #Should work - user is admin