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

Make pinned messages more reliably reflect edits #7920

Merged
merged 4 commits into from
Mar 2, 2022
Merged

Make pinned messages more reliably reflect edits #7920

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b99c8c1
Inject edits from /relations API into pinned messages
robintown Feb 28, 2022
a95930e
Limit returned relations, because we only need one
robintown Feb 28, 2022
64d70c7
Merge branch 'develop' into inject-pin-edits
robintown Mar 2, 2022
d6a8c3f
Fetch pinned message edits in parallel
robintown Mar 2, 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/right_panel/PinnedMessagesCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
import React, { useCallback, useContext, useEffect, useState } from "react";
import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType } from 'matrix-js-sdk/src/@types/event';
import { EventType, RelationType } from 'matrix-js-sdk/src/@types/event';
import { logger } from "matrix-js-sdk/src/logger";
import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";

Expand Down Expand Up @@ -102,14 +102,22 @@ const PinnedMessagesCard = ({ room, onClose }: IProps) => {
if (localEvent) return localEvent;

try {
const evJson = await cli.fetchRoomEvent(room.roomId, eventId);
// Fetch the event and latest edit in parallel
const [evJson, { events: [edit] }] = await Promise.all([
cli.fetchRoomEvent(room.roomId, eventId),
cli.relations(room.roomId, eventId, RelationType.Replace, null, { limit: 1 }),
]);
const event = new MatrixEvent(evJson);
if (event.isEncrypted()) {
await cli.decryptEventIfNeeded(event); // TODO await?
}

if (event && PinningUtils.isPinnable(event)) {
// Inject sender information
event.sender = room.getMember(event.getSender());
// Also inject any edits we've found
if (edit) event.makeReplaced(edit);

return event;
}
} catch (err) {
Expand Down