mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-27 12:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Unbreak bad presence merge - don't add these blocks together with an and: they're different things.

Browse source
This commit is contained in:
David Baker 2015-01-27 15:58:27 +00:00
parent b481889117
commit 1d77969124
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/handlers/events.py
View file

@ -51,10 +51,12 @@ class EventStreamHandler(BaseHandler):
auth_user = self.hs.parse_userid(auth_user_id) auth_user = self.hs.parse_userid(auth_user_id)
try: try:
if affect_presence and auth_user not in self._streams_per_user: if affect_presence:
if auth_user not in self._streams_per_user:
self._streams_per_user[auth_user] = 0 self._streams_per_user[auth_user] = 0
if auth_user in self._stop_timer_per_user: if auth_user in self._stop_timer_per_user:
try: try:
print "cancel",auth_user
self.clock.cancel_call_later( self.clock.cancel_call_later(
self._stop_timer_per_user.pop(auth_user) self._stop_timer_per_user.pop(auth_user)
) )