summary refs log tree commit diff
path: root/synapse/handlers/presence.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 19:40:29 +0100
commit67c5f89244b9ff5f1deca199f35ef7240d0549cc (patch)
tree04abccb8896322ecf086bdd18d290f3dbfc537a7 /synapse/handlers/presence.py
parentFix exceptions so that the event stream works. Presence like events are turne... (diff)
downloadsynapse-67c5f89244b9ff5f1deca199f35ef7240d0549cc.tar.xz
Enable presence again. Fix up api to match old api.
Diffstat (limited to 'synapse/handlers/presence.py')
-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 30d6269e2e..8408266da0 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?