Fix casing problems in %Previous and @reDIrect

kirsle · kirsle · commit 5c5157455ff9 · 2017-02-10T10:41:57.000-08:00
The `reply_regexp()` function now lowercases the result so that any tags like `<bot>` get properly lowercased (fixes aichaos#80 WRT %Previous) Also implements a fix from the Go version where redirects weren't getting lowercased before being followed, which caused similar matching issues.
diff --git a/rivescript/brain.py b/rivescript/brain.py
@@ -228,7 +228,7 @@ def _getreply(self, user, msg, context='normal', step=0, ignore_object_errors=Tr
                     for trig in self.master._sorted["thats"][top]:
                         pattern = trig[1]["previous"]
                         botside = self.reply_regexp(user, pattern)
-                        self.say("Try to match lastReply (" + lastReply + ") to " + pattern)
+                        self.say("Try to match lastReply ({}) to {} ({})".format(lastReply, pattern, repr(botside)))
 
                         # Match??
                         match = re.match(botside, lastReply)
@@ -307,6 +307,7 @@ def _getreply(self, user, msg, context='normal', step=0, ignore_object_errors=Tr
                     self.say("Redirecting us to " + matched["redirect"])
                     redirect = self.process_tags(user, msg, matched["redirect"], stars, thatstars, step,
                                                   ignore_object_errors)
+                    redirect = redirect.lower()
                     self.say("Pretend user said: " + redirect)
                     reply = self._getreply(user, redirect, step=(step + 1), ignore_object_errors=ignore_object_errors)
                     break
@@ -500,7 +501,7 @@ def reply_regexp(self, user, regexp):
                                         self.format_message(history[type][0]))
                 # TODO: the Perl version doesn't do just <input>/<reply> in trigs!
 
-        return re.compile(r'^' + regexp + r'$')
+        return re.compile(r'^' + regexp.lower() + r'$')
 
     def do_expand_array(self, array_name, depth=0):
         """Do recurrent array expansion, returning a set of keywords.
