diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-01-13 13:08:59 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-01-13 13:32:59 +0000 |
commit | 9c1f853d58440d1f924fa55bc242b248c410dd7c (patch) | |
tree | 0d4ed6019a7208e1e7c35015f5a33b7d0af89af8 /synapse/push/httppusher.py | |
parent | Merge pull request #482 from matrix-org/markjh/table_name (diff) | |
download | synapse-9c1f853d58440d1f924fa55bc242b248c410dd7c.tar.xz |
Rename 'user_name' to 'user_id' in push to make it consistent with the rest of the code
Diffstat (limited to '')
-rw-r--r-- | synapse/push/httppusher.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 7866db6a24..28f1fab0e4 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'] |