aichaos#37 Fix unicode handling

hungtu · hungtu · commit ec133c2f83c0 · 2017-09-21T17:34:31.000+02:00
diff --git a/rivescript/brain.py b/rivescript/brain.py
@@ -501,7 +501,10 @@ 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.lower() + r'$')
+        if self.utf8:
+            return re.compile(r'^' + regexp.lower() + r'$', re.UNICODE)
+        else:
+            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.
diff --git a/tests/test_unicode.py b/tests/test_unicode.py
@@ -82,3 +82,19 @@ def test_unicode_punctuation(self):
         self.rs.unicode_punctuation = re.compile(r'xxx')
         self.reply("Hello bot", "Hello human!")
         self.reply("Hello, bot!", RS_ERR_MATCH)
+
+    def test_unicode_with_optionals(self):
+        templates = ["({})", "[{}]", "[*] ({}) [*]",  "[*] [{}] [*]"]  # Test both alternatives and optionals
+        trigger_text = "&uuml;berrasch mich|empfiehl mir was|empfehl mir was|was gibts neues f&uuml;r mich|empfehlung"
+
+        for template in templates:
+            test_template = template.format(trigger_text)
+            self.new("""
+                + {}
+                - recommendation
+            """.format(test_template), utf8=True)
+
+            self.reply("&uuml;berrasch mich", "recommendation")
+            self.reply("&uuml;berrasch", '[ERR: No Reply Matched]')
+            self.reply("empfiehl mir was", "recommendation")
+            self.reply("was gibts neues f&uuml;r mich", "recommendation")
