Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-01 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Handle rejections of invites from local users locally

Browse source 
Slightly hacky fix to SYN-642, which avoids the federation codepath when trying
to reject invites from local users.
This commit is contained in:
Richard van der Hoff 2016-03-01 17:27:22 +00:00
parent bfdcc7b9b6
commit 8a1d3b86af
2 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
synapse/handlers/room.py
View file

@ -521,8 +521,24 @@ class RoomMemberHandler(BaseHandler):
action = "remote_join"
elif event.membership == Membership.LEAVE:
is_host_in_room = self.is_host_in_room(context.current_state)
if not is_host_in_room:
action = "remote_reject"
# perhaps we've been invited
inviter = self.get_inviter(target_user.to_string(), context.current_state)
if not inviter:
raise SynapseError(404, "Not a known room")
if inviter.domain == self.server_name:
# the inviter was on our server, but has now left. Carry on
# with the normal rejection codepath.
#
# This is a bit of a hack, because the room might still be
# active on other servers.
pass
else:
# send the rejection to the inviter's HS.
remote_room_hosts = [inviter.domain]
action = "remote_reject"
federation_handler = self.hs.get_handlers().federation_handler
@ -541,11 +557,8 @@ class RoomMemberHandler(BaseHandler):
event.content,
)
elif action == "remote_reject":
inviter = self.get_inviter(target_user.to_string(), context.current_state)
if not inviter:
raise SynapseError(404, "No known servers")
yield federation_handler.do_remotely_reject_invite(
[inviter.domain],
remote_room_hosts,
room_id,
event.user_id
)