POC for logging message edits

bot.py

@@ -5,7 +5,9 @@ for a template).
 Author: Ian Albert (@rocketsoup)
 Date: 2021-11-11
 """
+import asyncio
 import traceback
+
 from discord import Intents
 from discord.ext import commands
 
@@ -16,6 +18,7 @@ from rocketbot.cogs.crosspostcog import CrossPostCog
 from rocketbot.cogs.generalcog import GeneralCog
 from rocketbot.cogs.joinagecog import JoinAgeCog
 from rocketbot.cogs.joinraidcog import JoinRaidCog
+from rocketbot.cogs.logcog import LogCog
 from rocketbot.cogs.patterncog import PatternCog
 from rocketbot.cogs.urlspamcog import URLSpamCog
 from rocketbot.cogs.usernamecog import UsernamePatternCog
@@ -54,24 +57,31 @@ class Rocketbot(commands.Bot):
 		# Stack trace everything else
 		traceback.print_exception(type(exception), exception, exception.__traceback__)
 
-intents = Intents.default()
-intents.messages = True  # pylint: disable=assigning-non-slot
-intents.members = True  # pylint: disable=assigning-non-slot
-intents.presences = True
-bot = Rocketbot(command_prefix=CONFIG['command_prefix'], intents=intents)
+async def start_bot():
+	intents = Intents.default()
+	intents.messages = True  # pylint: disable=assigning-non-slot
+	intents.message_content = True  # pylint: disable=assigning-non-slot
+	intents.members = True  # pylint: disable=assigning-non-slot
+	intents.presences = True
+	print(f"Intents are {intents}")
+	print(f"Command prefix is {CONFIG['command_prefix']}")
+	bot = Rocketbot(command_prefix=CONFIG['command_prefix'], intents=intents)
+
+	# Core
+	await bot.add_cog(GeneralCog(bot))
+	await bot.add_cog(ConfigCog(bot))
 
-# Core
-bot.add_cog(GeneralCog(bot))
-bot.add_cog(ConfigCog(bot))
+	# Optional
+	await bot.add_cog(AutoKickCog(bot))
+	await bot.add_cog(CrossPostCog(bot))
+	await bot.add_cog(JoinAgeCog(bot))
+	await bot.add_cog(JoinRaidCog(bot))
+	await bot.add_cog(LogCog(bot))
+	await bot.add_cog(PatternCog(bot))
+	await bot.add_cog(URLSpamCog(bot))
+	await bot.add_cog(UsernamePatternCog(bot))
 
-# Optional
-bot.add_cog(AutoKickCog(bot))
-bot.add_cog(CrossPostCog(bot))
-bot.add_cog(JoinAgeCog(bot))
-bot.add_cog(JoinRaidCog(bot))
-bot.add_cog(PatternCog(bot))
-bot.add_cog(URLSpamCog(bot))
-bot.add_cog(UsernamePatternCog(bot))
+	await bot.start(CONFIG['client_token'], reconnect=True)
+	print('\nBot aborted')
 
-bot.run(CONFIG['client_token'], bot=True, reconnect=True)
-print('\nBot aborted')
+asyncio.run(start_bot())

rocketbot/cogs/logcog.py

@@ -4,7 +4,8 @@ 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, GuildChannel, GuildSticker, Invite, Member, Message, Role, Thread, User
+from discord import Emoji, Guild, GuildSticker, Invite, Member, Message, RawMessageUpdateEvent, Role, Thread, User
+from discord.abc import GuildChannel
 from discord.ext import commands
 from typing import List, Union
 
@@ -120,12 +121,38 @@ class LogCog(BaseCog, name='Logging'):
 	# Events - Messages
 
 	@commands.Cog.listener()
+	async def on_message(self, message: Message):
+		print(f"Saw message \"{message.content}\"")
+
+	@commands.Cog.listener()
 	async def on_message_edit(self, before: Message, after: Message) -> None:
-		pass
+		print(f"Message \"{before.content}\" changed to \"{after.content}\"")
+
+	@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}\"")
 
 	@commands.Cog.listener()
 	async def on_message_delete(self, message: Message) -> None:
-		pass
+		print(f"Message deleted \"{message.content}\"")
 
 	@commands.Cog.listener()
 	async def on_bulk_message_delete(self, messages: List[Message]) -> None:
@@ -160,69 +187,60 @@ class LogCog(BaseCog, name='Logging'):
 		pass
 
 
+	# ------------------------------------------------------------------------
 	def remove_me():
 		pass
 
 
-	@commands.Cog.listener()
-	async def on_member_join(self, member: Member) -> None:
-		'Event handler'
-		guild: Guild = member.guild
-		if not self.get_guild_setting(guild, self.SETTING_ENABLED):
-			return
-		min_count = self.get_guild_setting(guild, self.SETTING_JOIN_COUNT)
-		seconds = self.get_guild_setting(guild, self.SETTING_JOIN_TIME)
-		timespan: timedelta = timedelta(seconds=seconds)
-
-		last_raid: JoinRaidContext = Storage.get_state_value(guild, self.STATE_KEY_LAST_RAID)
-		recent_joins: AgeBoundList = Storage.get_state_value(guild, self.STATE_KEY_RECENT_JOINS)
-		if recent_joins is None:
-			recent_joins = AgeBoundList(timespan, lambda i, member : member.joined_at)
-			Storage.set_state_value(guild, self.STATE_KEY_RECENT_JOINS, recent_joins)
-		if last_raid:
-			if member.joined_at - last_raid.last_join_time() > timespan:
-				# Last raid is over
-				Storage.set_state_value(guild, self.STATE_KEY_LAST_RAID, None)
-				recent_joins.append(member)
-				return
-			# Add join to existing raid
-			last_raid.join_members.append(member)
-			self.record_warning(member)
-			if len(last_raid.banned_members) > 0:
-				self.log(guild, f'Banning as part of last join raid: {member.name}')
-				await member.ban(
-					reason='Rocketbot: Part of join raid.',
-					delete_message_days=0)
-				last_raid.banned_members.add(member)
-			elif len(last_raid.kicked_members) > 0:
-				self.log(guild, f'Kicking as part of last join raid: {member.name}')
-				await member.kick(
-					reason='Rocketbot: Part of join raid.')
-				last_raid.kicked_members.add(member)
-			await self.__update_warning_message(last_raid)
-		else:
-			# Add join to the general, non-raid recent join list
-			recent_joins.append(member)
-			if len(recent_joins) >= min_count:
-				self.log(guild, '\u0007Join raid detected')
-				last_raid = JoinRaidContext(recent_joins)
-				Storage.set_state_value(guild, self.STATE_KEY_LAST_RAID, last_raid)
-				recent_joins.clear()
-				msg = BotMessage(guild,
-						text='',
-						type=BotMessage.TYPE_MOD_WARNING,
-						context=last_raid)
-				self.record_warnings(recent_joins)
-				last_raid.warning_message_ref = weakref.ref(msg)
-				await self.__update_warning_message(last_raid)
-				await self.post_message(msg)
-
-	async def on_setting_updated(self, guild: Guild, setting: CogSetting) -> None:
-		if setting is self.SETTING_JOIN_TIME:
-			seconds = self.get_guild_setting(guild, self.SETTING_JOIN_TIME)
-			timespan: timedelta = timedelta(seconds=seconds)
-			recent_joins: AgeBoundList = Storage.get_state_value(guild,
-				self.STATE_KEY_RECENT_JOINS)
-			if recent_joins:
-				recent_joins.max_age = timespan
-				recent_joins.purge_old_elements()
+	# @commands.Cog.listener()
+	# async def on_member_join(self, member: Member) -> None:
+	# 	'Event handler'
+	# 	guild: Guild = member.guild
+	# 	if not self.get_guild_setting(guild, self.SETTING_ENABLED):
+	# 		return
+	# 	min_count = self.get_guild_setting(guild, self.SETTING_JOIN_COUNT)
+	# 	seconds = self.get_guild_setting(guild, self.SETTING_JOIN_TIME)
+	# 	timespan: timedelta = timedelta(seconds=seconds)
+
+	# 	last_raid: JoinRaidContext = Storage.get_state_value(guild, self.STATE_KEY_LAST_RAID)
+	# 	recent_joins: AgeBoundList = Storage.get_state_value(guild, self.STATE_KEY_RECENT_JOINS)
+	# 	if recent_joins is None:
+	# 		recent_joins = AgeBoundList(timespan, lambda i, member : member.joined_at)
+	# 		Storage.set_state_value(guild, self.STATE_KEY_RECENT_JOINS, recent_joins)
+	# 	if last_raid:
+	# 		if member.joined_at - last_raid.last_join_time() > timespan:
+	# 			# Last raid is over
+	# 			Storage.set_state_value(guild, self.STATE_KEY_LAST_RAID, None)
+	# 			recent_joins.append(member)
+	# 			return
+	# 		# Add join to existing raid
+	# 		last_raid.join_members.append(member)
+	# 		self.record_warning(member)
+	# 		if len(last_raid.banned_members) > 0:
+	# 			self.log(guild, f'Banning as part of last join raid: {member.name}')
+	# 			await member.ban(
+	# 				reason='Rocketbot: Part of join raid.',
+	# 				delete_message_days=0)
+	# 			last_raid.banned_members.add(member)
+	# 		elif len(last_raid.kicked_members) > 0:
+	# 			self.log(guild, f'Kicking as part of last join raid: {member.name}')
+	# 			await member.kick(
+	# 				reason='Rocketbot: Part of join raid.')
+	# 			last_raid.kicked_members.add(member)
+	# 		await self.__update_warning_message(last_raid)
+	# 	else:
+	# 		# Add join to the general, non-raid recent join list
+	# 		recent_joins.append(member)
+	# 		if len(recent_joins) >= min_count:
+	# 			self.log(guild, '\u0007Join raid detected')
+	# 			last_raid = JoinRaidContext(recent_joins)
+	# 			Storage.set_state_value(guild, self.STATE_KEY_LAST_RAID, last_raid)
+	# 			recent_joins.clear()
+	# 			msg = BotMessage(guild,
+	# 					text='',
+	# 					type=BotMessage.TYPE_MOD_WARNING,
+	# 					context=last_raid)
+	# 			self.record_warnings(recent_joins)
+	# 			last_raid.warning_message_ref = weakref.ref(msg)
+	# 			await self.__update_warning_message(last_raid)
+	# 			await self.post_message(msg)