Merge branch 'v1.0.0' into 'main'

V1.0.0

See merge request stark-industries/j.a.r.v.i.s.!6

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(

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 = [