mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-01-29 01:28:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pinned message edits does not reflect in pinned messages

Browse source
This commit is contained in:
Ajay Bura 2024-12-22 09:41:07 +05:30
parent 35f0e400ad
commit f809577146
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/app/features/room/room-pin-menu/RoomPinMenu.tsx
View file

@ -1,6 +1,6 @@
/* eslint-disable react/destructuring-assignment */ /* eslint-disable react/destructuring-assignment */
import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react'; import React, { forwardRef, MouseEventHandler, useCallback, useMemo, useRef } from 'react';
import { MatrixEvent, RelationType, Room } from 'matrix-js-sdk'; import { MatrixEvent, Room } from 'matrix-js-sdk';
import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types'; import { RoomPinnedEventsEventContent } from 'matrix-js-sdk/lib/types';
import { import {
Avatar, Avatar,
@ -257,6 +257,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
msgType={event.getContent().msgtype ?? ''} msgType={event.getContent().msgtype ?? ''}
ts={event.getTs()} ts={event.getTs()}
getContent={getContent} getContent={getContent}
edited={!!event.replacingEvent}
mediaAutoLoad={mediaAutoLoad} mediaAutoLoad={mediaAutoLoad}
urlPreview={urlPreview} urlPreview={urlPreview}
htmlReactParserOptions={htmlReactParserOptions} htmlReactParserOptions={htmlReactParserOptions}
@ -311,7 +312,7 @@ export const RoomPinMenu = forwardRef<HTMLDivElement, RoomPinMenuProps>(
displayName={displayName} displayName={displayName}
msgType={mEvent.getContent().msgtype ?? ''} msgType={mEvent.getContent().msgtype ?? ''}
ts={mEvent.getTs()} ts={mEvent.getTs()}
edited={!!editedEvent} edited={!!editedEvent || !!mEvent.replacingEvent}
getContent={getContent} getContent={getContent}
mediaAutoLoad={mediaAutoLoad} mediaAutoLoad={mediaAutoLoad}
urlPreview={urlPreview} urlPreview={urlPreview}

8
src/app/hooks/useRoomEvent.ts
View file

@ -1,4 +1,4 @@
import { MatrixEvent, Room } from 'matrix-js-sdk'; import { IEvent, MatrixEvent, Room } from 'matrix-js-sdk';
import { useCallback, useMemo } from 'react'; import { useCallback, useMemo } from 'react';
import to from 'await-to-js'; import to from 'await-to-js';
import { CryptoBackend } from 'matrix-js-sdk/lib/common-crypto/CryptoBackend'; import { CryptoBackend } from 'matrix-js-sdk/lib/common-crypto/CryptoBackend';
@ -12,6 +12,12 @@ const useFetchEvent = (room: Room, eventId: string) => {
const evt = await mx.fetchRoomEvent(room.roomId, eventId); const evt = await mx.fetchRoomEvent(room.roomId, eventId);
const mEvent = new MatrixEvent(evt); const mEvent = new MatrixEvent(evt);
if (evt.unsigned?.['m.relations'] && evt.unsigned?.['m.relations']['m.replace']) {
const replaceEvt = evt.unsigned?.['m.relations']['m.replace'] as IEvent;
const replaceEvent = new MatrixEvent(replaceEvt);
mEvent.makeReplaced(replaceEvent);
}
if (mEvent.isEncrypted() && mx.getCrypto()) { if (mEvent.isEncrypted() && mx.getCrypto()) {
await to(mEvent.attemptDecryption(mx.getCrypto() as CryptoBackend)); await to(mEvent.attemptDecryption(mx.getCrypto() as CryptoBackend));
} }