diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-02-18 16:05:13 +0000 |
---|---|---|
committer | review.rocks <nobody@review.rocks> | 2016-02-18 16:05:13 +0000 |
commit | b9977ea667889f6cf89464c92fc57cbcae7cca28 (patch) | |
tree | 5abc257a763ac3a0a180b24e874b1ca9c4bd3edc /synapse/push/__init__.py | |
parent | Merge pull request #583 from matrix-org/daniel/roomcleanupincremental (diff) | |
download | synapse-b9977ea667889f6cf89464c92fc57cbcae7cca28.tar.xz |
Remove dead code for setting device specific rules.
It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code.
Diffstat (limited to 'synapse/push/__init__.py')
-rw-r--r-- | synapse/push/__init__.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 8da2d8716c..4c6c3b83a2 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -47,14 +47,13 @@ class Pusher(object): MAX_BACKOFF = 60 * 60 * 1000 GIVE_UP_AFTER = 24 * 60 * 60 * 1000 - def __init__(self, _hs, profile_tag, user_id, app_id, + def __init__(self, _hs, user_id, 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.profile_tag = profile_tag self.user_id = user_id self.app_id = app_id self.app_display_name = app_display_name @@ -186,8 +185,8 @@ class Pusher(object): processed = False rule_evaluator = yield \ - push_rule_evaluator.evaluator_for_user_id_and_profile_tag( - self.user_id, self.profile_tag, single_event['room_id'], self.store + push_rule_evaluator.evaluator_for_user_id( + self.user_id, single_event['room_id'], self.store ) actions = yield rule_evaluator.actions_for_event(single_event) |