From 65868ee63aaf715e5488662c77bb456a012d7e12 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 22 Jul 2021 11:51:03 -0600 Subject: [PATCH 1/3] Fix warnings --- jarvis/__init__.py | 2 +- jarvis/cogs/admin.py | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 4873a2f..3b1d10e 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.2" +__version__ = "1.2.3" db = DBManager(get_config().mongo).mongo diff --git a/jarvis/cogs/admin.py b/jarvis/cogs/admin.py index 2e347e3..52171fe 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 @@ -796,6 +787,7 @@ class AdminCog(commands.Cog): admin=ctx.author.id, guild=ctx.guild.id, duration=duration, + active=True, ).insert() fields = [Field("Reason", reason, False)] embed = build_embed( @@ -825,7 +817,7 @@ class AdminCog(commands.Cog): ) @commands.has_permissions(administrator=True) async def _warnings(self, ctx: SlashContext, user: User): - await ctx.defer() + await ctx.defer(hidden=True) warnings = Warning.get_many(user=user.id, guild=ctx.guild.id) active = [ f'`{y.created_at.strftime("%Y-%m-%d %H:%M:%S")}` - {y.reason}' From d73727612af497bfbe2f0f2f82f026fb74f258a9 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 22 Jul 2021 12:14:56 -0600 Subject: [PATCH 2/3] Fix unmutes --- jarvis/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 3b1d10e..cbf1927 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.3" +__version__ = "1.2.4" db = DBManager(get_config().mongo).mongo @@ -247,7 +247,7 @@ async def on_guild_join(guild): @loop(minutes=1) async def unmute(): mutes = Mute.get_active(duration={"$gt": 0}) - mute_roles = Setting.get(setting="mute") + mute_roles = Setting.get_many(setting="mute") updates = [] for mute in mutes: if ( From 306300684c84ef56c98110b4d1951118bb80be40 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Thu, 22 Jul 2021 22:20:03 -0600 Subject: [PATCH 3/3] Fix bug with /roleping allow --- jarvis/__init__.py | 2 +- jarvis/cogs/admin.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jarvis/__init__.py b/jarvis/__init__.py index cbf1927..3ccac1a 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.4" +__version__ = "1.2.5" db = DBManager(get_config().mongo).mongo diff --git a/jarvis/cogs/admin.py b/jarvis/cogs/admin.py index 52171fe..2889a7e 100644 --- a/jarvis/cogs/admin.py +++ b/jarvis/cogs/admin.py @@ -11,8 +11,17 @@ 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 @@ -902,7 +911,7 @@ class AdminCog(commands.Cog): f"Role `{role.name}` not in blocklist.", hidden=True ) return - roles.value.delete(role.id) + roles.value.remove(role.id) roles.update() await ctx.send(f"Role `{role.name}` removed blocklist.")