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

2015-01-27 15:58:27 +00:00 · 2015-01-27 15:58:27 +00:00 · 1d77969124
parent b481889117
commit 1d77969124
1 changed files with 14 additions and 12 deletions
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@ -51,10 +51,12 @@ class EventStreamHandler(BaseHandler):
        auth_user = self.hs.parse_userid(auth_user_id)

        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
                    if auth_user in self._stop_timer_per_user:
                        try:
+                            print "cancel",auth_user
                            self.clock.cancel_call_later(
                                self._stop_timer_per_user.pop(auth_user)
                            )