mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-08-30 19:01:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6516 from matrix-org/t3chguy/fix/18301

Browse Source
This commit is contained in:
Michael Telatynski 2021-07-30 15:31:17 +01:00 committed by GitHub
commit 21bb8e00ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/createRoom.ts
View File

@ -184,7 +184,8 @@ export default async function createRoom(opts: IOpts): Promise<string | null> {
} }
} }
if (opts.joinRule !== JoinRule.Restricted) { // we handle the restricted join rule in the parentSpace handling block above
if (opts.joinRule && opts.joinRule !== JoinRule.Restricted) {
createOpts.initial_state.push({ createOpts.initial_state.push({
type: EventType.RoomJoinRules, type: EventType.RoomJoinRules,
content: { join_rule: opts.joinRule }, content: { join_rule: opts.joinRule },