stop being dumb

disco/bot/bot.py

@@ -350,12 +350,12 @@ class Bot(LoggingClass):
         # This may lead to unexpected results, but said unexpectedness
         # should be easy to avoid. An example of the unexpected results
         # that may occur would be if one prefix was `!` and one was `!a`.
-        if any([content.startswith(prefix) for prefix in prefixes]) and not require_mention:
         for prefix in prefixes:
-                if prefix and content.startswith(prefix):
+            if prefix and content.startswith(prefix) and not require_mention:  # don't cut off commands with mentions.
                 content = content[len(prefix):]
                 break
-        elif not require_mention:
+        else:
+            if not require_mention:  # don't want to prematurely return
                 return []
 
         if not self.command_matches_re or not self.command_matches_re.match(content):

tests/bot/bot.py

@@ -99,5 +99,5 @@ class TestBot(TestCase):
         self.assertEqual(commands[1][0], self.bot._commands[0])
 
         msg.content = '?test'
-        commands = list(self.bot.get_commands_for_message(False, None, ['!', '?', ';'], msg, ['?', ';']))
+        commands = list(self.bot.get_commands_for_message(False, None, ['!', '?', ';'], msg))
         self.assertEqual(commands[0][0], self.bot._commands[0])