Update JollinessEnforcement.py

Author: eip618

cogs/JollinessEnforcement.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import re
+
 import discord
 from discord.ext import commands
 
@@ -13,41 +15,42 @@ class JollinessEnforcement(commands.Cog):
         314856589716750346,
     }
 
-    ALLOWED_STRINGS: tuple[str, ...] = (
-        "lol",
-        "rofl",
-        "lmao",
-        "kek",
-    )
-
     NOTICE_TEXT = (
         "All messages must contain appropriate "
         "jolliness or they will be refused."
     )
 
+    LAUGH_REGEX = re.compile(
+        r"(lol+|lmao+|rofl+|kek+|(?:ha){2,}|(?:he){2,}|(?:ho){2,}|tee\s?hee|xd+|:d)",
+        re.IGNORECASE,
+    )
+
     def __init__(self, bot: commands.Bot) -> None:
         self.bot = bot
         self.enabled: bool = False
 
-    @commands.hybrid_command(name="jolliness", description="Enable or disable jolliness enforcement.")
-    @commands.has_permissions(manage_messages=True)
+    @commands.hybrid_command(
+        name="jolliness",
+        description="Enable or disable jolliness enforcement.",
+    )
+    @commands.has_permissions(manage_server=True)
     async def jolliness(self, ctx: commands.Context, state: str) -> None:
         """Enable or disable the enforcement."""
         state = state.lower()
 
         if state in ("on", "enable", "enabled", "true"):
             self.enabled = True
-            await ctx.reply("Jolliness enforcement enabled.")
+            await ctx.send("Jolliness enforcement enabled.")
         elif state in ("off", "disable", "disabled", "false"):
             self.enabled = False
-            await ctx.reply("Jolliness enforcement disabled.")
+            await ctx.send("Jolliness enforcement disabled.")
         else:
-            await ctx.reply("Use 'on' or 'off'.")
+            await ctx.send("Use 'on' or 'off'.")
 
     @jolliness.error
     async def jolliness_error(self, ctx: commands.Context, error: commands.CommandError) -> None:
         if isinstance(error, commands.MissingPermissions):
-            await ctx.reply("You do not have permission to use this command.")
+            await ctx.send("You do not have permission to use this command.")
         else:
             raise error
 
@@ -71,9 +74,11 @@ async def on_message(self, message: discord.Message) -> None:
         if parent_id not in self.TARGET_CHANNEL_IDS:
             return
 
-        content = message.content.lower()
+        # Don't eat the toggle command itself
+        if message.content.lower().startswith(".jolliness"):
+            return
 
-        if any(term in content for term in self.ALLOWED_STRINGS):
+        if self.LAUGH_REGEX.search(message.content):
             return
 
         try:
@@ -85,7 +90,11 @@ async def on_message(self, message: discord.Message) -> None:
             await message.channel.send(
                 f"{message.author.mention} {self.NOTICE_TEXT}",
                 delete_after=3,
-                allowed_mentions=discord.AllowedMentions(users=True, roles=False, everyone=False),
+                allowed_mentions=discord.AllowedMentions(
+                    users=True,
+                    roles=False,
+                    everyone=False,
+                ),
             )
         except (discord.Forbidden, discord.HTTPException):
             pass