matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Delete UnstableValue and use hardcoded value for m.thread

Browse Source
This commit is contained in:
Germain Souquet
2021-10-14 17:09:00 +01:00
parent 7b89862ed0
commit 9ceeb2d220
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/@types/event.ts
View File

@@ -94,7 +94,9 @@ export enum RelationType {
Replace = "m.replace", Replace = "m.replace",
/** /**
* Note, "io.element.thread" is hardcoded * Note, "io.element.thread" is hardcoded
* TypeScript does not allow computed values in enums * Should be replaced with "m.thread" once MSC3440 lands
* Can not use `UnstableValue` as TypeScript does not
* allow computed values in enums
* https://github.com/microsoft/TypeScript/issues/27976 * https://github.com/microsoft/TypeScript/issues/27976
*/ */
Thread = "io.element.thread", Thread = "io.element.thread",
@@ -174,16 +176,6 @@ export const UNSTABLE_ELEMENT_FUNCTIONAL_USERS = new UnstableValue(
"io.element.functional_members", "io.element.functional_members",
"io.element.functional_members"); "io.element.functional_members");
/**
* Note, "io.element.thread" is hardcoded in the RelationType enum
* TypeScript does not allow computed values in enums
* https://github.com/microsoft/TypeScript/issues/27976
*/
export const UNSTABLE_ELEMENT_THREAD_RELATION = new UnstableValue(
"m.thread",
"io.element.thread",
);
export interface IEncryptedFile { export interface IEncryptedFile {
url: string; url: string;
mimetype?: string; mimetype?: string;

3
src/models/event.ts
View File

@@ -28,7 +28,6 @@ import {
EventType, EventType,
MsgType, MsgType,
RelationType, RelationType,
UNSTABLE_ELEMENT_THREAD_RELATION,
} from "../@types/event"; } from "../@types/event";
import { Crypto } from "../crypto"; import { Crypto } from "../crypto";
import { deepSortedObjectEntries } from "../utils"; import { deepSortedObjectEntries } from "../utils";
@@ -423,7 +422,7 @@ export class MatrixEvent extends EventEmitter {
*/ */
public get threadRootId(): string { public get threadRootId(): string {
const relatesTo = this.getWireContent()?.["m.relates_to"]; const relatesTo = this.getWireContent()?.["m.relates_to"];
if (relatesTo?.rel_type === UNSTABLE_ELEMENT_THREAD_RELATION.name) { if (relatesTo?.rel_type === RelationType.Thread) {
return relatesTo.event_id; return relatesTo.event_id;
} }
} }