diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py
index faa7919fbb..348adb9c0d 100644
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@@ -112,7 +112,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
if device:
conditions.append({
'kind': 'device',
- 'instance_handle': device
+ 'profile_tag': device
})
if 'actions' not in req_obj:
@@ -195,7 +195,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
for r in rules:
conditions = json.loads(r['conditions'])
- ih = _instance_handle_from_conditions(conditions)
+ ih = _profile_tag_from_conditions(conditions)
if ih == spec['device'] and r['priority_class'] == priority_class:
yield self.hs.get_datastore().delete_push_rule(
user.to_string(), spec['rule_id']
@@ -239,19 +239,19 @@ class PushRuleRestServlet(ClientV1RestServlet):
if r['priority_class'] > PushRuleRestServlet.PRIORITY_CLASS_MAP['override']:
# per-device rule
- instance_handle = _instance_handle_from_conditions(r["conditions"])
+ profile_tag = _profile_tag_from_conditions(r["conditions"])
r = _strip_device_condition(r)
- if not instance_handle:
+ if not profile_tag:
continue
- if instance_handle not in rules['device']:
- rules['device'][instance_handle] = {}
- rules['device'][instance_handle] = (
+ if profile_tag not in rules['device']:
+ rules['device'][profile_tag] = {}
+ rules['device'][profile_tag] = (
_add_empty_priority_class_arrays(
- rules['device'][instance_handle]
+ rules['device'][profile_tag]
)
)
- rulearray = rules['device'][instance_handle][template_name]
+ rulearray = rules['device'][profile_tag][template_name]
else:
rulearray = rules['global'][template_name]
@@ -282,13 +282,13 @@ class PushRuleRestServlet(ClientV1RestServlet):
if path[0] == '':
defer.returnValue((200, rules['device']))
- instance_handle = path[0]
+ profile_tag = path[0]
path = path[1:]
- if instance_handle not in rules['device']:
+ if profile_tag not in rules['device']:
ret = {}
ret = _add_empty_priority_class_arrays(ret)
defer.returnValue((200, ret))
- ruleset = rules['device'][instance_handle]
+ ruleset = rules['device'][profile_tag]
result = _filter_ruleset_with_path(ruleset, path)
defer.returnValue((200, result))
else:
@@ -304,14 +304,14 @@ def _add_empty_priority_class_arrays(d):
return d
-def _instance_handle_from_conditions(conditions):
+def _profile_tag_from_conditions(conditions):
"""
Given a list of conditions, return the instance handle of the
device rule if there is one
"""
for c in conditions:
if c['kind'] == 'device':
- return c['instance_handle']
+ return c['profile_tag']
return None
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py
index 353a4a6589..e10d2576d2 100644
--- a/synapse/rest/client/v1/pusher.py
+++ b/synapse/rest/client/v1/pusher.py
@@ -41,7 +41,7 @@ class PusherRestServlet(ClientV1RestServlet):
)
defer.returnValue((200, {}))
- reqd = ['instance_handle', 'kind', 'app_id', 'app_display_name',
+ reqd = ['profile_tag', 'kind', 'app_id', 'app_display_name',
'device_display_name', 'pushkey', 'lang', 'data']
missing = []
for i in reqd:
@@ -54,7 +54,7 @@ class PusherRestServlet(ClientV1RestServlet):
try:
yield pusher_pool.add_pusher(
user_name=user.to_string(),
- instance_handle=content['instance_handle'],
+ profile_tag=content['profile_tag'],
kind=content['kind'],
app_id=content['app_id'],
app_display_name=content['app_display_name'],
|
