Overall fixes to unexpected/unwanted behavior

cogs/leaderboard.py

@@ -46,14 +46,15 @@ class Leaderboard(commands.Cog):
                 botmessage = botmessage + i + "\n"
             await ctx.send(botmessage)
 
-        if(len(servers) != 0):           
-            if(len(servers) > 1):   
-                for i in servers:
-                    if(i in " ".join(message)):
-                        server = i
-                        break   
-            else:
-                server = servers[0]
+        servers.append(self.getserver("", " ".join(message)))
+        server = ""
+        if(len(servers) > 1):   
+            for i in servers:
+                if(i.lower() in " ".join(message).lower()):
+                    server = i
+                    break   
+                else:
+                    server = servers[0]
 
         botmessage = self.getleaderboard(weaponid=weaponid, weaponname=weaponname, server=server, board=board)
 
@@ -137,7 +138,7 @@ class Leaderboard(commands.Cog):
 
         return weaponid, weaponname
 
-    def getserver(self, snippet):
+    def getserver(self, snippet, fullmessage = ""):
         server = ""
         response = requests.get('https://tone.sleepycat.date/v2/client/servers').json()
         servers = response.keys()
@@ -145,6 +146,8 @@ class Leaderboard(commands.Cog):
         for i in servers:
             if(snippet.lower() in i.lower()):
                 server = i
+            if(i.lower() in fullmessage.lower()):
+                server = i
                 break
 
         return server
@@ -164,7 +167,6 @@ class Leaderboard(commands.Cog):
             easyfilter = True
         else:
             hardfilter = True
-
         top10 = {}
         while(len(top10)<10):
             current = 0 
@@ -175,10 +177,12 @@ class Leaderboard(commands.Cog):
                     checked = stats[str(board)]
                 if(hardfilter):
                     if(board.lower() == "kd"):
-                        if (stats['deaths'] == 0):
-                            deaths = 1
+                        if(weaponid != ""):
+                            deaths = stats['deaths_while_equipped']
                         else:
                             deaths = stats['deaths']
+                        if(deaths == 0):
+                            deaths = deaths + 1
                         checked = round(stats["kills"] / deaths, 2)
                     if(board.lower() == "avgd"):
                         if(stats["kills"] == 0):
@@ -212,7 +216,7 @@ class Leaderboard(commands.Cog):
                 stat = str("{:0.2f}".format(j))
             if(easyfilter):
                 stat = str(j)
-            botmessage = botmessage + str(f"{str(counter):<2}"+ " - " + f"{i :<15}" + " : "+ f"{stat:<8}" + "\n")
+            botmessage = botmessage + str(f"{str(counter):<2}"+ " - " + f"{i :<20}" + " : "+ f"{stat:<8}" + "\n")
             counter= counter+1 
 
         return botmessage