mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-25 12:35:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'thirdroom/dev' into add-room-type-in-summary

Browse Source
This commit is contained in:
Ajay Bura 2022-05-17 09:50:25 +05:30
commit 959c03f12f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/sdk/base-manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@thirdroom/hydrogen-view-sdk", "name": "@thirdroom/hydrogen-view-sdk",
"description": "Embeddable matrix client library, including view components", "description": "Embeddable matrix client library, including view components",
"version": "0.0.6", "version": "0.0.8",
"main": "./hydrogen.es.js", "main": "./hydrogen.es.js",
"type": "module" "type": "module"
} }

2
src/lib.ts
View File

@ -80,7 +80,7 @@ export {TemplateView} from "./platform/web/ui/general/TemplateView";
export {ViewModel} from "./domain/ViewModel"; export {ViewModel} from "./domain/ViewModel";
export {LoadingView} from "./platform/web/ui/general/LoadingView.js"; export {LoadingView} from "./platform/web/ui/general/LoadingView.js";
export {AvatarView} from "./platform/web/ui/AvatarView.js"; export {AvatarView} from "./platform/web/ui/AvatarView.js";
export {RoomVisibility} from "./matrix/room/common"; export {RoomVisibility, RoomType} from "./matrix/room/common";
export {EventEmitter} from "./utils/EventEmitter"; export {EventEmitter} from "./utils/EventEmitter";
export {Disposables} from "./utils/Disposables"; export {Disposables} from "./utils/Disposables";
export {LocalMedia} from "./matrix/calls/LocalMedia"; export {LocalMedia} from "./matrix/calls/LocalMedia";

9
src/matrix/room/RoomBeingCreated.ts
View File

@ -36,7 +36,7 @@ type CreateRoomPayload = {
topic?: string; topic?: string;
invite?: string[]; invite?: string[];
room_alias_name?: string; room_alias_name?: string;
creation_content?: {"m.federate": boolean, type?: string}; creation_content?: {"m.federate"?: boolean, type?: string};
initial_state: {type: string; state_key: string; content: Record<string, any>}[] initial_state: {type: string; state_key: string; content: Record<string, any>}[]
power_level_content_override?: any; power_level_content_override?: any;
} }
@ -150,12 +150,15 @@ export class RoomBeingCreated extends EventEmitter<{change: never}> {
if (this.options.alias) { if (this.options.alias) {
createOptions.room_alias_name = this.options.alias; createOptions.room_alias_name = this.options.alias;
} }
if (this.options.isFederationDisabled === true) { if (this.options.type !== undefined) {
createOptions.creation_content = { createOptions.creation_content = {
type: this.options.type === RoomType.World ? "org.matrix.msc3815.world" : undefined, type: this.options.type === RoomType.World ? "org.matrix.msc3815.world" : undefined,
"m.federate": false
}; };
} }
if (this.options.isFederationDisabled === true) {
if (createOptions.creation_content === undefined) createOptions.creation_content = {};
createOptions.creation_content["m.federate"] = false;
}
if (this.isEncrypted) { if (this.isEncrypted) {
createOptions.initial_state.push(createRoomEncryptionEvent()); createOptions.initial_state.push(createRoomEncryptionEvent());
} }