Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-27 05:50:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #997 from Half-Shot/develop

Browse source 
Don't change status_msg on /sync
This commit is contained in:
Erik Johnston 2016-08-11 14:10:55 +01:00 • committed by GitHub
commit 832799dbff
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
synapse/handlers/presence.py
View file

@ -672,7 +672,7 @@ class PresenceHandler(object):
])
@defer.inlineCallbacks
def set_state(self, target_user, state):
def set_state(self, target_user, state, ignore_status_msg=False):
"""Set the presence state of the user.
"""
status_msg = state.get("status_msg", None)
@ -689,10 +689,13 @@ class PresenceHandler(object):
prev_state = yield self.current_state_for_user(user_id)
new_fields = {
"state": presence,
"status_msg": status_msg if presence != PresenceState.OFFLINE else None
"state": presence
}
if not ignore_status_msg:
msg = status_msg if presence != PresenceState.OFFLINE else None
new_fields["status_msg"] = msg
if presence == PresenceState.ONLINE:
new_fields["last_active_ts"] = self.clock.time_msec()