From e7227540d4e234214f1125f86234bb8cf61a2dc5 Mon Sep 17 00:00:00 2001
From: Zevaryx <zevaryx@gmail.com>
Date: Tue, 1 Feb 2022 17:54:46 -0700
Subject: [PATCH] Migrate events

---
 jarvis/events/guild.py   |  8 ++++----
 jarvis/events/member.py  |  6 +++---
 jarvis/events/message.py | 17 ++++++++++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/jarvis/events/guild.py b/jarvis/events/guild.py
index 5f7dc62..119b815 100644
--- a/jarvis/events/guild.py
+++ b/jarvis/events/guild.py
@@ -1,17 +1,17 @@
 """J.A.R.V.I.S. guild event handler."""
 import asyncio
 
-from discord import Guild
-from discord.ext.commands import Bot
-from discord.utils import find
+from dis_snek import Snake
+from dis_snek.models.discord.guild import Guild
 
 from jarvis.db.models import Setting
+from jarvis.utils import find
 
 
 class GuildEventHandler(object):
     """J.A.R.V.I.S. guild event handler."""
 
-    def __init__(self, bot: Bot):
+    def __init__(self, bot: Snake):
         self.bot = bot
         self.bot.add_listener(self.on_guild_join)
 
diff --git a/jarvis/events/member.py b/jarvis/events/member.py
index 8dec15e..f849a9c 100644
--- a/jarvis/events/member.py
+++ b/jarvis/events/member.py
@@ -1,6 +1,6 @@
 """J.A.R.V.I.S. Member event handler."""
-from discord import Member
-from discord.ext.commands import Bot
+from dis_snek import Snake
+from dis_snek.models.discord.user import Member
 
 from jarvis.db.models import Mute, Setting
 
@@ -8,7 +8,7 @@ from jarvis.db.models import Mute, Setting
 class MemberEventHandler(object):
     """J.A.R.V.I.S. Member event handler."""
 
-    def __init__(self, bot: Bot):
+    def __init__(self, bot: Snake):
         self.bot = bot
         self.bot.add_listener(self.on_member_join)
 
diff --git a/jarvis/events/message.py b/jarvis/events/message.py
index 2cfea81..52a1211 100644
--- a/jarvis/events/message.py
+++ b/jarvis/events/message.py
@@ -1,13 +1,13 @@
 """J.A.R.V.I.S. Message event handler."""
 import re
 
-from discord import DMChannel, Message
-from discord.ext.commands import Bot
-from discord.utils import find
+from dis_snek import Snake
+from dis_snek.models.discord.channel import DMChannel
+from dis_snek.models.discord.message import Message
 
 from jarvis.config import get_config
 from jarvis.db.models import Autopurge, Autoreact, Roleping, Setting, Warning
-from jarvis.utils import build_embed
+from jarvis.utils import build_embed, find
 from jarvis.utils.field import Field
 
 invites = re.compile(
@@ -19,7 +19,7 @@ invites = re.compile(
 class MessageEventHandler(object):
     """J.A.R.V.I.S. Message event handler."""
 
-    def __init__(self, bot: Bot):
+    def __init__(self, bot: Snake):
         self.bot = bot
         self.bot.add_listener(self.on_message)
         self.bot.add_listener(self.on_message_edit)
@@ -208,3 +208,10 @@ class MessageEventHandler(object):
             await self.checks(after)
             await self.roleping(after)
             await self.checks(after)
+        """Handle on_message_edit event. Calls other event handlers."""
+        if not isinstance(after.channel, DMChannel) and not after.author.bot:
+            await self.massmention(after)
+            await self.roleping(after)
+            await self.checks(after)
+            await self.roleping(after)
+            await self.checks(after)