aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Matei Pintilie <luca@lucamatei.com>2024-08-10 10:28:31 +0000
committerLuca Matei Pintilie <luca@lucamatei.com>2024-08-10 10:28:31 +0000
commiteca82a80107d4fc04814ae476b95124d1ce7a8af (patch)
tree17f1122464178f9026671e8d8147b7f1b34c1c2c
parentd3fbe9c8a5d2875d964a6de86d7007ddf7ad9247 (diff)
downloadsteve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar.gz
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar.bz2
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar.lz
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar.xz
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.tar.zst
steve-bot-eca82a80107d4fc04814ae476b95124d1ce7a8af.zip
Fix logic in removing alts
-rwxr-xr-xcogs/src.py24
1 files changed, 15 insertions, 9 deletions
diff --git a/cogs/src.py b/cogs/src.py
index 17f2141..20f6042 100755
--- a/cogs/src.py
+++ b/cogs/src.py
@@ -528,21 +528,27 @@ class Src(commands.Cog):
ActiveRunnerRole = server.get_role(1271515943050412042)
for key in alts_to_remove:
+ if key in keys_to_delete:
+ # Already deleted
+ continue
+
userID = int(key)
+ # If fetch_user call fails, delete the key
+ # If fetch_member fails, don't delete
+ # If it succeeds, remove rolls and delete
try:
user = await self.bot.fetch_user(userID)
+ try:
+ member = await server.fetch_member(key)
+ await member.remove_roles(RunnerRole)
+ await member.remove_roles(WrRole)
+ await member.remove_roles(ActiveRunnerRole)
+ except discord.NotFound:
+ # self.bot.logger.info(f"Didn't find user {key} in server. Not deleting")
+ continue
except discord.NotFound:
self.bot.logger.info(f"Didn't find user {key}. Deleting")
- try:
- member = await server.fetch_member(key)
- await member.remove_roles(RunnerRole)
- await member.remove_roles(WrRole)
- await member.remove_roles(ActiveRunnerRole)
- except discord.NotFound:
- # self.bot.logger.info(f"Didn't find user {key} in server. Not deleting")
- continue
-
id = str(key)
if id in data.keys():
del data[id]