From f5189b95e345e2155788b9bb1408d79c1be583b7 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 15 Aug 2018 16:15:06 +0100 Subject: [PATCH] remove incorrectly reintroduced method --- synapse/handlers/message.py | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 88f1161683c6..e5dc267cb715 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -82,31 +82,6 @@ def get_room_data(self, user_id=None, room_id=None, defer.returnValue(data) - @defer.inlineCallbacks - def _check_in_room_or_world_readable(self, room_id, user_id): - try: - # check_user_was_in_room will return the most recent membership - # event for the user if: - # * The user is a non-guest user, and was ever in the room - # * The user is a guest user, and has joined the room - # else it will throw. - member_event = yield self.auth.check_user_was_in_room(room_id, user_id) - defer.returnValue((member_event.membership, member_event.event_id)) - return - except AuthError: - visibility = yield self.state_handler.get_current_state( - room_id, EventTypes.RoomHistoryVisibility, "" - ) - if ( - visibility and - visibility.content["history_visibility"] == "world_readable" - ): - defer.returnValue((Membership.JOIN, None)) - return - raise AuthError( - 403, "Guest access not allowed", errcode=Codes.GUEST_ACCESS_FORBIDDEN - ) - @defer.inlineCallbacks def get_state_events( self, user_id, room_id, types=None, filtered_types=None,