Snake cog

Pipfile

@@ -13,6 +13,8 @@ logmatic-python = "*"
 aiohttp = "<2.3.0,>=2.0.0"
 websockets = ">=4.0,<5.0"
 yarl = "==1.1.1"
+fuzzywuzzy = "*"
+python-levenshtein = "*"
 
 [dev-packages]
 "flake8" = "*"

bot/__init__.py

@@ -192,6 +192,7 @@ def parse_python(buffer_pos):
 
         # Args handling
         new_args = []
+
         if args:
             # Force args into container
             if not isinstance(args, tuple):
@@ -227,6 +228,7 @@ def parse_python(buffer_pos):
 
     # Iterate through the buffer and determine
     pos = 0
+    current = None
     while not self.eof:
         try:
             current = self.buffer[self.index + pos]
@@ -241,7 +243,7 @@ def parse_python(buffer_pos):
     self.index += pos
 
     # If the command looks like a python syntax command, try to parse it.
-    if current == "(" or current == "[":
+    if current and current == "(" or current == "[":
         try:
             result = parse_python(pos)
 

bot/__main__.py

@@ -59,6 +59,7 @@
 bot.load_extension("bot.cogs.eval")
 bot.load_extension("bot.cogs.fun")
 bot.load_extension("bot.cogs.hiphopify")
+bot.load_extension("bot.cogs.snakes")
 bot.load_extension("bot.cogs.tags")
 bot.load_extension("bot.cogs.verification")
 

bot/cogs/events.py

@@ -24,13 +24,13 @@ async def send_updated_users(self, *users, replace_all=False):
         try:
             if replace_all:
                 response = await self.bot.http_session.post(
-                    url=SITE_API_USER_URL,
+                    url=f"{SITE_API_URL}/user",
                     json=list(users),
                     headers={"X-API-Key": SITE_API_KEY}
                 )
             else:
                 response = await self.bot.http_session.put(
-                    url=SITE_API_USER_URL,
+                    url=f"{SITE_API_URL}/user",
                     json=list(users),
                     headers={"X-API-Key": SITE_API_KEY}
                 )
@@ -43,7 +43,8 @@ async def send_updated_users(self, *users, replace_all=False):
     async def send_delete_users(self, *users):
         try:
             response = await self.bot.http_session.delete(
-                url=SITE_API_USER_URL,
+                url=f"{SITE_API_URL}/user",
+
                 json=list(users),
                 headers={"X-API-Key": SITE_API_KEY}
             )
@@ -88,7 +89,7 @@ async def on_command_error(self, ctx: Context, e: CommandError):
                 f"Sorry, an unexpected error occurred. Please let us know!\n\n```{e}```"
             )
             raise e.original
-        log.error(f"COMMAND ERROR: '{e}'")
+        raise e
 
     async def on_ready(self):
         users = []
@@ -124,9 +125,10 @@ async def on_ready(self):
                             name=key, value=str(value)
                         )
 
-                await self.bot.get_channel(DEVLOG_CHANNEL).send(
-                    embed=embed
-                )
+                if not DEBUG_MODE:
+                    await self.bot.get_channel(DEVLOG_CHANNEL).send(
+                        embed=embed
+                    )
 
     async def on_member_update(self, before: Member, after: Member):
         if before.roles == after.roles and before.name == after.name and before.discriminator == after.discriminator:

bot/cogs/hiphopify.py

@@ -8,7 +8,7 @@
 from bot.constants import (
     ADMIN_ROLE, MODERATOR_ROLE, MOD_LOG_CHANNEL,
     NEGATIVE_REPLIES, OWNER_ROLE, POSITIVE_REPLIES,
-    SITE_API_HIPHOPIFY_URL, SITE_API_KEY
+    SITE_API_KEY, SITE_API_URL
 )
 from bot.decorators import with_role
 
@@ -23,6 +23,7 @@ class Hiphopify:
     def __init__(self, bot: AutoShardedBot):
         self.bot = bot
         self.headers = {"X-API-KEY": SITE_API_KEY}
+        self.url = f"{SITE_API_URL}/hiphopify"
 
     async def on_member_update(self, before, after):
         """
@@ -42,7 +43,7 @@ async def on_member_update(self, before, after):
         )
 
         response = await self.bot.http_session.get(
-            SITE_API_HIPHOPIFY_URL,
+            self.url,
             headers=self.headers,
             params={"user_id": str(before.id)}
         )
@@ -104,7 +105,7 @@ async def hiphopify(self, ctx: Context, member: Member, duration: str, forced_ni
             params["forced_nick"] = forced_nick
 
         response = await self.bot.http_session.post(
-            SITE_API_HIPHOPIFY_URL,
+            self.url,
             headers=self.headers,
             json=params
         )
@@ -167,7 +168,7 @@ async def unhiphopify(self, ctx: Context, member: Member):
         embed.colour = Colour.blurple()
 
         response = await self.bot.http_session.delete(
-            SITE_API_HIPHOPIFY_URL,
+            self.url,
             headers=self.headers,
             json={"user_id": str(member.id)}
         )

bot/cogs/logging.py

@@ -3,7 +3,7 @@
 from discord import Embed
 from discord.ext.commands import AutoShardedBot
 
-from bot.constants import DEVLOG_CHANNEL
+from bot.constants import DEBUG_MODE, DEVLOG_CHANNEL
 
 log = logging.getLogger(__name__)
 
@@ -26,7 +26,8 @@ async def on_ready(self):
             icon_url="https://raw.githubusercontent.com/discord-python/branding/master/logos/logo_circle.png"
         )
 
-        await self.bot.get_channel(DEVLOG_CHANNEL).send(embed=embed)
+        if not DEBUG_MODE:
+            await self.bot.get_channel(DEVLOG_CHANNEL).send(embed=embed)
 
 
 def setup(bot):