Filling out crosspost trace details

rocketbot/cogs/crosspostcog.py

@@ -138,7 +138,7 @@ class CrossPostCog(BaseCog, name='Crosspost Detection'):
 	async def __record_message(self, message: Message) -> None:
 		if message.channel.permissions_for(message.author).ban_members:
 			# User exempt from spam detection
-			self.__trace("User exempt from crosspost checks")
+			self.__trace(f"User {message.author.name} exempt from crosspost checks")
 			return
 		def compute_message_hash(m: Message) -> int:
 			to_hash = m.content
@@ -149,13 +149,13 @@ class CrossPostCog(BaseCog, name='Crosspost Detection'):
 			for attachment in m.attachments:
 				to_hash += f'\n[[ATT: ct={attachment.content_type} s={attachment.size} w={attachment.width} h={attachment.height}]]'
 			h = hash(to_hash)
-			self.__trace(f"Message hash for {m.id} is {h}")
+			self.__trace(f"Hash for message #{m.id} by {m.author.name} is {h}\n\thash content: \"{to_hash}\"")
 			return h
 
 		min_length = self.get_guild_setting(message.guild, self.SETTING_MIN_LENGTH)
 		if len(message.attachments) == 0 and len(message.content) < min_length:
 			# Message too short to count towards spam total
-			self.__trace(f"Message len {len(message.content)} < {min_length}")
+			self.__trace(f"Message len {len(message.content)} < {min_length} configured min")
 			return
 
 		# Get config
@@ -170,14 +170,14 @@ class CrossPostCog(BaseCog, name='Crosspost Detection'):
 			Storage.set_state_value(message.guild, self.STATE_KEY_RECENT_MESSAGES, recent_messages)
 		recent_messages.max_age = max_age
 		recent_messages.append(message)
-		self.__trace(f"Recent messages now length {len(recent_messages)}")
+		self.__trace(f"Recent messages now length {len(recent_messages)} (max age {max_age.total_seconds}s)")
 
 		# Get all recent messages by user
 		member_messages = [m for m in recent_messages if m.author.id == message.author.id]
 		message_count = len(member_messages)
-		self.__trace(f"Found {message_count} messages for {message.author.name}")
+		self.__trace(f"Found {message_count} recent messages by {message.author.name}")
 		if message_count < warn_count and message_count < dupe_warn_count:
-			self.__trace(f"Bailing because message count {message_count} < warn count {warn_count} and < dupe warn count {dupe_warn_count}")
+			self.__trace(f"Bailing because total message count {message_count} < configured warn count {warn_count} and < dupe warn count {dupe_warn_count}")
 			return
 
 		# Look for identical(ish) messages and unique channels
@@ -194,13 +194,15 @@ class CrossPostCog(BaseCog, name='Crosspost Detection'):
 			unique_channels.add(m.channel)
 			max_duplicate_count = max(max_duplicate_count, len(dupe_message_channels))
 		channel_count = len(unique_channels)
-		self.__trace(f"Found {len(hash_to_channels)} unique messages, {channel_count} unique channels, {max_duplicate_count} duplicated messages")
+		self.__trace(f"Found {len(hash_to_channels)} unique messages, {channel_count} unique channels, configured {max_duplicate_count} duplicated messages")
 		if channel_count < warn_count and max_duplicate_count < dupe_warn_count:
-			self.__trace(f"Bailing because channels {channel_count} < warn count {warn_count} and max dupes {max_duplicate_count} < dupe warn count {dupe_warn_count}")
+			self.__trace(f"Bailing because unique channels {channel_count} < configured warn count {warn_count} "
+				f"and max dupes {max_duplicate_count} < configured dupe warn count {dupe_warn_count}")
 			return
 
 		# This person is a problem
 
+		self.__trace(f"Spam detected by {message.author.name}")
 		spam_lookup: AgeBoundDict[str, SpamContext, datetime, timedelta] = Storage.get_state_value(message.guild, self.STATE_KEY_SPAM_CONTEXT)
 		if spam_lookup is None:
 			spam_lookup = AgeBoundDict(
@@ -356,7 +358,7 @@ class CrossPostCog(BaseCog, name='Crosspost Detection'):
 				 f'({duplicate_count} identical). Banned by {by_who}.')
 
 	def __trace(self, message):
-		# print(message)
+		# print(f"CrossPostCog: {message}")
 		pass
 
 	@Cog.listener()