mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-16 09:52:08 +00:00
Merge pull request #2717 from matrix-org/erikj/createroom_content
Fix wrong avatars when inviting multiple users when creating room
This commit is contained in:
commit
ba24576f2f
@ -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),
|
||||||
|
@ -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"]:
|
||||||
|
Loading…
Reference in New Issue
Block a user