jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate events

Browse source
This commit is contained in:
Zeva Rose 2022-02-01 17:54:46 -07:00
parent 9fa3e2c26b
commit e7227540d4
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
jarvis/events/guild.py
View file

@ -1,17 +1,17 @@
"""J.A.R.V.I.S. guild event handler.""" """J.A.R.V.I.S. guild event handler."""
import asyncio import asyncio
from discord import Guild from dis_snek import Snake
from discord.ext.commands import Bot from dis_snek.models.discord.guild import Guild
from discord.utils import find
from jarvis.db.models import Setting from jarvis.db.models import Setting
from jarvis.utils import find
class GuildEventHandler(object): class GuildEventHandler(object):
"""J.A.R.V.I.S. guild event handler.""" """J.A.R.V.I.S. guild event handler."""
def __init__(self, bot: Bot): def __init__(self, bot: Snake):
self.bot = bot self.bot = bot
self.bot.add_listener(self.on_guild_join) self.bot.add_listener(self.on_guild_join)

6
jarvis/events/member.py
View file

@ -1,6 +1,6 @@
"""J.A.R.V.I.S. Member event handler.""" """J.A.R.V.I.S. Member event handler."""
from discord import Member from dis_snek import Snake
from discord.ext.commands import Bot from dis_snek.models.discord.user import Member
from jarvis.db.models import Mute, Setting from jarvis.db.models import Mute, Setting
@ -8,7 +8,7 @@ from jarvis.db.models import Mute, Setting
class MemberEventHandler(object): class MemberEventHandler(object):
"""J.A.R.V.I.S. Member event handler.""" """J.A.R.V.I.S. Member event handler."""
def __init__(self, bot: Bot): def __init__(self, bot: Snake):
self.bot = bot self.bot = bot
self.bot.add_listener(self.on_member_join) self.bot.add_listener(self.on_member_join)

17
jarvis/events/message.py
View file

@ -1,13 +1,13 @@
"""J.A.R.V.I.S. Message event handler.""" """J.A.R.V.I.S. Message event handler."""
import re import re
from discord import DMChannel, Message from dis_snek import Snake
from discord.ext.commands import Bot from dis_snek.models.discord.channel import DMChannel
from discord.utils import find from dis_snek.models.discord.message import Message
from jarvis.config import get_config from jarvis.config import get_config
from jarvis.db.models import Autopurge, Autoreact, Roleping, Setting, Warning 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 from jarvis.utils.field import Field
invites = re.compile( invites = re.compile(
@ -19,7 +19,7 @@ invites = re.compile(
class MessageEventHandler(object): class MessageEventHandler(object):
"""J.A.R.V.I.S. Message event handler.""" """J.A.R.V.I.S. Message event handler."""
def __init__(self, bot: Bot): def __init__(self, bot: Snake):
self.bot = bot self.bot = bot
self.bot.add_listener(self.on_message) self.bot.add_listener(self.on_message)
self.bot.add_listener(self.on_message_edit) self.bot.add_listener(self.on_message_edit)
@ -208,3 +208,10 @@ class MessageEventHandler(object):
await self.checks(after) await self.checks(after)
await self.roleping(after) await self.roleping(after)
await self.checks(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)