summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-01 22:14:56 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-01 22:15:02 +0100
commit270d3028343191374b7b958a36d761daf9422f01 (patch)
treeda0a19316300b3f519d9ca11bd24b224d02b63c7 /synapse/handlers
parentNo need to test is_presence_visible in _start_polling_local because we know i... (diff)
downloadsynapse-270d3028343191374b7b958a36d761daf9422f01.tar.xz
Reënable presence visibility permission checking now it's not used on redundant code paths
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index ff04be1460..7372a10f9b 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -150,10 +150,6 @@ class PresenceHandler(BaseHandler):
 
     @defer.inlineCallbacks
     def is_presence_visible(self, observer_user, observed_user):
-        defer.returnValue(True)
-        # return
-        # FIXME (erikj): This code path absolutely kills the database.
-
         assert(observed_user.is_mine)
 
         if observer_user == observed_user: