From 869239dcd964e61adc65114c28495e6d7f778495 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 11 Jul 2021 19:33:54 -0600 Subject: [PATCH 1/2] Ignore before=None in on_message_edit, prevent other jarvis spam --- jarvis/cogs/modlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jarvis/cogs/modlog.py b/jarvis/cogs/modlog.py index 8af9b0d..a01ea28 100644 --- a/jarvis/cogs/modlog.py +++ b/jarvis/cogs/modlog.py @@ -358,7 +358,7 @@ class ModlogCog(commands.Cog): {"guild": after.guild.id, "setting": "modlog"} ) if modlog: - if before.content == after.content: + if before.content == after.content or before.content is None: return channel = before.guild.get_channel(modlog["value"]) fields = [ From 0ef839e2b5ccc348364b91927ba6a62f4fe1bd29 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Wed, 14 Jul 2021 11:35:21 -0600 Subject: [PATCH 2/2] Update (not) extortion, per 069's request --- jarvis/cogs/dbrand.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jarvis/cogs/dbrand.py b/jarvis/cogs/dbrand.py index 12b8317..c001deb 100644 --- a/jarvis/cogs/dbrand.py +++ b/jarvis/cogs/dbrand.py @@ -1,11 +1,10 @@ import re import aiohttp +import jarvis from discord.ext import commands from discord_slash import cog_ext from discord_slash.utils.manage_commands import create_option - -import jarvis from jarvis.config import get_config from jarvis.data.dbrand import shipping_lookup from jarvis.utils import build_embed @@ -116,11 +115,11 @@ class DbrandCog(commands.Cog): base="db", name="extortion", guild_ids=[862402786116763668, 578757004059738142], - description="(not)extortion", + description="(not) extortion", ) async def _extort(self, ctx): await ctx.send( - "Be (not)extorted here: " + self.base_url + "not-extortion" + "Be (not) extorted here: " + self.base_url + "not-extortion" ) @cog_ext.cog_subcommand(