diff options
| author | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-19 18:17:23 +0000 |
| commit | afb7b377f23b275bf0274d6cbbfae462362cfc8c (patch) | |
| tree | 212e275af6f3d52dba6e4367553ea649d9965d33 /synapse/push/httppusher.py | |
| parent | Use the unread notification count to send accurate badge counts in push notif... (diff) | |
| parent | Merge pull request #505 from matrix-org/erikj/push_fast (diff) | |
| download | synapse-afb7b377f23b275bf0274d6cbbfae462362cfc8c.tar.xz | |
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'synapse/push/httppusher.py')
| -rw-r--r-- | synapse/push/httppusher.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index acb687d114..cdc4494928 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -23,13 +23,13 @@ logger = logging.getLogger(__name__) class HttpPusher(Pusher): - def __init__(self, _hs, profile_tag, user_name, app_id, + def __init__(self, _hs, profile_tag, user_id, app_id, app_display_name, device_display_name, pushkey, pushkey_ts, data, last_token, last_success, failing_since): super(HttpPusher, self).__init__( _hs, profile_tag, - user_name, + user_id, app_id, app_display_name, device_display_name, @@ -87,7 +87,7 @@ class HttpPusher(Pusher): } if event['type'] == 'm.room.member': d['notification']['membership'] = event['content']['membership'] - d['notification']['user_is_target'] = event['state_key'] == self.user_name + d['notification']['user_is_target'] = event['state_key'] == self.user_id if 'content' in event: d['notification']['content'] = event['content'] @@ -117,7 +117,7 @@ class HttpPusher(Pusher): @defer.inlineCallbacks def send_badge(self, badge): - logger.info("Sending updated badge count %d to %r", badge, self.user_name) + logger.info("Sending updated badge count %d to %r", badge, self.user_id) d = { 'notification': { 'id': '', |