MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-17 15:31:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2717 from matrix-org/erikj/createroom_content

Browse source 
Fix wrong avatars when inviting multiple users when creating room
This commit is contained in:
Erik Johnston 2017-12-07 20:00:34 +00:00 committed by GitHub
commit ba24576f2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
synapse/handlers/room.py
View file

@ -205,12 +205,12 @@ class RoomCreationHandler(BaseHandler):
}, },
ratelimit=False) ratelimit=False)
content = {}
is_direct = config.get("is_direct", None)
if is_direct:
content["is_direct"] = is_direct
for invitee in invite_list: for invitee in invite_list:
content = {}
is_direct = config.get("is_direct", None)
if is_direct:
content["is_direct"] = is_direct
yield room_member_handler.update_membership( yield room_member_handler.update_membership(
requester, requester,
UserID.from_string(invitee), UserID.from_string(invitee),

4
synapse/handlers/room_member.py
View file

@ -189,6 +189,10 @@ class RoomMemberHandler(BaseHandler):
content_specified = bool(content) content_specified = bool(content)
if content is None: if content is None:
content = {} content = {}
else:
# We do a copy here as we potentially change some keys
# later on.
content = dict(content)
effective_membership_state = action effective_membership_state = action
if action in ["kick", "unban"]: if action in ["kick", "unban"]: