summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-23 10:40:11 +0000
committerErik Johnston <erik@matrix.org>2016-02-23 10:40:11 +0000
commit138c405974cf4c460d33a8a1ac0c88051d44467f (patch)
treec6703d9edb4c9085aa2680eddf4548819ebf3a83 /synapse/handlers
parentMerge pull request #597 from Rugvip/account-data-sync (diff)
downloadsynapse-138c405974cf4c460d33a8a1ac0c88051d44467f.tar.xz
Pick up currently_active across federation
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index aed640450f..acf400e324 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -522,6 +522,7 @@ class PresenceHandler(BaseHandler):
                 new_fields["last_active_ts"] = now - last_active_ago
 
             new_fields["status_msg"] = push.get("status_msg", None)
+            new_fields["currently_active"] = push.get("currently_active", False)
 
             prev_state = yield self.current_state_for_user(user_id)
             updates.append(prev_state.copy_and_replace(**new_fields))