Refactor code and add license

Pipfile

@@ -7,24 +7,20 @@ verify_ssl = true
 black = "*"
 
 [packages]
-discord-py = "*"
 pillow = "*"
 pymongo = {extras = ["tls"],version = "*"}
 python-dotenv = "*"
-dnspython = "*"
 discord-flags = "*"
 unidecode = "*"
 humanfriendly = "*"
 motor = "*"
 umongo = "==3.0.0b7"
 flask = "*"
-requests = "*"
-gunicorn = "*"
 dblpy = "*"
 jishaku = "*"
-pytz = "*"
 "discord.py" = "*"
 pokedex = {git = "https://github.com/veekun/pokedex.git"}
+discord = {git = "https://github.com/Rapptz/discord.py.git", ref = "sharding-rework"}
 
 [requires]
 python_version = "3.8"

api.py

@@ -1,3 +1,5 @@
+# TODO switch to an async thing here.
+
 import asyncio
 import hmac
 import os
@@ -14,8 +16,6 @@
 
 @app.route("/dbl", methods=["POST"])
 def dbl():
-    print(request.json)
-
     res = db.member.find_one({"_id": int(request.json["user"])})
 
     streak = res.get("vote_streak", 0)
@@ -44,6 +44,8 @@ def dbl():
     return "Success", 200
 
 
+# TODO implement patreon webhooks that actually work
+
 # @app.route("/patreon", methods=["POST"])
 # def patreon():
 #     if "delete" in request.headers.get("X-Patreon-Event"):

cogs/admin.py

@@ -32,7 +32,7 @@ async def giveredeem(
         """Give a redeem."""
 
         await self.db.update_member(
-            user, {"$inc": {"redeems": num},},
+            user, {"$inc": {"redeems": num}},
         )
 
         await ctx.send(f"Gave {user.mention} {num} redeems.")
@@ -76,6 +76,8 @@ async def give(self, ctx: commands.Context, user: discord.Member, *, species: st
     async def setup(self, ctx: commands.Context, user: discord.Member, num: int = 100):
         """Test setup pokémon."""
 
+        # This is for development purposes.
+
         member = await self.db.fetch_member_info(user)
 
         pokemon = []

cogs/battling.py

@@ -1,3 +1,8 @@
+"""
+The code in here is shit. I know.
+I'm working on rewriting this file with better code that actually works.
+"""
+
 import asyncio
 import math
 import random

cogs/bot.py

@@ -1,5 +1,7 @@
 import os
 import random
+import sys
+import traceback
 from datetime import datetime
 from functools import cached_property
 
@@ -60,47 +62,51 @@ async def determine_prefix(self, guild):
 
     @commands.Cog.listener()
     async def on_command_error(self, ctx, error):
-        if isinstance(error, discord.Forbidden):
-            return
-
-        if isinstance(error, commands.MissingRequiredArgument):
-            return await ctx.send_help(ctx.command)
-
-        if isinstance(error, checks.MustHaveStarted):
-            return await ctx.send(
-                f"Please pick a starter pokémon by typing `{ctx.prefix}start` before using this command!"
-            )
-
-        if isinstance(error, flags.ArgumentParsingError):
-            return await ctx.send(error)
 
-        if isinstance(error, commands.BadArgument):
-            return await ctx.send(f"Bad argument: {error}")
+        if isinstance(error, commands.NoPrivateMessage):
+            await ctx.send("This command cannot be used in private messages.")
 
-        if isinstance(error, converters.PokemonConversionError):
-            return await ctx.send(error)
+        elif isinstance(error, commands.DisabledCommand):
+            await ctx.send("Sorry. This command is disabled and cannot be used.")
 
-        if isinstance(error, commands.BotMissingPermissions):
+        elif isinstance(error, commands.BotMissingPermissions):
             missing = [
                 "`" + perm.replace("_", " ").replace("guild", "server").title() + "`"
                 for perm in error.missing_perms
             ]
-
             if len(missing) > 2:
                 fmt = "{}, and {}".format(", ".join(missing[:-1]), missing[-1])
             else:
                 fmt = " and ".join(missing)
-
             message = f"💥 Err, I need the following permissions to run this command:\n{fmt}\nPlease fix this and try again."
-            return await ctx.send(message)
+            await ctx.send(message)
 
-        if isinstance(error, commands.CheckFailure):
-            return await ctx.send(error)
+        elif isinstance(error, commands.CheckFailure):
+            await ctx.send(error)
 
-        if isinstance(error, commands.CommandNotFound):
+        elif isinstance(error, converters.PokemonConversionError):
+            await ctx.send(error)
+
+        elif isinstance(error, commands.MissingRequiredArgument):
+            await ctx.send_help(ctx.command)
+
+        elif isinstance(error, commands.UserInputError):
+            await ctx.send(error)
+
+        elif isinstance(error, flags.ArgumentParsingError):
+            await ctx.send(error)
+
+        elif isinstance(error, discord.errors.Forbidden):
             return
 
-        raise error
+        elif isinstance(error, commands.CommandNotFound):
+            return
+
+        else:
+            print(f"Ignoring exception in command {ctx.command}:", file=sys.stderr)
+            traceback.print_exception(
+                type(error), error, error.__traceback__, file=sys.stderr
+            )
 
     @commands.command()
     async def invite(self, ctx: commands.Context):
@@ -229,6 +235,8 @@ async def profile(self, ctx: commands.Context):
     @checks.has_started()
     @commands.command()
     async def healschema(self, ctx: commands.Context, member: discord.User = None):
+        """Fix database schema if broken."""
+
         await self.db.update_member(
             member or ctx.author,
             {"$pull": {f"pokemon": {"species_id": {"$exists": False}}}},

cogs/config.py

@@ -35,7 +35,7 @@ async def prefix(self, ctx: commands.Context, *, prefix: str = None):
                 current = current[0]
             return await ctx.send(f"My prefix is `{current}` in this server.")
 
-        if prefix == "reset" or prefix == "p!":
+        if prefix in ("reset", "p!", "P!"):
             await self.db.update_guild(ctx.guild, {"$set": {"prefix": None}})
             self.bot.prefixes[ctx.guild.id] = None
 
@@ -64,7 +64,7 @@ async def silence(self, ctx: commands.Context):
             await ctx.send(f"Reverting to normal level up behavior.")
         else:
             await ctx.send(
-                f"I'll no longer send level up messages. You'll receive a DM when your pokémon evolves or reaches level 100."
+                "I'll no longer send level up messages. You'll receive a DM when your pokémon evolves or reaches level 100."
             )
 
     @checks.is_admin()