74 refactor split up file into dedicated files (#112)

* spilt jsonhandle.py in two files

Author: johnzoki

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Bot Version:**
-Eg. `1.4.0`
+Eg. `2.3.1`
 
 
 **Additional context**

.github/ISSUE_TEMPLATE/set-up.md

@@ -14,4 +14,4 @@ Describe what are the issues you are having while setting up the bot.
 Some problems may result from other configs or parts of the set-up process. Tell us what have you done so far.
 
 **What version of the bot**
-There may be differences in the set-up process depending on the bot version. State the version. Eg. `1.4.0`
+There may be differences in the set-up process depending on the bot version. State the version. Eg. `2.3.1`

cogs/commandgiverole.py

@@ -12,7 +12,8 @@
     isNotInChannelOrDMCommand,
 )
 from helpfunctions.utils import Utils
-from datahandler.jsonhandle import Jsonhandle
+from datahandler.configHandle import ConfigHandle
+from datahandler.userHandle import UserHandle
 
 
 class Commandgiverole(commands.Cog):
@@ -55,8 +56,9 @@ class Commandgiverole(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.jh = Jsonhandle()
-        self.utils = Utils(bot, jh=self.jh)
+        self.ch = ConfigHandle()
+        self.uh = UserHandle()
+        self.utils = Utils(bot, ch=self.ch, uh=self.uh)
         self.datapath = (
             str(os.path.dirname(os.path.dirname(__file__))) + "/data/giveroles/"
         )
@@ -203,7 +205,7 @@ async def rm(self, ctx, table_name):
             for role in remove
         ]
         # Also sorts out users, which discord.Reactions.users() can return.
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         remove_from_member = [
             member
             for reaction in message.reactions
@@ -358,7 +360,7 @@ async def get_message(self, ctx, channel_id, message_id):
         Otherwise returns a Discord message object.
         """
         table_name = ctx.args[-1]
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         channel = guild.get_channel(channel_id)
         if not channel:
             message_to_send = (
@@ -450,7 +452,7 @@ def check_content_table(self, content):
             for l in tupel:
                 for role in l:
                     roles.add(role)
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         guild_roles = {role.name for role in guild.roles}.union(
             {role.id for role in guild.roles}, {str(role.id) for role in guild.roles}
         )

cogs/commandlistener.py

@@ -6,7 +6,8 @@
 
 from helpfunctions.utils import Utils
 from helpfunctions.xpfunk import Xpfunk
-from datahandler.jsonhandle import Jsonhandle
+from datahandler.configHandle import ConfigHandle
+from datahandler.userHandle import UserHandle
 from datahandler.textban import Textban
 
 
@@ -17,8 +18,9 @@ class Commandlistener(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.jh = Jsonhandle()
-        self.utils = Utils(bot, jh=self.jh)
+        self.ch = ConfigHandle()
+        self.uh = UserHandle()
+        self.utils = Utils(bot, ch=self.ch, uh=self.uh)
         self.xpf = Xpfunk()
 
     @commands.Cog.listener()
@@ -48,13 +50,13 @@ 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.0"
+            "Bot is now online.\nVersion:\tDiscordBot DataBot v2.3.1"
         )
         # Sets the bot's presence to "Online" or "Do not Disturb" to indicate if it's logging or not.
-        if self.jh.getFromConfig("log") == "True":
-            await self.bot.change_presence(status=discord.Status.online, activity=discord.Game(str(self.jh.getFromConfig("command_prefix")) + "help"))
+        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.jh.getFromConfig("command_prefix")) + "help"))
+            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()
@@ -64,14 +66,14 @@ 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")))
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        channel = self.bot.get_channel(int(self.ch.getFromConfig("logchannel")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         await channel.send(f"Hey **{member.mention}**, welcome to {guild}")
 
     """
     @commands.Cog.listener()
     async def on_disconnect(self):
-        owner = self.bot.get_user(int(self.jh.getFromConfig("owner")))
+        owner = self.bot.get_user(int(self.ch.getFromConfig("owner")))
         await self.utils.sendOwnerMessage("Bot is offline.")
     """
 
@@ -83,16 +85,16 @@ 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")))
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        channel = self.bot.get_channel(int(self.ch.getFromConfig("logchannel")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         await channel.send(
             f"**{member.name}** has left {guild}. Press F to pay respect."
         )
         """
         #Hash user data
-        voice = jh.getUserVoice(member.id)
-        text = jh.getUserText(member.id)
-        textCount = jh.getUserTextCount(member.id)
+        voice = uh.getUserVoice(member.id)
+        text = uh.getUserText(member.id)
+        textCount = uh.getUserTextCount(member.id)
         [hash, code] = self.utils.hashData(voice, text, textCount, member.id)
         #Send user data
         embed = discord.Embed(title=f"{member.nick}     ({member.name})", color=12008408)
@@ -105,7 +107,7 @@ async def on_member_remove(self, member):
         user = await bot.fetch_user(member.id)
         await user.send(content=f"**User related data from {server.name}**", embed=embed)
         await user.send(f"If you would like to join the Server again type this command to gain back your data **after** rejoining the server.\n```+reclaim {voice} {text} {textCount} {code} {hash}```\nhttps://discord.gg/3Fk4gnQ2Jz")
-        jh.removeUserFromData(member.id)
+        uh.removeUserFromData(member.id)
         """
 
     # When a reacting is added
@@ -205,14 +207,14 @@ async def on_raw_reaction_add(self, payload):
         else:
             # Give reaction XP
             channel = self.bot.get_channel(payload.channel_id)
-            if self.jh.isInWhitelist(payload.channel_id):
+            if self.ch.isInWhitelist(payload.channel_id):
                 message = await channel.fetch_message(payload.message_id)
                 if (
                     not (message.author.bot or payload.member.bot)
-                    and self.jh.getFromConfig("log") == "True"
+                    and self.ch.getFromConfig("log") == "True"
                 ):
-                    self.jh.addReactionXP(payload.user_id, self.xpf.randomRange(1, 5))
-                    self.jh.saveData()
+                    self.uh.addReactionXP(payload.user_id, self.xpf.randomRange(1, 5))
+                    self.uh.saveData()
 
     # When a user changes his voice state
     @commands.Cog.listener()
@@ -265,14 +267,14 @@ async def on_voice_state_update(self, member, before, after):
                     )
 
                     # Removes channel from blacklist if necessary
-                    self.jh.removeFromBalcklist(lastChannel.id)
+                    self.ch.removeFromBalcklist(lastChannel.id)
 
                     await lastChannel.delete()
 
             # User left channel, which is not the first channel. So it will be deleted
             else:
                 # Removes channel from blacklist if necessary
-                self.jh.removeFromBalcklist(before.channel.id)
+                self.ch.removeFromBalcklist(before.channel.id)
                 await before.channel.delete()
 
         """
@@ -332,8 +334,8 @@ async def on_voice_state_update(self, member, before, after):
                 # Creates channel and gets it
                 newChannel = await channelWithNumberBefore.clone(name=newChannelName)
 
-                if self.jh.isInBlacklist(after.channel.id):
-                    self.jh.writeToBalcklist(newChannel.id)
+                if self.ch.isInBlacklist(after.channel.id):
+                    self.ch.writeToBalcklist(newChannel.id)
 
                 # Move channel after channelWithNumberBefore
                 await newChannel.move(after=channelWithNumberBefore)
@@ -359,37 +361,37 @@ 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[
+        if str(message.channel.id) == str(self.ch.getFromConfig("levelchannel")) and a[
             0
-        ] != self.jh.getFromConfig("command_prefix"):
+        ] != self.ch.getFromConfig("command_prefix"):
             await message.delete()
             return
 
         # Checks if message contains a picture
-        if len(message.attachments) > 0 and self.jh.getFromConfig("log") == "True":
+        if len(message.attachments) > 0 and self.ch.getFromConfig("log") == "True":
             attachments = message.attachments
             userID = message.author.id
             for attachment in attachments:
                 name = attachment.filename
                 if name.endswith("jpg") or name.endswith("png"):
                     # Gives XP when picture is in message
-                    self.jh.addTextXP(userID, self.xpf.randomRange(20, 40))
-                    self.jh.saveData()
+                    self.uh.addTextXP(userID, self.xpf.randomRange(20, 40))
+                    self.uh.saveData()
                     return
 
         # When Message is a String
         if (
             a != ""
-            and a[0] != self.jh.getFromConfig("command_prefix")
-            and self.jh.getFromConfig("log") == "True"
+            and a[0] != self.ch.getFromConfig("command_prefix")
+            and self.ch.getFromConfig("log") == "True"
         ):
             # Give XP when message is not a command
-            if self.jh.isInWhitelist(message.channel.id):
-                self.jh.addTextXP(message.author.id, self.xpf.textXP(a))
-                self.jh.saveData()
+            if self.ch.isInWhitelist(message.channel.id):
+                self.uh.addTextXP(message.author.id, self.xpf.textXP(a))
+                self.uh.saveData()
 
         # Sends BotOwner commands, which are triggering the bot
-        if len(a) > 0 and a[0] == self.jh.getFromConfig("command_prefix"):
+        if len(a) > 0 and a[0] == self.ch.getFromConfig("command_prefix"):
             channelName = "DM"
             try:
                 channelName = message.channel.name

cogs/commandmod.py

@@ -4,7 +4,8 @@
 from helpfunctions.decorators import isBotModCommand
 from helpfunctions.xpfunk import Xpfunk
 from helpfunctions.utils import Utils
-from datahandler.jsonhandle import Jsonhandle
+from datahandler.configHandle import ConfigHandle
+from datahandler.userHandle import UserHandle
 
 
 class Commandmod(commands.Cog, name="Bot Mod Commands"):
@@ -28,8 +29,9 @@ class Commandmod(commands.Cog, name="Bot Mod Commands"):
     def __init__(self, bot):
         super(Commandmod, self).__init__()
         self.bot = bot
-        self.jh = Jsonhandle()
-        self.utils = Utils(bot, jh=self.jh)
+        self.ch = ConfigHandle()
+        self.uh = UserHandle()
+        self.utils = Utils(bot, ch=self.ch, uh=self.uh)
         self.xpf = Xpfunk()
 
     """
@@ -100,7 +102,7 @@ async def addtextwhitelist(self, ctx, channelID=None):
 
         Adds channel to whitelist, so users can get XP in the channel.
         """
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         # This does not include threads
         channels = self.bot.guilds[0].text_channels
         # When channelID is not given, use ctx.channel.id.
@@ -115,7 +117,7 @@ async def addtextwhitelist(self, ctx, channelID=None):
             message = f"Channel is not in the server {guild.name}"
             await self.utils.log(f"{message} from user {ctx.author}", 2)
 
-        elif self.jh.writeToWhitelist(channelID):
+        elif self.ch.writeToWhitelist(channelID):
             # Try to write in whitelist
             channelName = channel_to_add.name
             message = (
@@ -151,7 +153,7 @@ async def removetextwhitelist(self, ctx, channelID=None):
         if not channelID:
             channelID = ctx.channel.id
         # Try to remove from whitelist
-        if self.jh.removeFromWhitelist(channelID):
+        if self.ch.removeFromWhitelist(channelID):
             channelName = str(self.bot.get_channel(int(channelID)))
             message = (
                 "Removed "
@@ -229,12 +231,12 @@ async def addblacklist(self, ctx, channelID):
 
         Adds channel to whitelist, so users can not get XP in the channel.
         """
-        guild = self.bot.get_guild(int(self.jh.getFromConfig("guild")))
+        guild = self.bot.get_guild(int(self.ch.getFromConfig("guild")))
         channels = self.bot.guilds[0].voice_channels
         # Test if channel is in Server
         if str(channelID) in [str(channel.id) for channel in channels]:
             # Try to write in Blacklist
-            if self.jh.writeToBalcklist(channelID):
+            if self.ch.writeToBalcklist(channelID):
                 channelName = str(self.bot.get_channel(int(channelID)))
                 message = (
                     "Added "
@@ -269,7 +271,7 @@ async def removeblacklist(self, ctx, channelID=None):
         # When channelID is not given, use ctx.channel.id.
         if not channelID:
             channelID = ctx.channel.id
-        if self.jh.removeFromBalcklist(channelID):
+        if self.ch.removeFromBalcklist(channelID):
             channelName = str(self.bot.get_channel(int(channelID)))
             message = (
                 "Removed "
@@ -313,20 +315,20 @@ async def printData(self, ctx):
             TextXP: int,
             Messages: int.
         """
-        guild = str(self.bot.get_guild(int(self.jh.getFromConfig("guild"))))
+        guild = str(self.bot.get_guild(int(self.ch.getFromConfig("guild"))))
         message = f"Printing data of server {guild}:\n"
         # Sorts user by their usernames
         sortedData = sorted(
-            self.jh.data,
+            self.uh.data,
             key=lambda id: "a" + str(self.bot.get_user(int(id)).name).lower()
             if self.bot.get_user(int(id)) != None
             else "no user",
         )
         for userID in sortedData:
-            level = self.jh.getUserLevel(userID)
-            voiceXP = self.jh.getUserVoice(userID)
-            textXP = self.jh.getUserText(userID)
-            textCount = self.jh.getUserTextCount(userID)
+            level = self.uh.getUserLevel(userID)
+            voiceXP = self.uh.getUserVoice(userID)
+            textXP = self.uh.getUserText(userID)
+            textCount = self.uh.getUserTextCount(userID)
             user = self.bot.get_user(int(userID))
             username = "No User"
             # Handel not existing User IDs

cogs/commandmodserver.py

@@ -2,7 +2,8 @@
 
 from helpfunctions.utils import Utils
 from datahandler.textban import Textban
-from datahandler.jsonhandle import Jsonhandle
+from datahandler.configHandle import ConfigHandle
+from datahandler.userHandle import UserHandle
 
 
 def hasAnyRole(*items):
@@ -37,10 +38,10 @@ class Commandmodserver(commands.Cog, name="Server Mod Commands"):
     def __init__(self, bot):
         super(Commandmodserver, self).__init__()
         self.bot = bot
-        self.jh = Jsonhandle()
+        self.ch = ConfigHandle()
         self.tban = Textban()
-        self.jh = Jsonhandle
-        self.utils = Utils(bot, jh=self.jh)
+        self.uh = UserHandle()
+        self.utils = Utils(bot, ch=self.ch, uh=self.uh)
         Commandmodserver.utils = self.utils