Adding URL spam cog. Fixing joinraid cog.

cogs/basecog.py

@@ -2,6 +2,7 @@ from discord import Guild, Message, PartialEmoji, RawReactionActionEvent, TextCh
 from discord.ext import commands
 from datetime import timedelta
 
+from config import CONFIG
 from rscollections import AgeBoundDict
 from storage import ConfigKey, Storage
 import json

cogs/joinraidcog.py

@@ -162,35 +162,10 @@ class GuildContext:
 	"""
 	def __init__(self, guild_id: int):
 		self.guild_id = guild_id
-		self.join_warning_count = self.get_cog_default('warning_count')
-		self.join_warning_seconds = self.get_cog_default('warning_seconds')
 		# Non-persisted runtime state
 		self.current_raid = JoinRaidRecord()
 		self.all_raids = [ self.current_raid ] # periodically culled of old ones
 
-	# Events
-
-	async def handle_join(self, member: Member) -> None:
-		"""
-		Event handler for all joins to this guild.
-		"""
-		now = member.joined_at
-		raid = self.current_raid
-		raid.handle_join(
-			member,
-			now=now,
-			max_age_seconds = self.join_warning_seconds,
-			max_join_count = self.join_warning_count)
-		self.__trace(f'raid phase: {raid.phase}')
-		if raid.phase == RaidPhase.JUST_STARTED:
-			await self.__on_join_raid_begin(raid)
-		elif raid.phase == RaidPhase.CONTINUING:
-			await self.__on_join_raid_updated(raid)
-		elif raid.phase == RaidPhase.ENDED:
-			self.__start_new_raid(member)
-			await self.__on_join_raid_end(raid)
-		self.__cull_old_raids(now)
-
 	def reset_raid(self, now: datetime):
 		"""
 		Retires self.current_raid and creates a new empty one.
@@ -467,6 +442,9 @@ class JoinRaidCog(BaseCog):
 		if gc is not None:
 			return gc
 		gc = GuildContext(guild.id)
+		gc.join_warning_count = self.get_cog_default('warning_count')
+		gc.join_warning_seconds = self.get_cog_default('warning_seconds')
+
 		self.guild_id_to_context[guild.id] = gc
 		return gc
 

cogs/urlspamcog.py

@@ -0,0 +1,75 @@
+from discord import Guild, Message
+from discord.ext import commands
+import re
+from datetime import timedelta
+
+from cogs.basecog import BaseCog
+from config import CONFIG
+from storage import Storage
+
+class URLSpamCog(BaseCog):
+	CONFIG_KEY_EARLY_URL_TIMEOUT = "urlspam_early_url_timeout"
+	CONFIG_KEY_EARLY_URL_ACTION = "urlspam_early_url_action"
+
+	def __init__(self, bot):
+		super().__init__(bot)
+
+	def __early_url_timeout(self, guild: Guild) -> int:
+		return Storage.get_config_value(guild, self.CONFIG_KEY_EARLY_URL_TIMEOUT) or \
+			self.get_cog_default('early_url_timeout')
+
+	def __early_url_action(self, guild: Guild) -> str:
+		return Storage.get_config_value(guild, self.CONFIG_KEY_EARLY_URL_ACTION) or \
+			self.get_cog_default('early_url_action')
+
+	@commands.Cog.listener()
+	async def on_message(self, message: Message):
+		if message.guild is None or message.channel is None:
+			# DM or something
+			return
+		action = self.__early_url_action(message.guild)
+		if action == 'nothing':
+			return
+		if message.author.permissions_in(message.channel).ban_members:
+			# Mods are exempt
+			return
+		if not self.__contains_url(message.content):
+			return
+		join_age = message.created_at - message.author.joined_at
+		join_age_str = self.__format_timedelta(join_age)
+		if join_age.total_seconds() < self.__early_url_timeout(message.guild):
+			if action == 'modwarn':
+				await self.warn(message.guild, f'User {message.author.mention} ' +
+					f'posted a URL {join_age_str} after joining.\n\n> {message.content}')
+				# TODO: Emoji actions
+			elif action == 'delete':
+				await message.delete()
+				# TODO: Info to mods
+			elif action == 'kick':
+				await message.author.kick(reason=f'User posted a link {join_age_str} after joining')
+				# TODO: Info to mods
+			elif action == 'ban':
+				await message.author.ban(reason=f'User posted a link {join_age_str} after joining', delete_message_days=1)
+				# TODO: Info to mods
+
+	def __contains_url(self, text: str) -> bool:
+		p = re.compile(r'http[^\s]*')
+		return p.search(text) is not None
+
+	def __format_timedelta(self, timespan: timedelta) -> str:
+		parts = []
+		d = timespan.days
+		h = timespan.seconds // 3600
+		m = (timespan.seconds // 60) % 60
+		s = timespan.seconds % 60
+		if d > 0:
+			parts.append(f'{d}d')
+		if d > 0 or h > 0:
+			parts.append(f'{h}h')
+		if d > 0 or h > 0 or m > 0:
+			parts.append(f'{m}m')
+		parts.append(f'{s}s')
+		# Limit the precision to the two most significant elements
+		while len(parts) > 2:
+			parts.pop(-1)
+		return ' '.join(parts)

config.py.sample

@@ -22,5 +22,9 @@ CONFIG = {
 			'time_window_seconds': 120,
 			'min_message_length': 0,
 		},
+		'URLSpamCog': {
+			'early_url_timeout': 900,  # Should be > 10m due to Discord-imposed waiting period
+			'early_url_action': 'modwarn', # "nothing" | "modwarn" | "delete" | "kick" | "ban"
+		},
 	},
 }

rocketbot.py

@@ -13,6 +13,7 @@ from cogs.configcog import ConfigCog
 from cogs.crosspostcog import CrossPostCog
 from cogs.generalcog import GeneralCog
 from cogs.joinraidcog import JoinRaidCog
+# from cogs.urlspamcog import URLSpamCog
 
 CURRENT_CONFIG_VERSION = 1
 if (CONFIG.get('__config_version') or 0) < CURRENT_CONFIG_VERSION:
@@ -32,5 +33,6 @@ bot.add_cog(GeneralCog(bot))
 bot.add_cog(ConfigCog(bot))
 bot.add_cog(JoinRaidCog(bot))
 bot.add_cog(CrossPostCog(bot))
+# bot.add_cog(URLSpamCog(bot))
 bot.run(CONFIG['client_token'], bot=True, reconnect=True)
 print('\nBot aborted')