WhatTheMike/Fox-V3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Timerole rewrite WIP

Browse Source
This commit is contained in:
bobloy 2020-10-02 15:32:55 -04:00
parent 44035b78f7
commit b141accbd9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
timerole/timerole.py
View File

@ -178,11 +178,14 @@ class Timerole(Cog):
utcnow = datetime.utcnow() utcnow = datetime.utcnow()
all_guilds = await self.config.all_guilds() all_guilds = await self.config.all_guilds()
all_mrs = await self.config.custom("MemberRole").all() # all_mrs = await self.config.custom("MemberRole").all()
log.debug(f"Begin timerole update")
for guild in self.bot.guilds: for guild in self.bot.guilds:
guild_id = str(guild.id) guild_id = guild.id
if guild_id not in all_guilds: if guild_id not in all_guilds:
log.debug(f"Guild has no configured settings: {guild}")
continue continue
add_results = "" add_results = ""
@ -191,6 +194,7 @@ class Timerole(Cog):
role_dict = all_guilds[guild_id]["roles"] role_dict = all_guilds[guild_id]["roles"]
if not any(role_data for role_data in role_dict.values()): # No roles if not any(role_data for role_data in role_dict.values()): # No roles
log.debug(f"No roles are configured for guild: {guild}")
continue continue
async for member in AsyncIter(guild.members, steps=100): async for member in AsyncIter(guild.members, steps=100):
@ -198,7 +202,7 @@ class Timerole(Cog):
removelist = [] removelist = []
for role_id, role_data in role_dict.items(): for role_id, role_data in role_dict.items():
mr_dict = all_mrs[str(member.id)][role_id] mr_dict = await self.config.custom("MemberRole", member.id, role_id).all()
# Stop if they've had the role and reapplying is disabled # Stop if they've had the role and reapplying is disabled
if not reapply and mr_dict["had_role"]: if not reapply and mr_dict["had_role"]:
@ -222,7 +226,9 @@ class Timerole(Cog):
continue continue
# Stop if they don't have all the required roles # Stop if they don't have all the required roles
if "required" in role_data and not set(role_data["required"]) & has_roles: if role_data is None or (
"required" in role_data and not set(role_data["required"]) & has_roles
):
# Doesn't have required role # Doesn't have required role
continue continue