Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix issues with edited events not affecting threads #8125

Merged
merged 2 commits into from
Mar 24, 2022
Merged

Fix issues with edited events not affecting threads #8125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee4fd76
Fix issues with edited events not affecting the thread summary
t3chguy Mar 23, 2022
f5cc8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/components/views/rooms/ThreadSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

import React, { useContext } from "react";
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 { CardContext } from "../right_panel/BaseCard";
Expand Down Expand Up @@ -74,12 +74,20 @@ interface IPreviewProps {

export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPreviewProps) => {
const cli = useContext(MatrixClientContext);

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 () => {
if (!lastReply) return;
await cli.decryptEventIfNeeded(lastReply);
return MessagePreviewStore.instance.generatePreviewForEvent(lastReply);
}, [lastReply]);
}, [lastReply, replacingEventId]);
if (!preview) return null;

const sender = thread.roomState.getSentinelMember(lastReply.getSender());
Expand Down