From 270d3028343191374b7b958a36d761daf9422f01 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Mon, 1 Sep 2014 22:14:56 +0100 Subject: [PATCH] =?UTF-8?q?Re=C3=ABnable=20presence=20visibility=20permiss?= =?UTF-8?q?ion=20checking=20now=20it's=20not=20used=20on=20redundant=20cod?= =?UTF-8?q?e=20paths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- synapse/handlers/presence.py | 4 ---- tests/handlers/test_presence.py | 2 -- 2 files changed, 6 deletions(-) diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index ff04be146..7372a10f9 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: diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 844c4e3fb..2eea47439 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -196,8 +196,6 @@ class PresenceStateTestCase(unittest.TestCase): SynapseError ) - test_get_disallowed_state.skip = "Presence permissions are disabled" - @defer.inlineCallbacks def test_set_my_state(self): mocked_set = self.datastore.set_presence_state