imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issues with edited events not affecting threads (#8125)

Browse source
This commit is contained in:
Michael Telatynski 2022-03-24 12:24:18 +00:00 • committed by GitHub
parent 3b523677fd
commit f86cc74afc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/rooms/ThreadSummary.tsx
View file

@ -16,7 +16,7 @@ limitations under the License.
import React, { useContext } from "react"; import React, { useContext } from "react";
import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread"; import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/models/event";
import { _t } from "../../../languageHandler"; import { _t } from "../../../languageHandler";
import { CardContext } from "../right_panel/BaseCard"; import { CardContext } from "../right_panel/BaseCard";
@ -74,12 +74,20 @@ interface IPreviewProps {
export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPreviewProps) => { export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPreviewProps) => {
const cli = useContext(MatrixClientContext); const cli = useContext(MatrixClientContext);
const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.replyToEvent); const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.replyToEvent);
// track the replacing event id as a means to regenerate the thread message preview
const replacingEventId = useTypedEventEmitterState(
lastReply,
MatrixEventEvent.Replaced,
() => lastReply?.replacingEventId(),
);
const preview = useAsyncMemo(async () => { const preview = useAsyncMemo(async () => {
if (!lastReply) return; if (!lastReply) return;
await cli.decryptEventIfNeeded(lastReply); await cli.decryptEventIfNeeded(lastReply);
return MessagePreviewStore.instance.generatePreviewForEvent(lastReply); return MessagePreviewStore.instance.generatePreviewForEvent(lastReply);
}, [lastReply]); }, [lastReply, replacingEventId]);
if (!preview) return null; if (!preview) return null;
const sender = thread.roomState.getSentinelMember(lastReply.getSender()); const sender = thread.roomState.getSentinelMember(lastReply.getSender());