Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-31 16:38:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reuse update_membership from /join

Browse source
This commit is contained in:
Daniel Wagner-Hall 2016-02-15 16:16:03 +00:00
parent 73e616df2a
commit 150fcde0dc
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
synapse/rest/client/v1/room.py
View file

@ -242,23 +242,12 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
room_identifier,
))
msg_handler = self.handlers.message_handler
content = {"membership": Membership.JOIN}
if requester.is_guest:
content["kind"] = "guest"
yield msg_handler.create_and_send_event(
{
"type": EventTypes.Member,
"content": content,
"room_id": room_id,
"sender": requester.user.to_string(),
"state_key": requester.user.to_string(),
"membership": Membership.JOIN, # For backwards compatibility
},
token_id=requester.access_token_id,
yield self.handlers.room_member_handler.update_membership(
requester=requester,
target=requester.user,
room_id=room_id,
action="join",
txn_id=txn_id,
is_guest=requester.is_guest,
room_hosts=room_hosts,
)