diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 15:16:38 +0000 |
| commit | 1bd540ef7943c08e350ba24c407f152016fa6064 (patch) | |
| tree | 47f2f0cbc07a943fbdd8d154b6d88ace246e4787 /synapse/rest/client/v1/push_rule.py | |
| parent | Merge branch 'replication_split' of github.com:matrix-org/synapse into reject... (diff) | |
| parent | Merge pull request #42 from matrix-org/replication_split (diff) | |
| download | synapse-1bd540ef7943c08e350ba24c407f152016fa6064.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/schema/im.sql
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
| -rw-r--r-- | synapse/rest/client/v1/push_rule.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py index 0f78fa667c..61e3bc8236 100644 --- a/synapse/rest/client/v1/push_rule.py +++ b/synapse/rest/client/v1/push_rule.py @@ -98,10 +98,7 @@ class PushRuleRestServlet(ClientV1RestServlet): if 'pattern' not in req_obj: raise InvalidRuleException("Content rule missing 'pattern'") pat = req_obj['pattern'] - if pat.strip("*?[]") == pat: - # no special glob characters so we assume the user means - # 'contains this string' rather than 'is this string' - pat = "*%s*" % (pat,) + conditions = [{ 'kind': 'event_match', 'key': 'content.body', |