Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature-timer

Browse Source
This commit is contained in:
Conatum
2022-01-06 09:34:37 +02:00
parent 24d2e17cae 223d45416d
commit 0cdb2bbdca
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bot/constants.py
View File

@@ -1,2 +1,2 @@
CONFIG_FILE = "config/bot.conf" CONFIG_FILE = "config/bot.conf"
DATA_VERSION = 6 DATA_VERSION = 7

2
bot/modules/guild_admin/reaction_roles/expiry.py
View File

@@ -126,7 +126,7 @@ async def _expiry_tracker(client):
while True: while True:
try: try:
key = _next() key = _next()
diff = utc_now().timestamp() - _expiring[key] if key else None diff = _expiring[key] - utc_now().timestamp() if key else None
await asyncio.wait_for(_wakeup_event.wait(), timeout=diff) await asyncio.wait_for(_wakeup_event.wait(), timeout=diff)
except asyncio.TimeoutError: except asyncio.TimeoutError:
# Timeout means next doesn't exist or is ready to expire # Timeout means next doesn't exist or is ready to expire

2
bot/utils/ctx_addons.py
View File

@@ -20,7 +20,7 @@ async def embed_reply(ctx, desc, colour=discord.Colour.orange(), **kwargs):
try: try:
return await ctx.reply(embed=embed, reference=ctx.msg.to_reference(fail_if_not_exists=False)) return await ctx.reply(embed=embed, reference=ctx.msg.to_reference(fail_if_not_exists=False))
except discord.Forbidden: except discord.Forbidden:
if not ctx.guild or ctx.ch.permissions_for(ctx.guild.me).send_mssages: if not ctx.guild or ctx.ch.permissions_for(ctx.guild.me).send_messages:
await ctx.reply("Command failed, I don't have permission to send embeds in this channel!") await ctx.reply("Command failed, I don't have permission to send embeds in this channel!")
raise SafeCancellation raise SafeCancellation