feat: implement event handler system, fix #98

RedTeaDev · RedTeaDev · commit 53e032a98bd4 · 2025-09-28T12:46:59.000+08:00
diff --git a/Teapot.py b/Teapot.py
@@ -9,6 +9,7 @@
 from dotenv import load_dotenv
 
 import teapot
+from teapot.event_handler.loader import EventHandlerLoader
 
 print(f"""
   _____                      _   
@@ -83,12 +84,15 @@
     print(
         f"Connected to database ({teapot.config.db_host()}:{teapot.config.db_port()}) in {round(time.perf_counter() - time_start, 2)}s")
 
+
 intents = discord.Intents.all()
 intents.members = True
 intents.message_content = True
 intents.typing = False
 bot = dcmd.Bot(intents=intents, command_prefix=teapot.config.bot_prefix(), help_command=None)
 
+event_handler_loader = EventHandlerLoader(bot) # Event Handler
+
 
 @bot.event
 async def on_ready():
diff --git a/teapot/cogs/nqn.py b/teapot/cogs/nqn.py
@@ -5,7 +5,6 @@
 class Emoji(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        self.on_message_send(bot)
 
     async def getemote(self, arg):
         emoji = utils.get(self.bot.emojis, name=arg.strip(":"))
@@ -61,41 +60,6 @@ async def getinstr(self, content):
 
         return ret
 
-    def on_message_send(self, bot):
-        @bot.event
-        async def on_message(message):
-            if message.author.bot:  # check is author bot
-                return
-
-            if ":" in message.content:
-                msg = await self.getinstr(message.content)
-                ret = ""
-                em = False
-                smth = message.content.split(":")
-                if len(smth) > 1:
-                    for word in msg:
-                        if word.startswith(":") and word.endswith(":") and len(word) > 1:
-                            emoji = await self.getemote(word)
-                            if emoji is not None:
-                                em = True
-                                ret += f" {emoji}"
-                            else:
-                                ret += f" {word}"
-                        else:
-                            ret += f" {word}"
-
-                else:
-                    ret += msg
-
-                if em:
-                    webhooks = await message.channel.webhooks()
-                    webhook = utils.get(webhooks, name="Imposter NQN")
-                    if webhook is None:
-                        webhook = await message.channel.create_webhook(name="Imposter NQN")
-
-                    await webhook.send(ret, username=message.author.name, avatar_url=message.author.display_avatar.url)
-                    await message.delete()
-
 
 async def setup(bot):
     await bot.add_cog(Emoji(bot))
diff --git a/teapot/event_handler/__init__.py b/teapot/event_handler/__init__.py
diff --git a/teapot/event_handler/db_handler.py b/teapot/event_handler/db_handler.py
@@ -0,0 +1,24 @@
+import teapot
+
+async def on_message_handler(bot, message):
+    if teapot.config.storage_type() == "mysql":
+        try:
+            database = teapot.database.__init__()
+            db = teapot.database.db(database)
+            db.execute("SELECT * FROM `users` WHERE user_id = '" + str(message.author.id) + "'")
+            if db.rowcount == 0:
+                db.execute("INSERT INTO `users`(user_id, user_name, user_display_name) VALUES(%s, %s, %s)",
+                           (message.author.id, message.author.name, message.author.display_name))
+                database.commit()
+            db.execute("SELECT * FROM `channels` WHERE channel_id = '" + str(message.channel.id) + "'")
+            if db.rowcount == 0:
+                db.execute("INSERT INTO `channels`(channel_id, channel_name) VALUES(%s, %s)",
+                           (message.channel.id, message.channel.name))
+                database.commit()
+            db.execute(
+                "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
+                (teapot.time(), message.guild.id, message.channel.id, message.id, message.author.id,
+                 "MESSAGE_SEND", message.content))
+            database.commit()
+        except Exception as e:
+            print(e)
diff --git a/teapot/event_handler/loader.py b/teapot/event_handler/loader.py
@@ -0,0 +1,38 @@
+from discord.ext import commands
+import importlib
+import os
+
+class EventHandlerLoader:
+    """
+    Dynamically loads event handler modules and registers a unified on_message event.
+
+    As discord only allows one on_message event, this loader collects all on_message handlers
+    from the event_handler submodules and calls them sequentially.
+    """
+    def __init__(self, bot: commands.Bot):
+        self.bot = bot
+        self.handlers = []
+        self.load_event_handlers()
+        self.register_on_message()
+
+    def load_event_handlers(self):
+        """
+        Scan for all python file in the event_handler directory to find on_message handlers.
+        """
+        handler_dir = os.path.dirname(__file__)
+        for fname in os.listdir(handler_dir):
+            if fname.endswith('.py') and fname not in ('__init__.py', 'loader.py'):
+                mod_name = f'teapot.event_handler.{fname[:-3]}'
+                module = importlib.import_module(mod_name)
+                if hasattr(module, 'on_message_handler'):
+                    self.handlers.append(module.on_message_handler)
+    
+    def get_registered_handlers(self):
+        return self.handlers
+
+    def register_on_message(self):
+        @self.bot.event
+        async def on_message(message):
+            for handler in self.handlers:
+                await handler(self.bot, message)
+            await self.bot.process_commands(message)
diff --git a/teapot/event_handler/nqn_handler.py b/teapot/event_handler/nqn_handler.py
@@ -0,0 +1,33 @@
+from discord import utils
+
+async def on_message_handler(bot, message):
+    if message.author.bot:
+        return
+    if ":" in message.content:
+        emoji_cog = bot.get_cog("Emoji")  # obtain the Emoji Cog instance
+        if emoji_cog is None:
+            return
+        msg = await emoji_cog.getinstr(message.content)
+        ret = ""
+        em = False
+        smth = message.content.split(":")
+        if len(smth) > 1:
+            for word in msg:
+                if word.startswith(":") and word.endswith(":") and len(word) > 1:
+                    emoji = await emoji_cog.getemote(word)
+                    if emoji is not None:
+                        em = True
+                        ret += f" {emoji}"
+                    else:
+                        ret += f" {word}"
+                else:
+                    ret += f" {word}"
+        else:
+            ret += msg
+        if em:
+            webhooks = await message.channel.webhooks()
+            webhook = utils.get(webhooks, name="Imposter NQN")
+            if webhook is None:
+                webhook = await message.channel.create_webhook(name="Imposter NQN")
+            await webhook.send(ret, username=message.author.name, avatar_url=message.author.display_avatar.url)
+            await message.delete()
diff --git a/teapot/event_handler/profanity_handler.py b/teapot/event_handler/profanity_handler.py
@@ -0,0 +1,15 @@
+import teapot
+from teapot.events import predict_prob
+import discord
+
+async def on_message_handler(bot, message):
+    punctuations = '!()-[]{};:\'"\\,<>./?@#$%^&*_~'
+    msg = ""
+    for char in message.content.lower():
+        if char not in punctuations:
+            msg = msg + char
+    prob = predict_prob([msg])
+    if prob >= 0.8:
+        em = discord.Embed(title=f"AI Analysis Results", color=0xC54B4F)
+        em.add_field(name='PROFANITY DETECTED! ', value=str(prob[0]))
+        await message.channel.send(embed=em)
diff --git a/teapot/event_handler/sao_handler.py b/teapot/event_handler/sao_handler.py
@@ -0,0 +1,28 @@
+import discord
+import teapot
+
+async def on_message_handler(bot, message):
+    punctuations = '!()-[]{};:\'"\\,<>./?@#$%^&*_~'
+    msg = ""
+    for char in message.content.lower():
+        if char not in punctuations:
+            msg = msg + char
+    if msg.startswith("system call "):
+        content = msg[12:].split(" ")
+        if content[0].lower() == "inspect":
+            if content[1].lower() == "entire":
+                if content[2].lower() == "command":
+                    if content[3].lower() == "list":
+                        em = discord.Embed(title=f"🍢 SAO Command List", color=0x7400FF)
+                        em.set_thumbnail(url="https://cdn.discordapp.com/attachments/668816286784159763/674285661510959105/Kirito-Sao-Logo-1506655414__76221.1550241566.png")
+                        em.add_field(name='Commands', value="generate xx element\ngenerate xx element xx shape\ninspect entire command list")
+                        em.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
+                        await message.channel.send(embed=em)
+        elif content[0].lower() == "generate":
+            if content[-1].lower() == "element":
+                em = discord.Embed(title=f"✏ Generated {content[1].lower()} element!", color=0xFF0000)
+                await message.channel.send(embed=em)
+            if content[-1].lower() == "shape":
+                if content[2].lower() == "element":
+                    em = discord.Embed(title=f"✏ Generated {content[-2].lower()} shaped {content[1].lower()} element!", color=0xFF0000)
+                    await message.channel.send(embed=em)
diff --git a/teapot/events.py b/teapot/events.py
@@ -9,7 +9,7 @@ def __init__(bot):
     join(bot)
     leave(bot)
     on_guild_join(bot)
-    message_send(bot)
+    # on_message is now handled by event_handler/loader.py
     message_edit(bot)
     message_delete(bot)
     on_command_error(bot)
@@ -51,79 +51,6 @@ async def on_guild_join(ctx):
         if teapot.config.storage_type() == "mysql":
             teapot.database.create_guild_table(ctx.guild)
 
-
-def message_send(bot):
-    @bot.event
-    async def on_message(message):
-        if teapot.config.storage_type() == "mysql":
-            try:
-                database = teapot.database.__init__()
-                db = teapot.database.db(database)
-                db.execute("SELECT * FROM `users` WHERE user_id = '" + str(message.author.id) + "'")
-                if db.rowcount == 0:
-                    db.execute("INSERT INTO `users`(user_id, user_name, user_display_name) VALUES(%s, %s, %s)",
-                               (message.author.id, message.author.name, message.author.display_name))
-                    database.commit()
-
-                db.execute("SELECT * FROM `channels` WHERE channel_id = '" + str(message.channel.id) + "'")
-                if db.rowcount == 0:
-                    db.execute("INSERT INTO `channels`(channel_id, channel_name) VALUES(%s, %s)",
-                               (message.channel.id, message.channel.name))
-                    database.commit()
-                db.execute(
-                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
-                    (teapot.time(), message.guild.id, message.channel.id, message.id, message.author.id,
-                     "MESSAGE_SEND", message.content))
-                database.commit()
-            except Exception as e:
-                print(e)
-        await bot.process_commands(message)
-
-    @bot.event
-    async def on_message(message):
-        # SAO Easter Egg
-        punctuations = '!()-[]{};:\'"\\,<>./?@#$%^&*_~'
-        # remove punctuation from the string
-        msg = ""
-        for char in message.content.lower():
-            if char not in punctuations:
-                msg = msg + char
-
-        # profanity check
-        prob = predict_prob([msg])
-        if prob >= 0.8:
-            em = discord.Embed(title=f"AI Analysis Results", color=0xC54B4F) # TODO: this will be replaced with cloud detection soon
-            em.add_field(name='PROFANITY DETECTED! ', value=str(prob[0]))
-            await message.channel.send(embed=em)
-
-        if msg.startswith("system call "):
-            content = msg[12:].split(" ")
-            if content[0].lower() == "inspect":
-                if content[1].lower() == "entire":
-                    if content[2].lower() == "command":
-                        if content[3].lower() == "list":
-                            em = discord.Embed(title=f"🍢 SAO Command List", color=0x7400FF)
-                            em.set_thumbnail(
-                                url="https://cdn.discordapp.com/attachments/668816286784159763/674285661510959105/Kirito-Sao-Logo-1506655414__76221.1550241566.png")
-                            em.add_field(name='Commands',
-                                         value="generate xx element\ngenerate xx element xx shape\ninspect entire command list")
-
-                            em.set_footer(text=f"{teapot.copyright()} | Code licensed under the MIT License")
-                            await message.channel.send(embed=em)
-            elif content[0].lower() == "generate":
-                if content[-1].lower() == "element":
-                    em = discord.Embed(title=f"✏ Generated {content[1].lower()} element!",
-                                       color=0xFF0000)
-                    await message.channel.send(embed=em)
-                if content[-1].lower() == "shape":
-                    if content[2].lower() == "element":
-                        em = discord.Embed(
-                            title=f"✏ Generated {content[-2].lower()} shaped {content[1].lower()} element!",
-                            color=0xFF0000)
-                        await message.channel.send(embed=em)
-        await bot.process_commands(message)
-
-
 def message_edit(bot):
     @bot.event
     async def on_raw_message_edit(ctx):
