mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2025-01-23 18:51:39 +01:00
Code Issues Projects Releases Wiki Activity

Update setAvatar logic

Browse Source
This commit is contained in:
Robert Long 2022-09-16 17:56:05 -07:00
parent 9cafb8cd26
commit a0277b5afc
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,8 @@ type ImageInfo = {
type Avatar = { type Avatar = {
info: ImageInfo; info: ImageInfo;
blob: IBlobHandle;
name: string; name: string;
} } & ({ blob: IBlobHandle } | { url: string });
type Options = { type Options = {
type?: RoomType; type?: RoomType;
@ -126,12 +125,18 @@ export class RoomBeingCreated extends EventEmitter<{change: never}> {
let avatarEventContent; let avatarEventContent;
if (this.options.avatar) { if (this.options.avatar) {
const {avatar} = this.options; const {avatar} = this.options;
const attachment = new AttachmentUpload({filename: avatar.name, blob: avatar.blob, platform: this.platform});
await attachment.upload(hsApi, () => {}, log);
avatarEventContent = { avatarEventContent = {
info: avatar.info info: avatar.info
}; };
attachment.applyToContent("url", avatarEventContent);
if ("blob" in avatar) {
const attachment = new AttachmentUpload({filename: avatar.name, blob: avatar.blob, platform: this.platform});
await attachment.upload(hsApi, () => {}, log);
attachment.applyToContent("url", avatarEventContent);
} else {
avatarEventContent.url = avatar.url;
}
} }
const createOptions: CreateRoomPayload = { const createOptions: CreateRoomPayload = {
is_direct: this.options.visibility === RoomVisibility.DirectMessage, is_direct: this.options.visibility === RoomVisibility.DirectMessage,
@ -214,7 +219,15 @@ export class RoomBeingCreated extends EventEmitter<{change: never}> {
get avatarColorId(): string { return this.options.invites?.[0] ?? this._roomId ?? this.id; } get avatarColorId(): string { return this.options.invites?.[0] ?? this._roomId ?? this.id; }
get avatarUrl(): string | undefined { return this.profiles?.[0]?.avatarUrl; } get avatarUrl(): string | undefined { return this.profiles?.[0]?.avatarUrl; }
get avatarBlobUrl(): string | undefined { return this.options.avatar?.blob?.url; } get avatarBlobUrl(): string | undefined {
const avatar = this.options.avatar;
if (!avatar || !("blob" in avatar)) {
return undefined;
}
return avatar.blob.url;
}
get roomId(): string | undefined { return this._roomId; } get roomId(): string | undefined { return this._roomId; }
get name() { return this._calculatedName; } get name() { return this._calculatedName; }
get isBeingCreated(): boolean { return true; } get isBeingCreated(): boolean { return true; }
@ -232,7 +245,7 @@ export class RoomBeingCreated extends EventEmitter<{change: never}> {
/** @internal */ /** @internal */
dispose() { dispose() {
if (this.options.avatar) { if (this.options.avatar && "blob" in this.options.avatar) {
this.options.avatar.blob.dispose(); this.options.avatar.blob.dispose();
} }
} }