Преглед изворни кода

Fix to bang commands not requiring bang. Logging tweak.

main
Rocketsoup пре 1 месец
родитељ
комит
b7bb4ea7b2
2 измењених фајлова са 4 додато и 3 уклоњено
  1. 1
    1
      rocketbot/cogs/bangcommandcog.py
  2. 3
    2
      rocketbot/cogs/crosspostcog.py

+ 1
- 1
rocketbot/cogs/bangcommandcog.py Прегледај датотеку

267
 	def _name_from_command_message(name: Optional[str]) -> Optional[str]:
267
 	def _name_from_command_message(name: Optional[str]) -> Optional[str]:
268
 		if name is None:
268
 		if name is None:
269
 			return None
269
 			return None
270
-		match = re.match(r'^!?((?:[a-z]+)(?:[_-][a-z]+)*)\b.*$', name)
270
+		match = re.match(r'^!((?:[a-z]+)(?:[_-][a-z]+)*)\b.*$', name)
271
 		return BangCommandCog._normalize_name(match.group(1)) if match else None
271
 		return BangCommandCog._normalize_name(match.group(1)) if match else None
272
 
272
 
273
 class _EditModal(Modal, title='Edit Command'):
273
 class _EditModal(Modal, title='Edit Command'):

+ 3
- 2
rocketbot/cogs/crosspostcog.py Прегледај датотеку

261
 			message.quote = discordutils.remove_markdown(first_spam_message.clean_content)
261
 			message.quote = discordutils.remove_markdown(first_spam_message.clean_content)
262
 			self.record_warning(context.member)
262
 			self.record_warning(context.member)
263
 		if context.is_autobanned:
263
 		if context.is_autobanned:
264
-			text = f'User {context.member.mention} auto banned for ' + \
264
+			body = f'User {context.member.mention} auto banned for ' + \
265
 				f'posting messages in {channel_count} channels within {max_age_str} ' + \
265
 				f'posting messages in {channel_count} channels within {max_age_str} ' + \
266
 				f'({duplicate_count} identical). Messages from past 24 hours deleted.'
266
 				f'({duplicate_count} identical). Messages from past 24 hours deleted.'
267
+			body += f"\n\nFirst message:\n```\n{first_spam_message.content}\n```"
267
 			await message.set_reactions([])
268
 			await message.set_reactions([])
268
-			await message.set_text(text)
269
+			await message.set_text(body)
269
 		else:
270
 		else:
270
 			body: str = f'User {context.member.mention} posted '
271
 			body: str = f'User {context.member.mention} posted '
271
 			if duplicate_count == channel_count:
272
 			if duplicate_count == channel_count:

Loading…
Откажи
Сачувај