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

Ignore on_message(_edit) from @jarvis

Browse source
This commit is contained in:
Zeva Rose 2021-07-16 17:39:49 -06:00
parent a2704475b0
commit 0519dbd91f
2 changed files with 46 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
jarvis/__init__.py
View file

@ -34,6 +34,9 @@ jarvis_self = Process()
__version__ = "0.9.9" __version__ = "0.9.9"
db = DBManager(get_config().mongo).mongo
@jarvis.event @jarvis.event
async def on_ready(): async def on_ready():
global restart_ctx global restart_ctx
@ -84,8 +87,10 @@ async def on_member_join(user: Member):
@jarvis.event @jarvis.event
async def on_message(message: Message): async def on_message(message: Message):
if not isinstance(message.channel, DMChannel): if (
db = DBManager(get_config().mongo).mongo not isinstance(message.channel, DMChannel)
and not message.author.id == jarvis.client.id
):
autoreact = db.jarvis.autoreact.find_one( autoreact = db.jarvis.autoreact.find_one(
{"guild": message.guild.id, "channel": message.channel.id} {"guild": message.guild.id, "channel": message.channel.id}
) )

76
jarvis/cogs/modlog.py
View file

@ -2,12 +2,13 @@ import asyncio
from datetime import datetime, timedelta from datetime import datetime, timedelta
import discord import discord
import jarvis
import pymongo import pymongo
from discord import DMChannel from discord import DMChannel
from discord.ext import commands from discord.ext import commands
from discord.utils import find from discord.utils import find
from discord_slash import SlashContext from discord_slash import SlashContext
import jarvis
from jarvis.config import get_config from jarvis.config import get_config
from jarvis.utils import build_embed from jarvis.utils import build_embed
from jarvis.utils.db import DBManager from jarvis.utils.db import DBManager
@ -356,43 +357,44 @@ class ModlogCog(commands.Cog):
async def on_message_edit( async def on_message_edit(
self, before: discord.Message, after: discord.Message self, before: discord.Message, after: discord.Message
): ):
modlog = self.db.jarvis.settings.find_one( if before.author != self.bot.client.id:
{"guild": after.guild.id, "setting": "modlog"} modlog = self.db.jarvis.settings.find_one(
) {"guild": after.guild.id, "setting": "modlog"}
if modlog:
if before.content == after.content or before.content is None:
return
channel = before.guild.get_channel(modlog["value"])
fields = [
Field(
"Original Message",
before.content if before.content else "N/A",
False,
),
Field(
"New Message",
after.content if after.content else "N/A",
False,
),
]
embed = build_embed(
title="Message Edited",
description=f"{before.author.mention} edited a message",
fields=fields,
color="#fc9e3f",
timestamp=after.edited_at,
url=after.jump_url,
) )
embed.set_author( if modlog:
name=before.author.name, if before.content == after.content or before.content is None:
icon_url=before.author.avatar_url, return
url=after.jump_url, channel = before.guild.get_channel(modlog["value"])
) fields = [
embed.set_footer( Field(
text=f"{before.author.name}#{before.author.discriminator}" "Original Message",
+ f" | {before.author.id}" before.content if before.content else "N/A",
) False,
await channel.send(embed=embed) ),
Field(
"New Message",
after.content if after.content else "N/A",
False,
),
]
embed = build_embed(
title="Message Edited",
description=f"{before.author.mention} edited a message",
fields=fields,
color="#fc9e3f",
timestamp=after.edited_at,
url=after.jump_url,
)
embed.set_author(
name=before.author.name,
icon_url=before.author.avatar_url,
url=after.jump_url,
)
embed.set_footer(
text=f"{before.author.name}#{before.author.discriminator}"
+ f" | {before.author.id}"
)
await channel.send(embed=embed)
@commands.Cog.listener() @commands.Cog.listener()
async def on_message_delete(self, message: discord.Message): async def on_message_delete(self, message: discord.Message):