Bumpped version and formatted code

Author: PantomInach

cogs/commandlistener.py

@@ -50,13 +50,23 @@ async def on_ready(self):
         # Sends message to mods, when bot is online
         print("Now Online")
         await self.utils.sendModsMessage(
-            "Bot is now online.\nVersion:\tDiscordBot DataBot v2.3.1"
+            "Bot is now online.\nVersion:\tDiscordBot DataBot v2.4.0"
         )
         # Sets the bot's presence to "Online" or "Do not Disturb" to indicate if it's logging or not.
         if self.ch.getFromConfig("log") == "True":
-            await self.bot.change_presence(status=discord.Status.online, activity=discord.Game(str(self.ch.getFromConfig("command_prefix")) + "help"))
-        else:    
-            await self.bot.change_presence(status=discord.Status.dnd, activity=discord.Game(str(self.ch.getFromConfig("command_prefix")) + "help"))
+            await self.bot.change_presence(
+                status=discord.Status.online,
+                activity=discord.Game(
+                    str(self.ch.getFromConfig("command_prefix")) + "help"
+                ),
+            )
+        else:
+            await self.bot.change_presence(
+                status=discord.Status.dnd,
+                activity=discord.Game(
+                    str(self.ch.getFromConfig("command_prefix")) + "help"
+                ),
+            )
 
     # When a member joins a guild
     @commands.Cog.listener()
@@ -263,7 +273,7 @@ async def on_voice_state_update(self, member, before, after):
                 if notFirstVoiceChannel:
                     lastChannel = max(
                         notFirstVoiceChannel,
-                        key=lambda c: int(c.name[len(channelWithoutNumber):]),
+                        key=lambda c: int(c.name[len(channelWithoutNumber) :]),
                     )
 
                     # Removes channel from blacklist if necessary
@@ -310,11 +320,11 @@ async def on_voice_state_update(self, member, before, after):
                     channel
                     for channel in allChannel
                     if after.channel.name[:nameIndex] in channel.name
-                    and channel.name[len(channelWithoutNumber):].isdigit()
+                    and channel.name[len(channelWithoutNumber) :].isdigit()
                 ]
                 # Get all numbers in the end of voiceChannelsWithName
                 numbersOfChannels = [
-                    int(channel.name[len(channelWithoutNumber):])
+                    int(channel.name[len(channelWithoutNumber) :])
                     for channel in voiceChanelsWithName
                 ]
                 lowestFreeID = min(
@@ -326,7 +336,7 @@ async def on_voice_state_update(self, member, before, after):
                 )
 
                 channelWithNumberBefore = find(
-                    lambda c: c.name[-len(str(lowestFreeID - 1)):]
+                    lambda c: c.name[-len(str(lowestFreeID - 1)) :]
                     == str(lowestFreeID - 1),
                     voiceChanelsWithName,
                 )

cogs/commandowner.py

@@ -74,11 +74,21 @@ async def startlog(self, ctx):
             guildName = str(self.bot.get_guild(guildID))
             await self.utils.log(f"Start to log users from Server:\n\t{guildName}", 2)
             # Sets the bot's presence to "Online" to indicate it's logging.
-            await self.bot.change_presence(status=discord.Status.online, activity=discord.Game(str(self.ch.getFromConfig("command_prefix")) + "help"))
+            await self.bot.change_presence(
+                status=discord.Status.online,
+                activity=discord.Game(
+                    str(self.ch.getFromConfig("command_prefix")) + "help"
+                ),
+            )
         else:
             await ctx.send("Bot is logging. Logging state: True")
         # Sets the bot's presence to "Online" to indicate it's logging.
-        await self.bot.change_presence(status=discord.Status.online, activity=discord.Game(str(self.ch.getFromConfig("command_prefix")) + "help"))
+        await self.bot.change_presence(
+            status=discord.Status.online,
+            activity=discord.Game(
+                str(self.ch.getFromConfig("command_prefix")) + "help"
+            ),
+        )
 
     @commands.command(
         name="stoplog",
@@ -96,7 +106,12 @@ async def stoplog(self, ctx):
             self.ch.saveConfig()
             await self.utils.log(f"Stopped to log users from Server:\n\t{guildName}", 2)
             # Sets the bot's presence to "Do not Disturb" to indicate it's not logging.
-            await self.bot.change_presence(status=discord.Status.dnd, activity=discord.Game(str(self.ch.getFromConfig("command_prefix")) + "help"))
+            await self.bot.change_presence(
+                status=discord.Status.dnd,
+                activity=discord.Game(
+                    str(self.ch.getFromConfig("command_prefix")) + "help"
+                ),
+            )
         else:
             await ctx.send("Bot is NOT logging. Logging state: False")
 

cogs/commandsubroutine.py

@@ -235,17 +235,15 @@ def addMembersOnlineVoiceXp(self, serverid):
         ]
         # Total all connected members
         for channel in voiceChanels:
-            membersInChannel = [
-                member for member in channel.members if not member.bot]
+            membersInChannel = [member for member in channel.members if not member.bot]
             # Check if more than one person is in channel
             if len(membersInChannel) >= 2:
                 membersNotMutedOrBot = [
                     member
                     for member in membersInChannel
                     if not (member.voice.self_mute or member.bot)
                 ]
-                self.uh.addAllUserVoice(
-                    [member.id for member in membersNotMutedOrBot])
+                self.uh.addAllUserVoice([member.id for member in membersNotMutedOrBot])
                 # Extra XP
                 membersStreamOrVideo = [
                     member

cogs/commandsubserver.py

@@ -659,8 +659,7 @@ def get_all_subserver_roles(self):
         ]
         # Sort by subserver name. '+ r.name[1]' is for sorting sub roles on top of
         # subway roles, since '+ r.name[1]' is 'u' or 'w'.
-        sorted_roles = sorted(
-            sub_roles, key=lambda r: r.name.split("-")[1] + r.name[1])
+        sorted_roles = sorted(sub_roles, key=lambda r: r.name.split("-")[1] + r.name[1])
         if not sorted_roles:
             return []
         # Data pattern: [(sub-a, sw-a), ...]

helpfunctions/decorators.py

@@ -132,9 +132,7 @@ def decorator(func):
         def wrapper(*args, **kwargs):
             # Wrapper for inputs in func
             dm = isinstance(args[1].channel, discord.channel.DMChannel)
-            if dm or not (
-                args[1].channel.id in items or args[1].channel.name in items
-            ):
+            if dm or not (args[1].channel.id in items or args[1].channel.name in items):
                 return func(*args, **kwargs)
             return passFunc()
 

helpfunctions/utils.py

@@ -206,9 +206,7 @@ def getLeaderboardPageBy(self, page, sortBy):
                 nick = "".join(
                     [c for c in member.display_name if c not in UNICODE_EMOJI["en"]]
                 )
-                name = "".join(
-                    [c for c in member.name if c not in UNICODE_EMOJI["en"]]
-                )
+                name = "".join([c for c in member.name if c not in UNICODE_EMOJI["en"]])
             else:
                 # When user is not in guild.
                 nick = "Not on guild"
@@ -237,9 +235,13 @@ def _get_leaderboard_pageFirstRank(leaderboard_page: str) -> int:
         Determines the first rank number on leaderboard page. Used to identify the number of the current page.
         """
         leaderboard_search_pattern = re.compile("```as\n *[0-9]+\.")
-        leaderboard_search_match = leaderboard_search_pattern.search(str(leaderboard_page))
+        leaderboard_search_match = leaderboard_search_pattern.search(
+            str(leaderboard_page)
+        )
         # Check if match was found.
-        leaderboard_search_result = "" if not leaderboard_search_match else leaderboard_search_match.group(0)
+        leaderboard_search_result = (
+            "" if not leaderboard_search_match else leaderboard_search_match.group(0)
+        )
         pageFirstRank = int(str(leaderboard_search_result)[6:-1])
         return pageFirstRank
 

test/datahandler/testUserHandle.py

@@ -15,8 +15,7 @@ class TestUserHandle(unittest.TestCase):
     def test_isInData(self):
         for i in range(1, 11):
             self.assertTrue(
-                self.userHandler.isInData(
-                    i), f"User with ID {i} should be in database."
+                self.userHandler.isInData(i), f"User with ID {i} should be in database."
             )
             self.assertTrue(
                 self.userHandler.isInData(str(i)),
@@ -26,8 +25,7 @@ def test_isInData(self):
             self.userHandler.isInData(0), "User with ID 0 should not be in database."
         )
         self.assertFalse(
-            self.userHandler.isInData(
-                11), "User with ID 11 should not be in database."
+            self.userHandler.isInData(11), "User with ID 11 should not be in database."
         )
         self.assertFalse(
             self.userHandler.isInData(100),