Reformated and changed version

Author: PantomInach

cogs/commandgiverole.py

@@ -342,7 +342,9 @@ def search_table(self, channel_id, message_id):
             table_temp = self.get_table_content(table_name)
             table_mid = table_temp["messageid"]
             table_cid = table_temp["channelid"]
-            if str(channel_id) == str(table_cid) and str(message_id) == str(table_mid):
+            if str(channel_id) == str(table_cid) and str(message_id) == str(
+                table_mid
+            ):
                 table_content = table_temp
                 break
         return table_content

cogs/commandlistener.py

@@ -50,7 +50,7 @@ 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 v1.4.0"
+            "Bot is now online.\nVersion:\tDiscordBot DataBot v2.0.1"
         )
 
     # When a member joins a guild
@@ -61,7 +61,8 @@ async def on_member_join(self, member):
 
         Creates a welcome message in the log channel
         """
-        channel = self.bot.get_channel(int(self.jh.getFromConfig("logchannel")))
+        channel = self.bot.get_channel(
+            int(self.jh.getFromConfig("logchannel")))
         guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
         await channel.send(f"Hey **{member.mention}**, welcome to {guild}")
 
@@ -80,7 +81,8 @@ async def on_member_remove(self, member):
 
         Sends a goodbye message in the log channel
         """
-        channel = self.bot.get_channel(int(self.jh.getFromConfig("logchannel")))
+        channel = self.bot.get_channel(
+            int(self.jh.getFromConfig("logchannel")))
         guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
         await channel.send(
             f"**{member.name}** has left {guild}. Press F to pay respect."
@@ -208,7 +210,8 @@ async def on_raw_reaction_add(self, payload):
                     not (message.author.bot or payload.member.bot)
                     and self.jh.getFromConfig("log") == "True"
                 ):
-                    self.jh.addReactionXP(payload.user_id, self.xpf.randomRange(1, 5))
+                    self.jh.addReactionXP(
+                        payload.user_id, self.xpf.randomRange(1, 5))
                     self.jh.saveData()
 
     # When a user changes his voice state
@@ -244,7 +247,10 @@ async def on_voice_state_update(self, member, before, after):
             and before.channel.name[-1].isdigit()
         ):
             # Member left first channel
-            if before.channel.name[-1] == "1" and not before.channel.name[-2].isdigit():
+            if (
+                before.channel.name[-1] == "1"
+                and not before.channel.name[-2].isdigit()
+            ):
                 # Delete last channel, which has no user in it
 
                 channelWithoutNumber = before.channel.name[:-1]
@@ -296,7 +302,8 @@ async def on_voice_state_update(self, member, before, after):
             # in it
             if afterNumber and len(
                 find(
-                    lambda c: c.name == (channelWithoutNumber + "1"), allChannel
+                    lambda c: c.name == (
+                        channelWithoutNumber + "1"), allChannel
                 ).members
             ):
                 # Get channels with after.channel.name without numbers in it and end
@@ -356,9 +363,9 @@ async def on_message(self, message):
         a = "" + message.content
 
         # Stops user from writting in levelchannel none command messages
-        if str(message.channel.id) == str(self.jh.getFromConfig("levelchannel")) and a[
-            0
-        ] != self.jh.getFromConfig("command_prefix"):
+        if str(message.channel.id) == str(
+            self.jh.getFromConfig("levelchannel")
+        ) and a[0] != self.jh.getFromConfig("command_prefix"):
             await message.delete()
             return
 

cogs/commandowner.py

@@ -87,7 +87,9 @@ async def stoplog(self, ctx):
             guildName = str(self.bot.get_guild(guildID))
             self.jh.config["log"] = "False"
             self.jh.saveConfig()
-            await self.utils.log(f"Stopped to log users from Server:\n\t{guildName}", 2)
+            await self.utils.log(
+                f"Stopped to log users from Server:\n\t{guildName}", 2
+            )
         else:
             await ctx.send("Bot is NOT logging. Logging state: False")
 
@@ -156,15 +158,21 @@ async def reloadExtensions(self, ctx, *extensions):
         if not extensions:
             extensions = self.bot.extensions.copy()
             list(extensions.keys()).extend(
-                ["cogs." + ext[:-3] for ext in os.listdir("./") if ext.endswith(".py")]
+                [
+                    "cogs." + ext[:-3]
+                    for ext in os.listdir("./")
+                    if ext.endswith(".py")
+                ]
             )
         reloadedExtensions = []
         for ext in extensions:
             if ext in self.bot.extensions:
                 self.bot.unload_extension(ext)
                 self.bot.load_extension(ext)
                 reloadedExtensions.append(ext)
-        await self.utils.log(f"Reloaded extensions: {', '.join(reloadedExtensions)}", 2)
+        await self.utils.log(
+            f"Reloaded extensions: {', '.join(reloadedExtensions)}", 2
+        )
 
 
 def setup(bot):

cogs/commandpoll.py

@@ -386,7 +386,8 @@ async def poll_remove(self, ctx, pollID):
                 if self.poll.removePoll(pollID):
                     message = f"Removed Poll {pollName}."
                     await self.utils.log(
-                        f'User {ctx.author.mention} removed the poll: "{pollName}".', 2
+                        f'User {ctx.author.mention} removed the poll: "{pollName}".',
+                        2,
                     )
                     channel = self.bot.get_channel(
                         int(self.jh.getFromConfig("logchannel"))
@@ -498,7 +499,8 @@ async def poll_close(self, ctx, pollID):
         closed = self.poll.pollClose(pollID)
         if closed:
             await self.utils.log(
-                f'User {ctx.author.name} cloesed poll: "{self.poll.getName(pollID)}"', 1
+                f'User {ctx.author.name} cloesed poll: "{self.poll.getName(pollID)}"',
+                1,
             )
         if not (closed and messageID and channelID):
             await ctx.send("ERROR POLL STATUS: Can't close Poll.")

cogs/commandsubroutine.py

@@ -133,7 +133,9 @@ async def removeRoleSubroutineFunction(self, currentTime, bufferTime, guild):
                     log_message,
                     2,
                 )
-            if (currentTime - offset) % interval < bufferTime and currentTime > offset:
+            if (
+                currentTime - offset
+            ) % interval < bufferTime and currentTime > offset:
                 role = guild.get_role(int(toRemove))
                 if role is None:
                     log_message = (
@@ -233,15 +235,19 @@ 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.jh.addAllUserVoice([member.id for member in membersNotMutedOrBot])
+                self.jh.addAllUserVoice(
+                    [member.id for member in membersNotMutedOrBot]
+                )
                 # Extra XP
                 membersStreamOrVideo = [
                     member

cogs/commandsubserver.py

@@ -209,7 +209,9 @@ async def create(self, ctx, subserver_name):
 
         # Create subserver roles
         sub_way_role = await guild.create_role(
-            name="sw-" + subserver_name, color=13277615, reason="Creating new subserver"
+            name="sw-" + subserver_name,
+            color=13277615,
+            reason="Creating new subserver",
         )
         sub_role = await guild.create_role(
             name="sub-" + subserver_name,
@@ -498,7 +500,8 @@ async def subway(self, ctx, subserver_name):
             return
         if await self.change_subserver(author_member, to=subserver_name):
             await ctx.send(
-                f"You made your way to the subserver {subserver_name}", delete_after=60
+                f"You made your way to the subserver {subserver_name}",
+                delete_after=60,
             )
             await self.update_subserver_info()
         else:
@@ -654,7 +657,9 @@ 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), ...]

cogs/commanduser.py

@@ -502,7 +502,9 @@ async def textunban(self, ctx, userID):
                     f"User {ctx.author.mention} textunbaned {user.mention}"
                 )
             else:
-                await ctx.send(content="ERROR: User has no textban.", delete_after=3600)
+                await ctx.send(
+                    content="ERROR: User has no textban.", delete_after=3600
+                )
 
     """
     # When give star of the week should be queued
@@ -596,7 +598,8 @@ def _nextWeekdayInUnixEpoch(self, toWeekday):
         )
         return time.mktime(
             time.strptime(
-                f"{nextWeekday.year} {nextWeekday.month} {nextWeekday.day}", "%Y %m %d"
+                f"{nextWeekday.year} {nextWeekday.month} {nextWeekday.day}",
+                "%Y %m %d",
             )
         )
 

datahandler/jsonhandle.py

@@ -527,7 +527,7 @@ def setUserVoice(self, userID: Any, voice: int):
     def setUserText(self, userID: Any, text: str):
         """
         Sets the users text to text in userdata.json.
-        
+
         Keyword arguments:
         userID -- Is the user ID from discord user as a string or int
         text -- Integer to which the Text is set to.
@@ -573,8 +573,9 @@ def addUserText(self, userID: Any, text: str):
         userID --Is the user ID from discord user as a string or int
         """
         self.addNewDataEntry(userID)
-        self.data[str(userID)]["Text"] = int(
-            self.data[str(userID)]["Text"]) + int(text)
+        self.data[str(userID)]["Text"] = int(self.data[str(userID)]["Text"]) + int(
+            text
+        )
         self.saveData()
 
     @_reloadData

datahandler/poll.py

@@ -230,7 +230,10 @@ def setVotesOfOption(self, pollID, optionName, votes):
                 copy = self.pollData[str(pollID)]["options"][i]
                 if copy[0] == str(optionName):
                     self.pollData[str(pollID)]["options"][i] = [
-                        copy[0], votes, copy[2]]
+                        copy[0],
+                        votes,
+                        copy[2],
+                    ]
                     self.savePollData()
                     return True
         return False

helpfunctions/decorators.py

@@ -132,7 +132,9 @@ 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()