MCorange/cinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix selecting tombstone room opens replacement room (#1820)

Browse Source
This commit is contained in:
Ajay Bura
2024-07-18 18:50:51 +05:30
committed by GitHub
parent c4abe39375
commit a1a822c5b6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/utils/matrix.ts
View File

@@ -14,6 +14,8 @@ import {
} from 'matrix-js-sdk'; } from 'matrix-js-sdk';
import { IImageInfo, IThumbnailContent, IVideoInfo } from '../../types/matrix/common'; import { IImageInfo, IThumbnailContent, IVideoInfo } from '../../types/matrix/common';
import { AccountDataEvent } from '../../types/matrix/accountData'; import { AccountDataEvent } from '../../types/matrix/accountData';
import { getStateEvent } from './room';
import { StateEvent } from '../../types/matrix/room';
export const matchMxId = (id: string): RegExpMatchArray | null => export const matchMxId = (id: string): RegExpMatchArray | null =>
id.match(/^([@!$+#])(\S+):(\S+)$/); id.match(/^([@!$+#])(\S+):(\S+)$/);
@@ -42,8 +44,12 @@ export const parseMatrixToUrl = (url: string): [string | undefined, string | und
export const getCanonicalAliasRoomId = (mx: MatrixClient, alias: string): string | undefined => export const getCanonicalAliasRoomId = (mx: MatrixClient, alias: string): string | undefined =>
mx.getRooms()?.find((room) => room.getCanonicalAlias() === alias)?.roomId; mx.getRooms()?.find((room) => room.getCanonicalAlias() === alias)?.roomId;
export const getCanonicalAliasOrRoomId = (mx: MatrixClient, roomId: string): string => export const getCanonicalAliasOrRoomId = (mx: MatrixClient, roomId: string): string => {
mx.getRoom(roomId)?.getCanonicalAlias() || roomId; const room = mx.getRoom(roomId);
if (!room) return roomId;
if (getStateEvent(room, StateEvent.RoomTombstone) !== undefined) return roomId;
return room.getCanonicalAlias() || roomId;
};
export const getImageInfo = (img: HTMLImageElement, fileOrBlob: File | Blob): IImageInfo => { export const getImageInfo = (img: HTMLImageElement, fileOrBlob: File | Blob): IImageInfo => {
const info: IImageInfo = {}; const info: IImageInfo = {};