Cleaning code and better layout

Author: AlexFlipnote

cogs/admin.py

@@ -1,13 +1,14 @@
 import time
 import subprocess
 
-from utils import repo
+from utils import repo, default
 from discord.ext import commands
 
 
 class Admin:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
         self._last_result = None
 
     @commands.command()

cogs/discord.py

@@ -8,6 +8,7 @@
 class Discord_Info:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
 
     @commands.command()
     async def avatar(self, ctx, user: discord.Member = None):

cogs/events.py

@@ -1,10 +1,7 @@
 import discord
-import json
 
 from discord.ext.commands import errors
-
-with open("config.json") as f:
-    data = json.load(f)
+from utils import default
 
 
 async def send_cmd_help(ctx):
@@ -20,6 +17,7 @@ async def send_cmd_help(ctx):
 class Events:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
 
     async def on_command_error(self, ctx, err):
         if isinstance(err, errors.MissingRequiredArgument) or isinstance(err, errors.BadArgument):
@@ -39,7 +37,7 @@ async def on_command_error(self, ctx, err):
 
     async def on_ready(self):
         print(f'Ready: {self.bot.user} | Servers: {len(self.bot.guilds)}')
-        await self.bot.change_presence(activity=discord.Game(type=0, name=data["playing"]), status=discord.Status.online)
+        await self.bot.change_presence(activity=discord.Game(type=0, name=self.config.playing), status=discord.Status.online)
 
 
 def setup(bot):

cogs/fun.py

@@ -4,40 +4,45 @@
 
 from io import BytesIO
 from discord.ext import commands
-from utils import lists, permissions, http
+from utils import lists, permissions, http, default
 
 
 class Fun_Commands:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
 
     @commands.command(aliases=['8ball'])
     async def eightball(self, ctx, *, question: commands.clean_content):
         """ Consult 8ball to receive an answer """
         answer = random.choice(lists.ballresponse)
         await ctx.send(f"🎱 **Question:** {question}\n**Answer:** {answer}")
 
-    @commands.command()
-    @commands.cooldown(rate=1, per=1.5, type=commands.BucketType.user)
-    async def cat(self, ctx):
-        """ Posts a random cat """
+    async def randomimageapi(self, ctx, url, endpoint):
         try:
-            r = await http.get('https://nekos.life/api/v2/img/meow', res_method="json", no_cache=True)
+            r = await http.get(url, res_method="json", no_cache=True)
         except json.JSONDecodeError:
             return await ctx.send("Couldn't find anything from the API")
 
-        await ctx.send(r['url'])
+        await ctx.send(r[endpoint])
+
+    @commands.command()
+    @commands.cooldown(rate=1, per=1.5, type=commands.BucketType.user)
+    async def cat(self, ctx):
+        """ Posts a random cat """
+        await self.randomimageapi(ctx, 'https://nekos.life/api/v2/img/meow', 'url')
 
     @commands.command()
     @commands.cooldown(rate=1, per=1.5, type=commands.BucketType.user)
     async def dog(self, ctx):
         """ Posts a random dog """
-        try:
-            r = await http.get('https://random.dog/woof.json', res_method="json", no_cache=True)
-        except json.JSONDecodeError:
-            await ctx.send("Couldn't find anything from the API")
+        await self.randomimageapi(ctx, 'https://random.dog/woof.json', 'url')
 
-        await ctx.send(r['url'])
+    @commands.command()
+    @commands.cooldown(rate=1, per=1.5, type=commands.BucketType.user)
+    async def duck(self, ctx):
+        """ Posts a random duck """
+        await self.randomimageapi(ctx, 'https://random-d.uk/api/v1/random', 'url')
 
     @commands.command(aliases=['flip', 'coin'])
     async def coinflip(self, ctx):

cogs/info.py

@@ -4,12 +4,13 @@
 import os
 
 from discord.ext import commands
-from utils import repo
+from utils import repo, default
 
 
 class Information:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
         self.process = psutil.Process(os.getpid())
 
     @commands.command()
@@ -38,14 +39,14 @@ async def botserver(self, ctx):
 
         await ctx.send(f"**{ctx.author.name}** this is my home you know :3")
 
-    @commands.command(aliases=['info', 'stats'])
+    @commands.command(aliases=['info', 'stats', 'status'])
     async def about(self, ctx):
         """ About the bot """
         ramUsage = self.process.memory_full_info().rss / 1024**2
 
-        embed = discord.Embed(colour=0xC29FAF)
+        embed = discord.Embed(colour=ctx.me.top_role.colour)
         embed.set_thumbnail(url=ctx.bot.user.avatar_url)
-        embed.add_field(name="Developer", value="AlexFlipnote", inline=True)
+        embed.add_field(name="Developer", value="AlexFlipnote#0001", inline=True)
         embed.add_field(name="Library", value="discord.py", inline=True)
         embed.add_field(name="Servers", value=len(ctx.bot.guilds), inline=True)
         embed.add_field(name="RAM", value=f"{ramUsage:.2f} MB", inline=True)

cogs/mod.py

@@ -39,6 +39,7 @@ async def convert(self, ctx, argument):
 class Moderator:
     def __init__(self, bot):
         self.bot = bot
+        self.config = default.get("config.json")
 
     @commands.command()
     @commands.guild_only()
@@ -178,10 +179,10 @@ async def find_discriminator(self, ctx, *, search: str):
         await ctx.send(content=f"Found **{len(result)}** on your search for **{search}**",
                        file=discord.File(data, filename=default.timetext(f'DiscriminatorSearch')))
 
-    @commands.group(aliases=['prune'])
+    @commands.group()
     @commands.guild_only()
     @permissions.has_permissions(manage_messages=True)
-    async def remove(self, ctx):
+    async def prune(self, ctx):
         """ Removes messages from the current server. """
 
         if ctx.invoked_subcommand is None:
@@ -211,32 +212,32 @@ async def do_removal(self, ctx, limit, predicate, *, before=None, after=None, me
         if message is True:
             await ctx.send(f'🚮 Successfully removed {deleted} message{"" if deleted == 1 else "s"}.')
 
-    @remove.command()
+    @prune.command()
     async def embeds(self, ctx, search=100):
         """Removes messages that have embeds in them."""
         await self.do_removal(ctx, search, lambda e: len(e.embeds))
 
-    @remove.command()
+    @prune.command()
     async def files(self, ctx, search=100):
         """Removes messages that have attachments in them."""
         await self.do_removal(ctx, search, lambda e: len(e.attachments))
 
-    @remove.command()
+    @prune.command()
     async def images(self, ctx, search=100):
         """Removes messages that have embeds or attachments."""
         await self.do_removal(ctx, search, lambda e: len(e.embeds) or len(e.attachments))
 
-    @remove.command(name='all')
+    @prune.command(name='all')
     async def _remove_all(self, ctx, search=100):
         """Removes all messages."""
         await self.do_removal(ctx, search, lambda e: True)
 
-    @remove.command()
+    @prune.command()
     async def user(self, ctx, member: discord.Member, search=100):
         """Removes all messages by the member."""
         await self.do_removal(ctx, search, lambda e: e.author == member)
 
-    @remove.command()
+    @prune.command()
     async def contains(self, ctx, *, substr: str):
         """Removes all messages containing a substring.
         The substring must be at least 3 characters long.
@@ -246,7 +247,7 @@ async def contains(self, ctx, *, substr: str):
         else:
             await self.do_removal(ctx, 100, lambda e: substr in e.content)
 
-    @remove.command(name='bots')
+    @prune.command(name='bots')
     async def _bots(self, ctx, prefix=None, search=100):
         """Removes a bot user's messages and messages with their optional prefix."""
 
@@ -255,7 +256,7 @@ def predicate(m):
 
         await self.do_removal(ctx, search, predicate)
 
-    @remove.command(name='users')
+    @prune.command(name='users')
     async def _users(self, ctx, prefix=None, search=100):
         """Removes only user messages. """
 
@@ -264,7 +265,7 @@ def predicate(m):
 
         await self.do_removal(ctx, search, predicate)
 
-    @remove.command(name='emoji')
+    @prune.command(name='emoji')
     async def _emoji(self, ctx, search=100):
         """Removes all messages containing custom emoji."""
         custom_emoji = re.compile(r'<:(\w+):(\d+)>')
@@ -274,7 +275,7 @@ def predicate(m):
 
         await self.do_removal(ctx, search, predicate)
 
-    @remove.command(name='reactions')
+    @prune.command(name='reactions')
     async def _reactions(self, ctx, search=100):
         """Removes all reactions from messages that have them."""
 

index.py

@@ -1,10 +1,10 @@
-import json
 import os
 
 from discord.ext.commands import HelpFormatter
 from data import Bot
-from utils import permissions
+from utils import permissions, default
 
+config = default.get("config.json")
 description = """
 A simple starter bot code
 Made by AlexFlipnote
@@ -19,18 +19,13 @@ async def format_help_for(self, context, command_or_bot):
         return await super().format_help_for(context, command_or_bot)
 
 
-with open("config.json") as f:
-    data = json.load(f)
-    token = data["token"]
-    prefix = data["prefix"]
-
 print("Logging in...")
 help_attrs = dict(hidden=True)
-bot = Bot(command_prefix=prefix, prefix=prefix, pm_help=True, help_attrs=help_attrs, formatter=HelpFormat())
+bot = Bot(command_prefix=config.prefix, prefix=config.prefix, pm_help=True, help_attrs=help_attrs, formatter=HelpFormat())
 
 for file in os.listdir("cogs"):
     if file.endswith(".py"):
         name = file[:-3]
         bot.load_extension(f"cogs.{name}")
 
-bot.run(token)
+bot.run(config.token)

requirements.txt

@@ -1,4 +1,3 @@
 git+https://github.com/Rapptz/discord.py@rewrite
 psutil
-youtube_dl
 asyncio

utils/default.py

@@ -1,4 +1,17 @@
 import time
+import json
+
+from collections import namedtuple
+
+
+def get(file):
+    try:
+        with open(file) as data:
+            return json.load(data, object_hook=lambda d: namedtuple('X', d.keys())(*d.values()))
+    except AttributeError:
+        raise AttributeError("Unknown argument")
+    except FileNotFoundError:
+        raise FileNotFoundError("JSON file wasn't found")
 
 
 def timetext(name):

utils/repo.py

@@ -2,7 +2,7 @@
     86477779717066752      # AlexFlipnote
 ]
 
-version = "v1.2.1"
+version = "v1.2.3"
 invite = "https://discord.gg/DpxkY3x"