From a62c42042ea57c4e4ae76cbffc14e9ba83654475 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sat, 3 Jul 2021 17:31:04 -0600 Subject: [PATCH] Smarter handling of bans list message --- jarvis/cogs/admin.py | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/jarvis/cogs/admin.py b/jarvis/cogs/admin.py index a6fd367..ea4229f 100644 --- a/jarvis/cogs/admin.py +++ b/jarvis/cogs/admin.py @@ -300,25 +300,33 @@ class AdminCog(commands.Cog): bans = self.db.jarvis.bans.find(search).sort( [("time", pymongo.DESCENDING)] ) - message = "Bans:\n```\n" + ban_messages = [] db_bans = [] for ban in bans: if "username" not in ban: user = await self.bot.fetch_user(ban["user"]) ban["username"] = user.name if user else "[deleted user]" - message += "[{0}] {1} ({2}): {3}\n".format( - ban["time"].strftime("%d-%m-%Y"), - ban["username"], - ban["user"], - ban["reason"], + ban_messages.append( + "[{0}] {1} ({2}): {3}\n".format( + ban["time"].strftime("%d-%m-%Y"), + ban["username"], + ban["user"], + ban["reason"], + ) ) bans = await ctx.guild.bans() for ban in bans: if ban.user.id not in db_bans: - message += "[unknown] {0} ({1}): {2}".format( - ban.user.name, ban.user.id, ban.reason + ban_messages.append( + "[unknown] {0} ({1}): {2}".format( + ban.user.name, ban.user.id, ban.reason + ) ) - message += "```" + message = "" + if len(ban_messages) == 0: + message = "No bans matched the criteria." + else: + message = "Bans:\n```\n" + "\n".join(ban_messages) + "\n```" await ctx.send(message) @cog_ext.cog_slash(