Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Need to use re.search if looking for matches not at the start of the string. Also comparisons with None should be 'is'.

This commit is contained in:
David Baker 2015-02-09 17:01:40 +00:00
parent 0b725f5c4f
commit 8f616684a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/push/__init__.py
View File

@ -154,7 +154,7 @@ class Pusher(object):
val = _value_for_dotted_key(condition['key'], ev) val = _value_for_dotted_key(condition['key'], ev)
if val is None: if val is None:
return False return False
return re.match(r, val, flags=re.IGNORECASE) != None return re.search(r, val, flags=re.IGNORECASE) is not None
elif condition['kind'] == 'device': elif condition['kind'] == 'device':
if 'profile_tag' not in condition: if 'profile_tag' not in condition:
@ -170,8 +170,8 @@ class Pusher(object):
return False return False
if not display_name: if not display_name:
return False return False
return re.match("\b%s\b" % re.escape(display_name), return re.search("\b%s\b" % re.escape(display_name),
ev['content']['body'], flags=re.IGNORECASE) != None ev['content']['body'], flags=re.IGNORECASE) is not None
elif condition['kind'] == 'room_member_count': elif condition['kind'] == 'room_member_count':
if 'is' not in condition: if 'is' not in condition: