OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Strip relations when forwarding (#7929)

pull/21833/head
Michael Telatynski 2022-03-24 12:25:59 +00:00 committed by GitHub
parent f86cc74afc
commit 24bda5602f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/components/views/dialogs/ForwardDialog.tsx
View File

@ -16,10 +16,11 @@ limitations under the License.
import React, { useEffect, useMemo, useState } from "react"; import React, { useEffect, useMemo, useState } from "react";
import classnames from "classnames"; import classnames from "classnames";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixClient } from "matrix-js-sdk/src/client"; import { MatrixClient } from "matrix-js-sdk/src/client";
import { RoomMember } from "matrix-js-sdk/src/models/room-member"; import { RoomMember } from "matrix-js-sdk/src/models/room-member";
import { EventType } from "matrix-js-sdk/src/@types/event";
import { _t } from "../../../languageHandler"; import { _t } from "../../../languageHandler";
import dis from "../../../dispatcher/dispatcher"; import dis from "../../../dispatcher/dispatcher";
@ -60,7 +61,8 @@ interface IProps extends IDialogProps {
interface IEntryProps { interface IEntryProps {
room: Room; room: Room;
event: MatrixEvent; type: EventType | string;
content: IContent;
matrixClient: MatrixClient; matrixClient: MatrixClient;
onFinished(success: boolean): void; onFinished(success: boolean): void;
} }
@ -72,7 +74,7 @@ enum SendState {
Failed, Failed,
} }
const Entry: React.FC<IEntryProps> = ({ room, event, matrixClient: cli, onFinished }) => { const Entry: React.FC<IEntryProps> = ({ room, type, content, matrixClient: cli, onFinished }) => {
const [sendState, setSendState] = useState<SendState>(SendState.CanSend); const [sendState, setSendState] = useState<SendState>(SendState.CanSend);
const jumpToRoom = (ev: ButtonEvent) => { const jumpToRoom = (ev: ButtonEvent) => {
@ -87,7 +89,7 @@ const Entry: React.FC<IEntryProps> = ({ room, event, matrixClient: cli, onFinish
const send = async () => { const send = async () => {
setSendState(SendState.Sending); setSendState(SendState.Sending);
try { try {
await cli.sendEvent(room.roomId, event.getType(), event.getContent()); await cli.sendEvent(room.roomId, type, content);
setSendState(SendState.Sent); setSendState(SendState.Sent);
} catch (e) { } catch (e) {
setSendState(SendState.Failed); setSendState(SendState.Failed);
@ -161,11 +163,18 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
cli.getProfileInfo(userId).then(info => setProfileInfo(info)); cli.getProfileInfo(userId).then(info => setProfileInfo(info));
}, [cli, userId]); }, [cli, userId]);
const {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
"m.relates_to": _, // strip relations - in future we will attach a relation pointing at the original event
// We're taking a shallow copy here to avoid https://github.com/vector-im/element-web/issues/10924
...content
} = event.getContent();
// For the message preview we fake the sender as ourselves // For the message preview we fake the sender as ourselves
const mockEvent = new MatrixEvent({ const mockEvent = new MatrixEvent({
type: "m.room.message", type: "m.room.message",
sender: userId, sender: userId,
content: event.getContent(), content,
unsigned: { unsigned: {
age: 97, age: 97,
}, },
@ -258,7 +267,8 @@ const ForwardDialog: React.FC<IProps> = ({ matrixClient: cli, event, permalinkCr
<Entry <Entry
key={room.roomId} key={room.roomId}
room={room} room={room}
event={event} type={event.getType()}
content={content}
matrixClient={cli} matrixClient={cli}
onFinished={onFinished} onFinished={onFinished}
/>, />,