Merge branch 'hundredrab-master'

4 files changed, 63 insertions, 19 deletions

diff --git a/bot/cogs/candy_collection.py b/bot/cogs/hacktober/candy_collection.py
index 59eadd93..f5f17abb 100644
--- a/bot/cogs/candy_collection.py
+++ b/bot/cogs/hacktober/candy_collection.py
@@ -1,13 +1,14 @@
-import discord
-from discord.ext import commands
-import random
-import json
 import functools
+import json
 import os
+import random
+
+import discord
+from discord.ext import commands
 
-json_location = os.path.join(os.getcwd(), 'resources', 'candy_collection.json')
+from bot.constants import HACKTOBER_CHANNEL_ID
 
-HACKTOBER_CHANNEL_ID = 498804484324196362
+json_location = os.path.join("bot", "resources", "halloween", "candy_collection.json")
 
 # chance is 1 in x range, so 1 in 20 range would give 5% chance (for add candy)
 ADD_CANDY_REACTION_CHANCE = 20  # 5%
@@ -126,7 +127,7 @@ class CandyCollection:
 
         for i in range(9):
             o = discord.Object(id=recent_msg.id + i)
-            msg = await channel.history(limit=1, before=o).next()
+            msg = await next(channel.history(limit=1, before=o))
             ten_recent.append(msg.id)
 
         return ten_recent
@@ -140,7 +141,7 @@ class CandyCollection:
             o = discord.Object(id=msg_id + 1)
             # Use history rather than get_message due to
             #         poor ratelimit (50/1s vs 1/1s)
-            msg = await self.hacktober_channel.history(limit=1, before=o).next()
+            msg = await next(self.hacktober_channel.history(limit=1, before=o))
 
             if msg.id != msg_id:
                 return None
diff --git a/bot/cogs/hacktober/monstersurvey.py b/bot/cogs/hacktober/monstersurvey.py
index 9f33e31b..45587fe1 100644
--- a/bot/cogs/hacktober/monstersurvey.py
+++ b/bot/cogs/hacktober/monstersurvey.py
@@ -1,7 +1,6 @@
 import json
 import logging
 import os
-from typing import Optional, Union
 
 from discord import Embed
 from discord.ext import commands
@@ -91,7 +90,7 @@ class MonsterSurvey:
     @monster_group.command(
         name='vote'
     )
-    async def monster_vote(self, ctx: Context, name = None):
+    async def monster_vote(self, ctx: Context, name=None):
         """Casts a vote for a particular monster, or displays a list of monsters that can be voted for
         if one is not given."""
         if name is None:
@@ -133,7 +132,7 @@ class MonsterSurvey:
     @monster_group.command(
         name='show'
     )
-    async def monster_show(self, ctx: Context, name = None):
+    async def monster_show(self, ctx: Context, name=None):
         """
         Shows the named monster. If one is not named, it sends the default voting embed instead.
         :param ctx:
diff --git a/bot/cogs/hacktober/spookyavatar.py b/bot/cogs/hacktober/spookyavatar.py
new file mode 100644
index 00000000..ad8a9242
--- /dev/null
+++ b/bot/cogs/hacktober/spookyavatar.py
@@ -0,0 +1,52 @@
+import os
+from io import BytesIO
+
+import aiohttp
+import discord
+from discord.ext import commands
+from PIL import Image
+
+from bot.utils import spookifications
+
+
+class SpookyAvatar:
+
+    """
+    A cog that spookifies an avatar.
+    """
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    async def get(self, url):
+        """
+        Returns the contents of the supplied url.
+        """
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url) as resp:
+                return await resp.read()
+
+    @commands.command(name='savatar', aliases=['spookyavatar', 'spookify'],
+                      brief='Spookify an user\'s avatar.')
+    async def spooky_avatar(self, ctx, user: discord.Member = None):
+        """
+        A command to print the user's spookified avatar.
+        """
+        if user is None:
+            user = ctx.message.author
+
+        embed = discord.Embed(colour=0xFF0000)
+        embed.title = "Is this you or am I just really paranoid?"
+        embed.set_author(name=str(user.name), icon_url=user.avatar_url)
+        resp = await self.get(user.avatar_url)
+        im = Image.open(BytesIO(resp))
+        modified_im = spookifications.get_random_effect(im)
+        modified_im.save(str(ctx.message.id)+'.png')
+        f = discord.File(str(ctx.message.id)+'.png')
+        embed.set_image(url='attachment://'+str(ctx.message.id)+'.png')
+        await ctx.send(file=f, embed=embed)
+        os.remove(str(ctx.message.id)+'.png')
+
+
+def setup(bot):
+    bot.add_cog(SpookyAvatar(bot))
diff --git a/bot/cogs/resources/candy_collection.json b/bot/cogs/resources/candy_collection.json
deleted file mode 100644
index 6313dd10..00000000
--- a/bot/cogs/resources/candy_collection.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "msg_reacted": [
-
-   ],
-  "records": [
-    
-  ]
-}