diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-03-06 17:28:49 +0000 |
commit | 34ce2ca62f261311a9082b6e243eb6c584487025 (patch) | |
tree | 0144c0f0a8231e2ea68e23c7d5676f48e42ee775 /synapse/push/httppusher.py | |
parent | Assign the AS ID from the database; replace old placeholder txn id. (diff) | |
parent | When setting display name more graciously handle failures to update room state. (diff) | |
download | synapse-34ce2ca62f261311a9082b6e243eb6c584487025.tar.xz |
Merge branch 'develop' into application-services-txn-reliability
Diffstat (limited to 'synapse/push/httppusher.py')
-rw-r--r-- | synapse/push/httppusher.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index 202fcb42f4..caca709f10 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -88,6 +88,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 if 'content' in event: d['notification']['content'] = event['content'] |