CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 03:08:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Mod] Only loop through guilds in config when checking tempbans (#4907)

Browse Source 
* [Mod] No longer loop through all guilds on check_tempban_expirations.

* Address Jack's review.

* I don't think this comment actually served any purpose

* Split this into more methods

* Small optimization for cases where the guild tempbans weren't updated

* Blackify

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
PredaaA 2021-04-03 23:59:41 +02:00 committed by GitHub
parent edbd31413b
commit 363a2e8a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
redbot/cogs/mod/kickban.py
View File

@ -229,29 +229,48 @@ class KickBanMixin(MixinMeta):
return True, success_message
async def check_tempban_expirations(self):
while self == self.bot.get_cog("Mod"):
async for guild in AsyncIter(self.bot.guilds, steps=100):
async def tempban_expirations_task(self) -> None:
while True:
try:
await self._check_tempban_expirations()
except Exception:
log.exception("Something went wrong in check_tempban_expirations:")
await asyncio.sleep(60)
async def _check_tempban_expirations(self) -> None:
guilds_data = await self.config.all_guilds()
async for guild_id, guild_data in AsyncIter(guilds_data.items(), steps=100):
if not (guild := self.bot.get_guild(guild_id)):
continue
if not guild.me.guild_permissions.ban_members:
continue
if await self.bot.cog_disabled_in_guild(self, guild):
continue
async with self.config.guild(guild).current_tempbans() as guild_tempbans:
guild_tempbans = guild_data["current_tempbans"]
if not guild_tempbans:
continue
async with self.config.guild(guild).current_tempbans.get_lock():
if await self._check_guild_tempban_expirations(guild, guild_tempbans):
await self.config.guild(guild).current_tempbans.set(guild_tempbans)
async def _check_guild_tempban_expirations(
self, guild: discord.Guild, guild_tempbans: List[int]
) -> bool:
changed = False
for uid in guild_tempbans.copy():
unban_time = datetime.fromtimestamp(
await self.config.member_from_ids(guild.id, uid).banned_until(),
timezone.utc,
)
if datetime.now(timezone.utc) > unban_time: # Time to unban the user
if datetime.now(timezone.utc) > unban_time:
try:
await guild.unban(
discord.Object(id=uid), reason=_("Tempban finished")
)
await guild.unban(discord.Object(id=uid), reason=_("Tempban finished"))
except discord.NotFound:
# user is not banned anymore
guild_tempbans.remove(uid)
changed = True
except discord.HTTPException as e:
# 50013: Missing permissions error code or 403: Forbidden status
if e.code == 50013 or e.status == 403:
@ -264,7 +283,8 @@ class KickBanMixin(MixinMeta):
else:
# user unbanned successfully
guild_tempbans.remove(uid)
await asyncio.sleep(60)
changed = True
return changed
@commands.command()
@commands.guild_only()

2
redbot/cogs/mod/mod.py
View File

@ -80,7 +80,7 @@ class Mod(
self.config.register_member(**self.default_member_settings)
self.config.register_user(**self.default_user_settings)
self.cache: dict = {}
self.tban_expiry_task = self.bot.loop.create_task(self.check_tempban_expirations())
self.tban_expiry_task = asyncio.create_task(self.tempban_expirations_task())
self.last_case: dict = defaultdict(dict)
self._ready = asyncio.Event()