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

Add user/role names to [p](local)allow/blocklist list (#4839)

Browse Source 
* start

* Get user inside blocklist/allowlist lists

* Changes to cover unknown or deleted users

* Use square brackets for clarity

* Implement the above commit for all four versions

* Much improved UI, removed `[]` to fit new format

* updates to support roles in local version

* add /role to unknown str

* Improve variable names

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Kreusada 2021-04-03 00:28:06 +01:00 committed by GitHub
parent c168e55be9
commit 49da854eb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
redbot/core/core_commands.py
View File

@ -2838,8 +2838,11 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
msg = _("Users on the allowlist:") msg = _("Users on the allowlist:")
else: else:
msg = _("User on the allowlist:") msg = _("User on the allowlist:")
for user in curr_list: for user_id in curr_list:
msg += "\n\t- {}".format(user) user = self.bot.get_user(user_id)
if not user:
user = _("Unknown or Deleted User")
msg += f"\n\t- {user_id} ({user})"
for page in pagify(msg): for page in pagify(msg):
await ctx.send(box(page)) await ctx.send(box(page))
@ -2907,8 +2910,11 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
msg = _("Users on the blocklist:") msg = _("Users on the blocklist:")
else: else:
msg = _("User on the blocklist:") msg = _("User on the blocklist:")
for user in curr_list: for user_id in curr_list:
msg += "\n\t- {}".format(user) user = self.bot.get_user(user_id)
if not user:
user = _("Unknown or Deleted User")
msg += f"\n\t- {user_id} ({user})"
for page in pagify(msg): for page in pagify(msg):
await ctx.send(box(page)) await ctx.send(box(page))
@ -2984,8 +2990,11 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
msg = _("Allowed users and/or roles:") msg = _("Allowed users and/or roles:")
else: else:
msg = _("Allowed user or role:") msg = _("Allowed user or role:")
for obj in curr_list: for obj_id in curr_list:
msg += "\n\t- {}".format(obj) user_or_role = self.bot.get_user(obj_id) or ctx.guild.get_role(obj_id)
if not user_or_role:
user_or_role = _("Unknown or Deleted User/Role")
msg += f"\n\t- {obj_id} ({user_or_role})"
for page in pagify(msg): for page in pagify(msg):
await ctx.send(box(page)) await ctx.send(box(page))
@ -3075,8 +3084,11 @@ class Core(commands.commands._RuleDropper, commands.Cog, CoreLogic):
msg = _("Blocked users and/or roles:") msg = _("Blocked users and/or roles:")
else: else:
msg = _("Blocked user or role:") msg = _("Blocked user or role:")
for obj in curr_list: for obj_id in curr_list:
msg += "\n\t- {}".format(obj) user_or_role = self.bot.get_user(obj_id) or ctx.guild.get_role(obj_id)
if not user_or_role:
user_or_role = _("Unknown or Deleted User/Role")
msg += f"\n\t- {obj_id} ({user_or_role})"
for page in pagify(msg): for page in pagify(msg):
await ctx.send(box(page)) await ctx.send(box(page))