From 2a41eda129c6dad2b1ccaedb06954d9a06c4db14 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 22 Jul 2021 09:55:46 -0600 Subject: [PATCH] Fix bug with warnings if no warnings exist --- jarvis/__init__.py | 2 +- jarvis/cogs/admin.py | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 37b1ff5..6c17cca 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -36,7 +36,7 @@ jarvis = commands.Bot( ) slash = SlashCommand(jarvis, sync_commands=True, sync_on_cog_reload=True) jarvis_self = Process() -__version__ = "1.2.0" +__version__ = "1.2.1" db = DBManager(get_config().mongo).mongo diff --git a/jarvis/cogs/admin.py b/jarvis/cogs/admin.py index 84451c8..5044ae3 100644 --- a/jarvis/cogs/admin.py +++ b/jarvis/cogs/admin.py @@ -11,17 +11,8 @@ from discord_slash.utils.manage_commands import create_choice, create_option import jarvis from jarvis.db import DBManager -from jarvis.db.types import ( - Autopurge, - Ban, - Kick, - Lock, - Mute, - Purge, - Setting, - Unban, - Warning, -) +from jarvis.db.types import (Autopurge, Ban, Kick, Lock, Mute, Purge, Setting, + Unban, Warning) from jarvis.utils import build_embed from jarvis.utils.field import Field from jarvis.utils.permissions import admin_or_permissions @@ -832,7 +823,7 @@ class AdminCog(commands.Cog): f'`{y.created_at.strftime("%Y-%m-%d %H:%M:%S")}` - {y.reason}' for y in list(filter(lambda x: x.active, warnings)) ] - if warnings + if len(warnings) > 0 else ["None"] ) @@ -841,7 +832,7 @@ class AdminCog(commands.Cog): active = active[:10] active.append("\n>10 active, results truncated") - total = len(warnings) if warnings else 0 + total = len(warnings) fields = [ Field(f"{n_active} Active", "\n".join(active)), Field("Total", total),