Add a bunch of new events, fix plugin ready

Author: fourjr

CHANGELOG.md

@@ -34,6 +34,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 - `?contact` now sends members a DM.
 - `level_permissions` and `command_permissions` would sometimes be reset. ([GH #2856](https://github.com/kyb3r/modmail/issues/2856))
 - Command truncated after && in alias. ([GH #2870](https://github.com/kyb3r/modmail/issues/2870))
+- `on_plugins_ready` event for plugins works now.
 
 ### Improved
 
@@ -42,6 +43,8 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 
 ### Internal
 - Use enums in config. ([GH #2821](https://github.com/kyb3r/modmail/issues/2821))
+- `on_thread_close` event for plugins.
+- `on_thread_reply` event for plugins.
 
 # v3.6.2
 

bot.py

@@ -811,6 +811,8 @@ async def process_dm_modmail(self, message: discord.Message) -> None:
                 await self.add_reaction(message, blocked_emoji)
             else:
                 await self.add_reaction(message, sent_emoji)
+                self.bot.dispatch("thread_reply", thread, False, message, False, False)
+
 
     async def get_contexts(self, message, *, cls=commands.Context):
         """
@@ -1131,6 +1133,25 @@ async def on_raw_reaction_add(self, payload):
         if self.config["transfer_reactions"]:
             await self.handle_reaction_events(payload)
 
+        react_message_id = tryint(self.bot.config.get("react_to_contact_message"))
+        react_message_emoji = self.bot.config.get("react_to_contact_emoji")
+        if all((react_message_id, react_message_emoji)):
+            if payload.message_id == react_message_id:
+                if payload.emoji.is_unicode_emoji():
+                    emoji_fmt = payload.emoji.name
+                else:
+                    emoji_fmt = f"<:{payload.emoji.name}:{payload.emoji.id}>"
+
+                if emoji_fmt == react_message_emoji:
+                    channel = self.bot.get_channel(payload.channel_id)
+                    member = channel.guild.get_member(payload.user_id)
+                    message = await channel.fetch_message(payload.message_id)
+                    await message.remove_reaction(payload.emoji, member)
+
+                    ctx = await self.bot.get_context(message)
+                    ctx.author = member
+                    await ctx.invoke(self.contact, user=member, manual_trigger=False)
+
     async def on_raw_reaction_remove(self, payload):
         if self.config["transfer_reactions"]:
             await self.handle_reaction_events(payload)

cogs/modmail.py

@@ -1012,25 +1012,8 @@ async def contact(
                 await ctx.message.delete()
 
     @commands.Cog.listener()
-    async def on_raw_reaction_add(self, payload):
-        react_message_id = tryint(self.bot.config.get("react_to_contact_message"))
-        react_message_emoji = self.bot.config.get("react_to_contact_emoji")
-        if all((react_message_id, react_message_emoji)):
-            if payload.message_id == react_message_id:
-                if payload.emoji.is_unicode_emoji():
-                    emoji_fmt = payload.emoji.name
-                else:
-                    emoji_fmt = f"<:{payload.emoji.name}:{payload.emoji.id}>"
-
-                if emoji_fmt == react_message_emoji:
-                    channel = self.bot.get_channel(payload.channel_id)
-                    member = channel.guild.get_member(payload.user_id)
-                    message = await channel.fetch_message(payload.message_id)
-                    await message.remove_reaction(payload.emoji, member)
-
-                    ctx = await self.bot.get_context(message)
-                    ctx.author = member
-                    await ctx.invoke(self.contact, user=member, manual_trigger=False)
+    async def on_plugin_ready(self):
+        print('hi')
 
     @commands.group(invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.MODERATOR)

cogs/plugins.py

@@ -15,6 +15,7 @@
 
 import discord
 from discord.ext import commands
+from discord.utils import async_all
 
 from pkg_resources import parse_version
 
@@ -145,6 +146,9 @@ async def initial_load_plugins(self):
                 continue
 
         logger.debug("Finished loading all plugins.")
+
+        self.bot.dispatch('plugins_ready')
+
         self._ready_event.set()
         await self.bot.config.update()
 

core/thread.py

@@ -486,6 +486,8 @@ async def _close(
             tasks.append(self.channel.delete())
 
         await asyncio.gather(*tasks)
+        self.bot.dispatch("thread_close", self, closer, silent, delete_channel, message, scheduled)
+
 
     async def cancel_closure(self, auto_close: bool = False, all: bool = False) -> None:
         if self.close_task is not None and (not auto_close or all):
@@ -779,6 +781,7 @@ async def reply(
                 )
 
         await asyncio.gather(*tasks)
+        self.bot.dispatch("thread_reply", self, True, message, anonymous, plain)
 
     async def send(
         self,