Logging edits and deletes, both cached and uncached, plus bulk deletes

config.py.sample

@@ -10,6 +10,7 @@ CONFIG = {
 	'failure_emoji': '❌',
 	'warning_emoji': '⚠️',
 	'info_emoji': 'ℹ️',
+	'log_emoji': '📋',
 	'ignore_emoji': '👍',
 	'config_path': 'config/',
 	'max_members_per_message': 20,

rocketbot/botmessage.py

@@ -118,13 +118,15 @@ class BotMessage:
 	TYPE_MOD_WARNING: int = 2
 	TYPE_SUCCESS: int = 3
 	TYPE_FAILURE: int = 4
+	TYPE_LOG: int = 5
 
 	def __init__(self,
 			guild: Guild,
 			text: str,
 			type: int = TYPE_DEFAULT, # pylint: disable=redefined-builtin
 			context: Optional[Any] = None,
-			reply_to: Optional[Message] = None):
+			reply_to: Optional[Message] = None,
+			suppress_embeds: bool = False):
 		"""
 		Creates a bot message.
 		- guild: The Discord guild to send the message to.
@@ -144,6 +146,7 @@ class BotMessage:
 		self.__posted_emoji: set[str] = set()  # last emoji list posted
 		self.__message: Optional[Message] = None  # set once the message has been posted
 		self.__reply_to: Optional[Message] = reply_to
+		self.__suppress_embeds = suppress_embeds
 		self.__reactions: list[BotMessageReaction] = []
 
 	def is_sent(self) -> bool:
@@ -269,11 +272,13 @@ class BotMessage:
 					return
 				channel: TextChannel = self.guild.get_channel(channel_id)
 				if channel is None:
+					channel = await self.guild.fetch_channel(channel_id)
+				if channel is None:
 					bot_log(self.guild, \
 						type(self.source_cog) if self.source_cog else None, \
-						'\u0007Configured warning channel does not exist!')
+						f'\u0007Configured warning channel does not exist for guild {self.guild.name} ({self.guild.id})!')
 					return
-				self.__message = await channel.send(content=content)
+				self.__message = await channel.send(content=content, suppress_embeds=self.__suppress_embeds)
 				self.__posted_text = content
 		emoji_to_remove = self.__posted_emoji.copy()
 		for reaction in self.__reactions:
@@ -306,6 +311,8 @@ class BotMessage:
 			s += CONFIG['success_emoji'] + ' '
 		elif self.type == self.TYPE_FAILURE:
 			s += CONFIG['failure_emoji'] + ' '
+		elif self.type == self.TYPE_LOG:
+			s += CONFIG['log_emoji'] + ' '
 
 		s += self.text
 

rocketbot/cogs/logcog.py

@@ -4,9 +4,10 @@ Cog for detecting large numbers of guild joins in a short period of time.
 import weakref
 from collections.abc import Sequence
 from datetime import datetime, timedelta
-from discord import Emoji, Guild, GuildSticker, Invite, Member, Message, RawMessageUpdateEvent, Role, Thread, User
+from discord import Emoji, Guild, GuildSticker, Invite, Member, Message, RawBulkMessageDeleteEvent, RawMessageDeleteEvent, RawMessageUpdateEvent, Role, Thread, User
 from discord.abc import GuildChannel
 from discord.ext import commands
+from discord.utils import escape_markdown
 from typing import List, Union
 
 from config import CONFIG
@@ -122,41 +123,79 @@ class LogCog(BaseCog, name='Logging'):
 
 	@commands.Cog.listener()
 	async def on_message(self, message: Message):
-		print(f"Saw message \"{message.content}\"")
+		# print(f"Saw message {message.id} \"{message.content}\"")
 
 	@commands.Cog.listener()
 	async def on_message_edit(self, before: Message, after: Message) -> None:
-		print(f"Message \"{before.content}\" changed to \"{after.content}\"")
+		text = f'Message {after.jump_url} edited by **{after.author.name}** ({after.author.display_name} {after.author.id}).\n\n' + \
+			f'Original markdown:\n> {escape_markdown(before.content)}\n\n' + \
+			f'Updated markdown:\n> {escape_markdown(after.content)}'
+		bot_message = BotMessage(after.guild, text, BotMessage.TYPE_LOG, suppress_embeds=True)
+		await bot_message.update()
 
 	@commands.Cog.listener()
 	async def on_raw_message_edit(self, payload: RawMessageUpdateEvent) -> None:
 		if payload.cached_message:
-			print("Edited message is cached")
 			return  # already handled by on_message_edit
-		print(f"Fetching guild {payload.guild_id}")
 		guild = await self.bot.fetch_guild(payload.guild_id)
 		if not guild:
-			print(f"Couldn't fetch edited message guild {payload.guild_id}")
 			return
-		print(f"Fetching channel {payload.channel_id}")
 		channel = await guild.fetch_channel(payload.channel_id)
 		if not channel:
-			print(f"Couldn't fetch edited message channel {payload.channel_id}")
 			return
-		print(f"Fetching message {payload.message_id}")
 		message = await channel.fetch_message(payload.message_id)
 		if not message:
-			print(f"Couldn't fetch edited message {payload.message_id}")
 			return
-		print(f"Message was edited, but I don't have the old version. Current version is \"{message.content}\"")
+		text = f'Message {message.jump_url} edited by **{message.author.name}** ({message.author.display_name} {message.author.id}).\n\n' + \
+			'Original markdown unavailable in cache.\n\n' + \
+			f'Updated markdown:\n> {escape_markdown(message.content)}'
+		bot_message = BotMessage(guild, text, BotMessage.TYPE_LOG, suppress_embeds=True)
+		await bot_message.update()
 
 	@commands.Cog.listener()
-	async def on_message_delete(self, message: Message) -> None:
-		print(f"Message deleted \"{message.content}\"")
+	async def on_raw_message_delete(self, payload: RawMessageDeleteEvent) -> None:
+		print('Raw message deleted')
+		if payload.cached_message:
+			message = payload.cached_message
+			text = f'Message by **{message.author.name}** ({message.author.display_name} {message.author.id}) deleted from {message.channel.mention}\n\n' + \
+				f'Markdown:\n> {escape_markdown(message.content)}'
+			bot_message = BotMessage(message.guild, text, BotMessage.TYPE_LOG, suppress_embeds=True)
+			await bot_message.update()
+		else:
+			print(f'Looking up guild {payload.guild_id}')
+			guild = await self.bot.fetch_guild(payload.guild_id)
+			if not guild:
+				return
+			print(f'Looking up channel {payload.channel_id}')
+			channel = await guild.fetch_channel(payload.channel_id)
+			if not channel:
+				return
+			text = f'Message {payload.message_id} deleted in ' + channel.mention + ' but content and author not available in cache.'
+			bot_message = BotMessage(guild, text, BotMessage.TYPE_LOG, suppress_embeds=True)
+			await bot_message.update()
 
 	@commands.Cog.listener()
-	async def on_bulk_message_delete(self, messages: List[Message]) -> None:
-		pass
+	async def on_raw_bulk_message_delete(self, payload: RawBulkMessageDeleteEvent) -> None:
+		guild = await self.bot.fetch_guild(payload.guild_id)
+		if not guild:
+			return
+		channel = await guild.fetch_channel(payload.channel_id)
+		count = len(payload.message_ids)
+		cached_count = len(payload.cached_messages)
+		uncached_count = count - cached_count
+		text = f'Bulk deletion of {count} message(s) from {channel.mention}.'
+		if uncached_count == count:
+			text += f' No cached content available for any of them.'
+		elif uncached_count > 0:
+			text += f' No cached content available for {uncached_count} of them.'
+		bot_message = BotMessage(guild, text, BotMessage.TYPE_LOG)
+		await bot_message.update()
+
+		for message in payload.cached_messages:
+			text = f'Message by **{message.author.name}** ({message.author.display_name} {message.author.id}) bulk deleted from {message.channel.mention}\n\n' + \
+				f'Markdown:\n> {escape_markdown(message.content)}'
+			bot_message = BotMessage(guild, text, BotMessage.TYPE_LOG)
+			await bot_message.update()
 
 	# Events - Roles