summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 16:09:48 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 16:09:48 +0100
commit7917ff1271b12aa2e7b11f714d63e8288d4fe733 (patch)
tree002344dcd2dbf4bfd2975f1581475266d5a5d718
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
downloadsynapse-7917ff1271b12aa2e7b11f714d63e8288d4fe733.tar.xz
Turn off presence again.
-rw-r--r--synapse/handlers/presence.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 9a690258de..c479908f61 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -142,7 +142,7 @@ class PresenceHandler(BaseHandler):
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
         defer.returnValue(True)
-        #return
+        return
         # FIXME (erikj): This code path absolutely kills the database.
 
         assert(observed_user.is_mine)
@@ -189,7 +189,7 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def set_state(self, target_user, auth_user, state):
-        # return
+        return
         # TODO (erikj): Turn this back on. Why did we end up sending EDUs
         # everywhere?