Просмотр исходного кода

Adding message links to some log messages that were missing them

tags/2.0.0
Rocketsoup 2 месяцев назад
Родитель
Сommit
e32099a3d0
4 измененных файлов: 9 добавлений и 8 удалений
  1. 5
    2
      rocketbot/cogs/crosspostcog.py
  2. 0
    2
      rocketbot/cogs/logcog.py
  3. 2
    2
      rocketbot/cogs/patterncog.py
  4. 2
    2
      rocketbot/cogs/urlspamcog.py

+ 5
- 2
rocketbot/cogs/crosspostcog.py Просмотреть файл

190
 			await message.set_reactions([])
190
 			await message.set_reactions([])
191
 			await message.set_text(text)
191
 			await message.set_text(text)
192
 		else:
192
 		else:
193
-			await message.set_text(f'User {context.member.mention} posted ' +
194
-				f'the same message in {channel_count} channels.')
193
+			body: str = f'User {context.member.mention} posted ' + \
194
+				f'the same message in {channel_count} channels.'
195
+			for msg in context.spam_messages:
196
+				body += f'\n- {msg.jump_url}'
197
+			await message.set_text(body)
195
 			await message.set_reactions(BotMessageReaction.standard_set(
198
 			await message.set_reactions(BotMessageReaction.standard_set(
196
 				did_delete = deleted_count >= spam_count,
199
 				did_delete = deleted_count >= spam_count,
197
 				message_count = spam_count,
200
 				message_count = spam_count,

+ 0
- 2
rocketbot/cogs/logcog.py Просмотреть файл

740
 		markdown_b = ''
740
 		markdown_b = ''
741
 		a_open = False
741
 		a_open = False
742
 		b_open = False
742
 		b_open = False
743
-		# FIXME: Handle URLs better. They get mangled.
744
-		# URL regex: http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+
745
 		for i, s in enumerate(difflib.ndiff(a, b)):
743
 		for i, s in enumerate(difflib.ndiff(a, b)):
746
 			operation = s[0]
744
 			operation = s[0]
747
 			content = s[2:]
745
 			content = s[2:]

+ 2
- 2
rocketbot/cogs/patterncog.py Просмотреть файл

153
 			bm = BotMessage(
153
 			bm = BotMessage(
154
 				message.guild,
154
 				message.guild,
155
 				f'User {message.author.name} tripped custom pattern ' + \
155
 				f'User {message.author.name} tripped custom pattern ' + \
156
-					f'`{statement.name}`.\n\nAutomatic actions taken:\n• ' + \
157
-					('\n• '.join(action_descriptions)),
156
+					f'`{statement.name}` at {message.jump_url}.\n\n' + \
157
+					'Automatic actions taken:\n• ' + ('\n• '.join(action_descriptions)),
158
 				type=message_type,
158
 				type=message_type,
159
 				context=context)
159
 				context=context)
160
 			self.record_warning(message.author)
160
 			self.record_warning(message.author)

+ 2
- 2
rocketbot/cogs/urlspamcog.py Просмотреть файл

129
 			bm = BotMessage(
129
 			bm = BotMessage(
130
 					message.guild,
130
 					message.guild,
131
 					f'User {message.author.mention} posted a URL ' + \
131
 					f'User {message.author.mention} posted a URL ' + \
132
-					f'{join_age_str} after joining.',
132
+					f'{join_age_str} after joining: {message.jump_url}',
133
 					type = BotMessage.TYPE_MOD_WARNING if needs_attention else BotMessage.TYPE_INFO,
133
 					type = BotMessage.TYPE_MOD_WARNING if needs_attention else BotMessage.TYPE_INFO,
134
 					context = context)
134
 					context = context)
135
 			bm.quote = discordutils.remove_markdown(message.clean_content)
135
 			bm.quote = discordutils.remove_markdown(message.clean_content)
152
 
152
 
153
 		if not self.contains_deceptive_links(message.content):
153
 		if not self.contains_deceptive_links(message.content):
154
 			return
154
 			return
155
-		mod_text = f'User {message.author.name} ({message.author.id}) posted a deceptive link.'
155
+		mod_text = f'User {message.author.name} ({message.author.id}) posted a deceptive link. {message.jump_url}'
156
 		quoted = '> ' + escape_markdown(message.content).replace('\n', '\n> ')
156
 		quoted = '> ' + escape_markdown(message.content).replace('\n', '\n> ')
157
 		mod_text += f'\n\n{quoted}'
157
 		mod_text += f'\n\n{quoted}'
158
 		self.log(message.guild, f'{message.author.name} posted deceptive link - action: {action}')
158
 		self.log(message.guild, f'{message.author.name} posted deceptive link - action: {action}')

Загрузка…
Отмена
Сохранить