OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Move if statement

pull/582/head
Erik Johnston 2016-02-18 09:11:42 +00:00
parent 58371fa263
commit ddca9c56fc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/handlers/presence.py
View File

@ -298,10 +298,11 @@ class PresenceHandler(BaseHandler):
if not state: if not state:
continue continue
if self.hs.is_mine_id(user_id):
if state.state == PresenceState.OFFLINE: if state.state == PresenceState.OFFLINE:
# No timeouts are associated with offline states.
continue continue
if self.hs.is_mine_id(user_id):
if state.state == PresenceState.ONLINE: if state.state == PresenceState.ONLINE:
if now - state.last_active > IDLE_TIMER: if now - state.last_active > IDLE_TIMER:
# Currently online, but last activity ages ago so auto # Currently online, but last activity ages ago so auto
@ -331,7 +332,6 @@ class PresenceHandler(BaseHandler):
# This is to protect against forgetful/buggy servers, so that # This is to protect against forgetful/buggy servers, so that
# no one gets stuck online forever. # no one gets stuck online forever.
if now - state.last_federation_update > FEDERATION_TIMEOUT: if now - state.last_federation_update > FEDERATION_TIMEOUT:
if state.state != PresenceState.OFFLINE:
# The other side seems to have disappeared. # The other side seems to have disappeared.
changes[user_id] = state.copy_and_replace( changes[user_id] = state.copy_and_replace(
state=PresenceState.OFFLINE, state=PresenceState.OFFLINE,