diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 09:26:33 +0100 |
| commit | 47c3a089c5c3016197964f16f611f72bc4aadde6 (patch) | |
| tree | f0a4d1a660e4ae2a58077ad1c250353781445cff /synapse/handlers/presence.py | |
| parent | Removed member list servlet: now using generic state paths. (diff) | |
| parent | Order 'get_recent_events_for_room' correctly. (diff) | |
| download | synapse-47c3a089c5c3016197964f16f611f72bc4aadde6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 540e114b82..c88cc18788 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -142,6 +142,10 @@ 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: @@ -187,6 +191,10 @@ class PresenceHandler(BaseHandler): @defer.inlineCallbacks def set_state(self, target_user, auth_user, state): + return + # TODO (erikj): Turn this back on. Why did we end up sending EDUs + # everywhere? + if not target_user.is_mine: raise SynapseError(400, "User is not hosted on this Home Server") |