diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 17:34:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 17:34:51 +0000 |
| commit | eae0842bc17b8af75bcb599866a5df8670fac754 (patch) | |
| tree | a79e00280a48b6d56eae9c9ce6dee4448b4a119c /synapse/push/__init__.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff) | |
| parent | Log all the exits from _attempt_new_transaction (diff) | |
| download | synapse-eae0842bc17b8af75bcb599866a5df8670fac754.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/push/__init__.py')
| -rw-r--r-- | synapse/push/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 6f143a5df9..418a348a58 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -140,7 +140,7 @@ class Pusher(object): lambda x: ('[%s%s]' % (x.group(1) and '^' or '', re.sub(r'\\\-', '-', x.group(2)))), r) return r - + def _event_fulfills_condition(self, ev, condition, display_name, room_member_count): if condition['kind'] == 'event_match': if 'pattern' not in condition: @@ -170,8 +170,10 @@ class Pusher(object): return False if not display_name: return False - return re.search("\b%s\b" % re.escape(display_name), - ev['content']['body'], flags=re.IGNORECASE) is not None + return re.search( + "\b%s\b" % re.escape(display_name), ev['content']['body'], + flags=re.IGNORECASE + ) is not None elif condition['kind'] == 'room_member_count': if 'is' not in condition: |