summary refs log tree commit diff
path: root/synapse/push/__init__.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-02-03 16:51:07 +0000
committerDavid Baker <dave@matrix.org>2015-02-03 16:51:07 +0000
commitdc7bb70f22edf8ef0631c961f2c77a82de7c76d5 (patch)
tree74e89709d5a5cd9abe2c0fe91b8312b1c48a99ab /synapse/push/__init__.py
parentUse set_tweak instead of set_sound (diff)
downloadsynapse-dc7bb70f22edf8ef0631c961f2c77a82de7c76d5.tar.xz
s/instance_handle/profile_tag/
Diffstat (limited to 'synapse/push/__init__.py')
-rw-r--r--synapse/push/__init__.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py

index 00f3513c23..8c6f0a6571 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py
@@ -37,14 +37,14 @@ class Pusher(object): INEQUALITY_EXPR = re.compile("^([=<>]*)([0-9]*)$") - def __init__(self, _hs, instance_handle, user_name, app_id, + def __init__(self, _hs, profile_tag, user_name, app_id, app_display_name, device_display_name, pushkey, pushkey_ts, data, last_token, last_success, failing_since): self.hs = _hs self.evStreamHandler = self.hs.get_handlers().event_stream_handler self.store = self.hs.get_datastore() self.clock = self.hs.get_clock() - self.instance_handle = instance_handle + self.profile_tag = profile_tag self.user_name = user_name self.app_id = app_id self.app_display_name = app_display_name @@ -147,9 +147,9 @@ class Pusher(object): return False return fnmatch.fnmatch(val.upper(), pat.upper()) elif condition['kind'] == 'device': - if 'instance_handle' not in condition: + if 'profile_tag' not in condition: return True - return condition['instance_handle'] == self.instance_handle + return condition['profile_tag'] == self.profile_tag elif condition['kind'] == 'contains_display_name': # This is special because display names can be different # between rooms and so you can't really hard code it in a rule.