From 0cf16b638e64fc40a567c90c0640071de166b4ae Mon Sep 17 00:00:00 2001
From: A5rocks <40616000+A5rocks@users.noreply.github.com>
Date: Thu, 7 Nov 2019 10:36:50 +0900
Subject: [PATCH] stop being dumb

---
 disco/bot/bot.py | 14 +++++++-------
 tests/bot/bot.py |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/disco/bot/bot.py b/disco/bot/bot.py
index 50e518d..3c868b2 100644
--- a/disco/bot/bot.py
+++ b/disco/bot/bot.py
@@ -350,13 +350,13 @@ 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):
-                    content = content[len(prefix):]
-                    break
-        elif not require_mention:
-            return []
+        for prefix in prefixes:
+            if prefix and content.startswith(prefix) and not require_mention:  # don't cut off commands with mentions.
+                content = content[len(prefix):]
+                break
+        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):
             return []
diff --git a/tests/bot/bot.py b/tests/bot/bot.py
index 784ab77..3a8d7cb 100644
--- a/tests/bot/bot.py
+++ b/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])