Optimized raw_reaction_add for mod actions to make fewer requests. Errors now logged with bot_log

bot.py

@@ -42,8 +42,7 @@ class Rocketbot(commands.Bot):
 		super().__init__(command_prefix, **kwargs)
 
 	async def on_command_error(self, context: commands.Context, exception):
-		for line in traceback.format_stack():
-			print(line.strip())
+		bot_log(None, None, 'Command error:\n' + '\n'.join(traceback.format_stack()))
 		if context.guild is None or \
 				context.message.channel is None or \
 				context.message.author.bot:
@@ -61,11 +60,11 @@ class Rocketbot(commands.Bot):
 		# traceback.print_exception(type(exception), exception, exception.__traceback__)
 
 	async def on_error(self, event_method, args=None, kwargs=None):
-		print('Event caused error')
-		print(f'	event method: {event_method}')
-		print(f'	event args: {args}')
-		print(f'	event kwargs: {kwargs}')
-		print(traceback.format_exc())
+		bot_log(None, None, 'Event caused error\n' + \
+			f'	event method: {event_method}' + \
+			f'	event args: {args}' + \
+			f'	event kwargs: {kwargs}' + \
+			traceback.format_exc())
 
 async def start_bot():
 	intents = Intents.default()

rocketbot/cogs/basecog.py

@@ -180,29 +180,19 @@ class BaseCog(commands.Cog):
 	@commands.Cog.listener()
 	async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
 		'Event handler'
+		# Avoid any unnecessary requests. Gets called for every reaction
+		# multiplied by every active cog.
 		if payload.user_id == self.bot.user.id:
 			# Ignore bot's own reactions
 			return
-		member: Member = payload.member
-		if member is None:
-			return
-		guild: Guild = self.bot.get_guild(payload.guild_id)
+
+		guild: Guild = self.bot.get_guild(payload.guild_id) or await self.bot.fetch_guild(payload.guild_id)
 		if guild is None:
 			# Possibly a DM
 			return
-		channel: GuildChannel = guild.get_channel(payload.channel_id)
-		if channel is None:
-			# Possibly a DM
-			return
-		message: Message = await channel.fetch_message(payload.message_id)
-		if message is None:
-			# Message deleted?
-			return
-		if message.author.id != self.bot.user.id:
-			# Bot didn't author this
-			return
+
 		guild_messages = self.__bot_messages(guild)
-		bot_message = guild_messages.get(message.id)
+		bot_message = guild_messages.get(payload.message_id)
 		if bot_message is None:
 			# Unknown message (expired or was never tracked)
 			return
@@ -213,9 +203,26 @@ class BaseCog(commands.Cog):
 		if reaction is None or not reaction.is_enabled:
 			# Can't use this reaction with this message
 			return
+
+		channel: GuildChannel = guild.get_channel(payload.channel_id) or await guild.fetch_channel(payload.channel_id)
+		if channel is None:
+			# Possibly a DM
+			return
+		member: Member = payload.member
+		if member is None:
+			return
 		if not channel.permissions_for(member).ban_members:
 			# Not a mod (could make permissions configurable per BotMessageReaction some day)
 			return
+
+		message: Message = await channel.fetch_message(payload.message_id)
+		if message is None:
+			# Message deleted?
+			return
+		if message.author.id != self.bot.user.id:
+			# Bot didn't author this
+			return
+
 		await self.on_mod_react(bot_message, reaction, member)
 
 	async def on_mod_react(self,

rocketbot/cogs/logcog.py

@@ -524,12 +524,12 @@ class LoggingCog(BaseCog, name='Logging'):
 		"""
 		if payload.cached_message:
 			return  # already handled by on_message_edit
-		guild = await self.bot.fetch_guild(payload.guild_id)
+		guild = self.bot.get_guild(payload.guild_id) or await self.bot.fetch_guild(payload.guild_id)
 		if not guild:
 			return
 		if not self.get_guild_setting(guild, self.SETTING_ENABLED):
 			return
-		channel = await guild.fetch_channel(payload.channel_id)
+		channel = guild.get_channel(payload.channel_id) or await guild.fetch_channel(payload.channel_id)
 		if not channel:
 			return
 		message = await channel.fetch_message(payload.message_id)
@@ -568,12 +568,12 @@ class LoggingCog(BaseCog, name='Logging'):
 			bot_message = BotMessage(message.guild, text, BotMessage.TYPE_LOG, suppress_embeds=True)
 			await bot_message.update()
 		else:
-			guild = await self.bot.fetch_guild(payload.guild_id)
+			guild = self.bot.get_guild(payload.guild_id) or await self.bot.fetch_guild(payload.guild_id)
 			if not guild:
 				return
 			if not self.get_guild_setting(guild, self.SETTING_ENABLED):
 				return
-			channel = await guild.fetch_channel(payload.channel_id)
+			channel = guild.get_channel(payload.channel_id) or 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.'
@@ -592,12 +592,12 @@ class LoggingCog(BaseCog, name='Logging'):
 
 		https://discordpy.readthedocs.io/en/stable/api.html#discord.on_raw_bulk_message_delete
 		"""
-		guild = await self.bot.fetch_guild(payload.guild_id)
+		guild = self.bot.get_guild(payload.guild_id) or await self.bot.fetch_guild(payload.guild_id)
 		if not guild:
 			return
 		if not self.get_guild_setting(guild, self.SETTING_ENABLED):
 			return
-		channel = await guild.fetch_channel(payload.channel_id)
+		channel = guild.get_channel(payload.channel_id) or await guild.fetch_channel(payload.channel_id)
 		count = len(payload.message_ids)
 		cached_count = len(payload.cached_messages)
 		uncached_count = count - cached_count