update version to 1.7.14

fix exact filter problem

Author: baleadmin

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 [![Build Status](https://avatars1.githubusercontent.com/u/35299314?s=200&v=4)](https://github.com/balemessenger)
 
-## [1.7.13] - 2019-02-26
+## [1.7.14] - 2019-03-02
 ### Added
 - exact_keywords argument to text_filter and template_response_filter
 - termination signal handling

balebot/__version__.py

@@ -2,7 +2,7 @@
 __title__ = 'balebot'
 __description__ = 'Python framework for Bale messenger Bot API'
 __url__ = 'https://github.com/balemessenger/bale-bot-python'
-__version__ = '1.7.13'
+__version__ = '1.7.14'
 __author__ = 'bale'
 __author_email__ = '[email protected]'
 __license__ = 'Apache 2.0'

balebot/filters/template_response_filter.py

@@ -14,7 +14,7 @@ def __init__(self, keywords=None, exact_keywords=None, pattern=None, validator=N
             self.keywords.append(keywords)
         if isinstance(exact_keywords, list):
             self.exact_keywords += exact_keywords
-        elif isinstance(keywords, str):
+        elif isinstance(exact_keywords, str):
             self.exact_keywords.append(exact_keywords)
 
         self.pattern = pattern
@@ -26,9 +26,9 @@ def match(self, message):
             text = message.text
             if not self.include_commands and text.startswith("/"):
                 return False
-            if not self.pattern and not self.keywords and not self.validator:
+            if not self.pattern and not self.keywords and not self.validator and not self.exact_keywords:
                 return True
-            if self.find_keywords(text):
+            elif self.find_keywords(text):
                 return True
             elif self.find_exact_keywords(text):
                 return True
@@ -47,8 +47,8 @@ def find_keywords(self, text):
         return False
 
     def find_exact_keywords(self, text):
-        for keyword in self.exact_keywords:
-            if keyword == text:
+        for exact_keyword in self.exact_keywords:
+            if exact_keyword == text:
                 return True
         return False
 

balebot/filters/text_filter.py

@@ -14,7 +14,7 @@ def __init__(self, keywords=None, exact_keywords=None, pattern=None, validator=N
             self.keywords.append(keywords)
         if isinstance(exact_keywords, list):
             self.exact_keywords += exact_keywords
-        elif isinstance(keywords, str):
+        elif isinstance(exact_keywords, str):
             self.exact_keywords.append(exact_keywords)
 
         self.pattern = pattern
@@ -26,9 +26,9 @@ def match(self, message):
             text = message.text
             if not self.include_commands and text.startswith("/"):
                 return False
-            if not self.pattern and not self.keywords and not self.validator:
+            if not self.pattern and not self.keywords and not self.validator and not self.exact_keywords:
                 return True
-            if self.find_keywords(text):
+            elif self.find_keywords(text):
                 return True
             elif self.find_exact_keywords(text):
                 return True
@@ -40,8 +40,8 @@ def match(self, message):
             return False
 
     def find_keywords(self, text):
-        for keyword in self.keywords:
-            if keyword == text:
+        for exact_keyword in self.keywords:
+            if exact_keyword == text:
                 return True
         return False