Bang commands ignore suffixes after the command name to allow tagging users or other commentary

rocketbot/cogs/bangcommandcog.py

@@ -238,9 +238,9 @@ class BangCommandCog(BaseCog, name='Bang Commands'):
 		if message.guild is None or message.channel is None or not isinstance(message.channel, TextChannel):
 			return
 		content = message.content
-		if content is None or not content.startswith('!') or not BangCommandCog._is_valid_name(content):
+		name = BangCommandCog._name_from_command_message(content)
+		if name is None:
 			return
-		name = BangCommandCog._normalize_name(content)
 		cmd = self.get_saved_command(message.guild, name)
 		if cmd is None:
 			return
@@ -261,9 +261,14 @@ class BangCommandCog(BaseCog, name='Bang Commands'):
 
 	@staticmethod
 	def _is_valid_name(name: Optional[str]) -> bool:
+		return name is not None and re.match(r'^!?([a-z]+)([_-][a-z]+)*$', name) is not None
+
+	@staticmethod
+	def _name_from_command_message(name: Optional[str]) -> Optional[str]:
 		if name is None:
-			return False
-		return re.match(r'^!?([a-z]+)([_-][a-z]+)*$', name) is not None
+			return None
+		match = re.match(r'^!?((?:[a-z]+)(?:[_-][a-z]+)*)\b.*$', name)
+		return BangCommandCog._normalize_name(match.group(1)) if match else None
 
 class _EditModal(Modal, title='Edit Command'):
 	name_label = Label(