Merge branch 'rewrite' of https://github.com/Phxntxm/Bonfire into rewrite

cogs/admin.py

@@ -21,7 +21,7 @@ class Administration:
         """Turns on/off the birthday announcements in this server
 
         EXAMPLE: !allowbirthdays on
-        RESULT: Playlists can now be used"""
+        RESULT: Birthdays will now be announced"""
         if setting.lower() in ['on', 'yes', 'true']:
             allowed = True
         else:

cogs/birthday.py

@@ -1,12 +1,13 @@
 import discord
 import pendulum
+import asyncio
 from pendulum.parsing.exceptions import ParserError
 
 from discord.ext import commands
 from . import utils
 
-class Birthday:
 
+class Birthday:
     def __init__(self, bot):
         self.bot = bot
         self.bot.loop.create_task(self.birthday_task())
@@ -47,20 +48,21 @@ class Birthday:
         tfilter = {'birthdays_allowed': True}
         servers = await self.bot.db.actual_load('server_settings', table_filter=tfilter)
         for s in servers:
-            server = bot.get_guild(int(s['server_id']))
+            server = self.bot.get_guild(int(s['server_id']))
             if not server:
                 continue
 
             bds = self.get_birthdays_for_server(server, today=True)
             for bd in bds:
                 # Set our default to either the one set, or the default channel of the server
-                default_channel_id = servers.get('notifications', {}).get('default') or guild.id
+                default_channel_id = s.get('notifications', {}).get('default') or server.id
                 # If it is has been overriden by picarto notifications setting, use this
-                channel_id = servers.get('notifications', {}).get('birthdays') or default_channel_id
+                channel_id = s.get('notifications', {}).get('birthday') or default_channel_id
                 # Now get the channel based on that ID
                 channel = server.get_channel(int(channel_id)) or server.default_channel
                 try:
-                    await channel.send("It is {}'s birthday today! Wish them a happy birthday! \N{SHORTCAKE}".format(member.mention))
+                    await channel.send("It is {}'s birthday today! "
+                                       "Wish them a happy birthday! \N{SHORTCAKE}".format(bd['member'].mention))
                 except (discord.Forbidden, discord.HTTPException):
                     pass
 
@@ -92,7 +94,6 @@ class Birthday:
             except utils.CannotPaginate as e:
                 await ctx.send(str(e))
 
-
     @birthday.command(name='add')
     @utils.custom_perms(send_messages=True)
     @utils.check_restricted()
@@ -150,5 +151,6 @@ class Birthday:
         self.bot.db.save('server_settings', entry)
         await ctx.send("All birthday notifications will now go to {}".format(channel.mention))
 
+
 def setup(bot):
     bot.add_cog(Birthday(bot))

cogs/misc.py

@@ -186,7 +186,7 @@ class Miscallaneous:
             embed.set_author(name=str(self.bot.owner), icon_url=self.bot.owner.avatar_url)
 
         # Setup the process statistics
-        name = "Process stats"
+        name = "Process statistics"
         value = ""
 
         memory_usage = self.process.memory_full_info().uss / 1024 ** 2
@@ -198,7 +198,7 @@ class Miscallaneous:
         embed.add_field(name=name, value=value, inline=False)
 
         # Setup the user and guild statistics
-        name = "User/Guild stats"
+        name = "User/Guild statistics"
         value = ""
 
         value += "Channels: {}".format(len(list(self.bot.get_all_channels())))

cogs/overwatch.py

@@ -89,7 +89,7 @@ class Overwatch:
             fmt = "\n".join("{}: {}".format(k, r) for k, r in output_data)
             await ctx.send("Overwatch stats for {}: ```py\n{}```".format(user.name, fmt))
 
-    @ow.command(pass_context=True, name="add")
+    @ow.command(name="add")
     @utils.custom_perms(send_messages=True)
     @utils.check_restricted()
     async def add(self, ctx, bt: str):
@@ -122,7 +122,7 @@ class Overwatch:
         self.bot.db.save('overwatch', entry)
         await ctx.send("I have just saved your battletag {}".format(ctx.message.author.mention))
 
-    @ow.command(pass_context=True, name="delete", aliases=['remove'])
+    @ow.command(name="delete", aliases=['remove'])
     @utils.custom_perms(send_messages=True)
     @utils.check_restricted()
     async def delete(self, ctx):

cogs/polls.py

@@ -70,7 +70,7 @@ class Polls:
         if poll:
             await poll.remove_other_reaction(reaction, user)
 
-    @commands.command(pass_context=True)
+    @commands.command()
     @commands.guild_only()
     @utils.custom_perms(send_messages=True)
     @utils.check_restricted()

cogs/raffle.py

@@ -183,7 +183,7 @@ class Raffle:
                     raffle_count, ctx.prefix)
             await ctx.send(fmt)
 
-    @raffle.command(pass_context=True, name='create', aliases=['start', 'begin', 'add'])
+    @raffle.command(name='create', aliases=['start', 'begin', 'add'])
     @commands.guild_only()
     @utils.custom_perms(kick_members=True)
     @utils.check_restricted()

cogs/stats.py

@@ -94,10 +94,10 @@ class Stats:
 
         await ctx.send(embed=embed)
 
-    @commands.group(pass_context=False)
+    @commands.group()
     @utils.custom_perms(send_messages=True)
     @utils.check_restricted()
-    async def command(self):
+    async def command(self, ctx):
         pass
 
     @command.command(name="stats")