Fix a couple errors with birthdays
This commit is contained in:
parent
d3c5332483
commit
55ce47f383
|
@ -21,7 +21,7 @@ class Administration:
|
||||||
"""Turns on/off the birthday announcements in this server
|
"""Turns on/off the birthday announcements in this server
|
||||||
|
|
||||||
EXAMPLE: !allowbirthdays on
|
EXAMPLE: !allowbirthdays on
|
||||||
RESULT: Playlists can now be used"""
|
RESULT: Birthdays will now be announced"""
|
||||||
if setting.lower() in ['on', 'yes', 'true']:
|
if setting.lower() in ['on', 'yes', 'true']:
|
||||||
allowed = True
|
allowed = True
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
import discord
|
import discord
|
||||||
import pendulum
|
import pendulum
|
||||||
|
import asyncio
|
||||||
from pendulum.parsing.exceptions import ParserError
|
from pendulum.parsing.exceptions import ParserError
|
||||||
|
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
from . import utils
|
from . import utils
|
||||||
|
|
||||||
class Birthday:
|
|
||||||
|
|
||||||
|
class Birthday:
|
||||||
def __init__(self, bot):
|
def __init__(self, bot):
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.bot.loop.create_task(self.birthday_task())
|
self.bot.loop.create_task(self.birthday_task())
|
||||||
|
@ -47,20 +48,21 @@ class Birthday:
|
||||||
tfilter = {'birthdays_allowed': True}
|
tfilter = {'birthdays_allowed': True}
|
||||||
servers = await self.bot.db.actual_load('server_settings', table_filter=tfilter)
|
servers = await self.bot.db.actual_load('server_settings', table_filter=tfilter)
|
||||||
for s in servers:
|
for s in servers:
|
||||||
server = bot.get_guild(int(s['server_id']))
|
server = self.bot.get_guild(int(s['server_id']))
|
||||||
if not server:
|
if not server:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
bds = self.get_birthdays_for_server(server, today=True)
|
bds = self.get_birthdays_for_server(server, today=True)
|
||||||
for bd in bds:
|
for bd in bds:
|
||||||
# Set our default to either the one set, or the default channel of the server
|
# 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 = servers.get('notifications', {}).get('default') or server.id
|
||||||
# If it is has been overriden by picarto notifications setting, use this
|
# 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 = servers.get('notifications', {}).get('birthdays') or default_channel_id
|
||||||
# Now get the channel based on that ID
|
# Now get the channel based on that ID
|
||||||
channel = server.get_channel(int(channel_id)) or server.default_channel
|
channel = server.get_channel(int(channel_id)) or server.default_channel
|
||||||
try:
|
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):
|
except (discord.Forbidden, discord.HTTPException):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -92,7 +94,6 @@ class Birthday:
|
||||||
except utils.CannotPaginate as e:
|
except utils.CannotPaginate as e:
|
||||||
await ctx.send(str(e))
|
await ctx.send(str(e))
|
||||||
|
|
||||||
|
|
||||||
@birthday.command(name='add')
|
@birthday.command(name='add')
|
||||||
@utils.custom_perms(send_messages=True)
|
@utils.custom_perms(send_messages=True)
|
||||||
@utils.check_restricted()
|
@utils.check_restricted()
|
||||||
|
@ -150,5 +151,6 @@ class Birthday:
|
||||||
self.bot.db.save('server_settings', entry)
|
self.bot.db.save('server_settings', entry)
|
||||||
await ctx.send("All birthday notifications will now go to {}".format(channel.mention))
|
await ctx.send("All birthday notifications will now go to {}".format(channel.mention))
|
||||||
|
|
||||||
|
|
||||||
def setup(bot):
|
def setup(bot):
|
||||||
bot.add_cog(Birthday(bot))
|
bot.add_cog(Birthday(bot))
|
||||||
|
|
Loading…
Reference in a new issue