Remove reply fallbacks as per merged MSC2781

src/ContentMessages.ts

@@ -536,9 +536,7 @@ export default class ContentMessages {
         attachMentions(matrixClient.getSafeUserId(), content, null, replyToEvent);
         attachRelation(content, relation);
         if (replyToEvent) {
-            addReplyToMessageContent(content, replyToEvent, {
-                includeLegacyFallback: false,
-            });
+            addReplyToMessageContent(content, replyToEvent);
         }
 
         if (SettingsStore.getValue("Performance.addSendMessageTimingMetadata")) {

src/components/views/rooms/MessageComposer.tsx

@@ -414,7 +414,7 @@ export class MessageComposer extends React.Component<IProps, IState> {
         this.messageComposerInput.current?.sendMessage();
 
         if (this.state.isWysiwygLabEnabled) {
-            const { permalinkCreator, relation, replyToEvent } = this.props;
+            const { relation, replyToEvent } = this.props;
             const composerContent = this.state.composerContent;
             this.setState({ composerContent: "", initialComposerContent: "" });
             dis.dispatch({
@@ -424,7 +424,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
             await sendMessage(composerContent, this.state.isRichTextEnabled, {
                 mxClient: this.props.mxClient,
                 roomContext: this.context,
-                permalinkCreator,
                 relation,
                 replyToEvent,
             });
@@ -582,7 +581,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
                         key="controls_input"
                         room={this.props.room}
                         placeholder={this.renderPlaceholderText()}
-                        permalinkCreator={this.props.permalinkCreator}
                         relation={this.props.relation}
                         replyToEvent={this.props.replyToEvent}
                         onChange={this.onChange}
@@ -597,7 +595,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
                     key="controls_voice_record"
                     ref={this.voiceRecordingButton}
                     room={this.props.room}
-                    permalinkCreator={this.props.permalinkCreator}
                     relation={this.props.relation}
                     replyToEvent={this.props.replyToEvent}
                 />,
@@ -642,8 +639,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
             );
         }
 
-        let recordingTooltip: JSX.Element | undefined;
-
         const isTooltipOpen = Boolean(this.state.recordingTimeLeftSeconds);
         const secondsLeft = this.state.recordingTimeLeftSeconds ? Math.round(this.state.recordingTimeLeftSeconds) : 0;
 
@@ -673,7 +668,6 @@ export class MessageComposer extends React.Component<IProps, IState> {
         return (
             <Tooltip open={isTooltipOpen} description={formatTimeLeft(secondsLeft)} placement="bottom">
                 <div className={classes} ref={this.ref} role="region" aria-label={_t("a11y|message_composer")}>
-                    {recordingTooltip}
                     <div className="mx_MessageComposer_wrapper">
                         <ReplyPreview
                             replyToEvent={this.props.replyToEvent}

src/components/views/rooms/SendMessageComposer.tsx

@@ -47,7 +47,6 @@ import { CHAT_EFFECTS } from "../../../effects";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { getKeyBindingsManager } from "../../../KeyBindingsManager";
 import SettingsStore from "../../../settings/SettingsStore";
-import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import { ActionPayload } from "../../../dispatcher/payloads";
 import { decorateStartSendingTime, sendRoundTripMetric } from "../../../sendTimePerformanceMetrics";
 import RoomContext, { TimelineRenderingType } from "../../../contexts/RoomContext";
@@ -177,8 +176,6 @@ export function createMessageContent(
     model: EditorModel,
     replyToEvent: MatrixEvent | undefined,
     relation: IEventRelation | undefined,
-    permalinkCreator?: RoomPermalinkCreator,
-    includeReplyLegacyFallback = true,
 ): RoomMessageEventContent {
     const isEmote = containsEmote(model);
     if (isEmote) {
@@ -209,10 +206,7 @@ export function createMessageContent(
 
     attachRelation(content, relation);
     if (replyToEvent) {
-        addReplyToMessageContent(content, replyToEvent, {
-            permalinkCreator,
-            includeLegacyFallback: includeReplyLegacyFallback,
-        });
+        addReplyToMessageContent(content, replyToEvent);
     }
 
     return content;
@@ -238,12 +232,10 @@ export function isQuickReaction(model: EditorModel): boolean {
 interface ISendMessageComposerProps extends MatrixClientProps {
     room: Room;
     placeholder?: string;
-    permalinkCreator?: RoomPermalinkCreator;
     relation?: IEventRelation;
     replyToEvent?: MatrixEvent;
     disabled?: boolean;
     onChange?(model: EditorModel): void;
-    includeReplyLegacyFallback?: boolean;
     toggleStickerPickerOpen: () => void;
 }
 
@@ -258,10 +250,6 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
     private dispatcherRef?: string;
     private sendHistoryManager: SendHistoryManager;
 
-    public static defaultProps = {
-        includeReplyLegacyFallback: true,
-    };
-
     public constructor(props: ISendMessageComposerProps, context: React.ContextType<typeof RoomContext>) {
         super(props, context);
 
@@ -500,11 +488,7 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                     attachMentions(this.props.mxClient.getSafeUserId(), content, model, replyToEvent);
                     attachRelation(content, this.props.relation);
                     if (replyToEvent) {
-                        addReplyToMessageContent(content, replyToEvent, {
-                            permalinkCreator: this.props.permalinkCreator,
-                            // Exclude the legacy fallback for custom event types such as those used by /fireworks
-                            includeLegacyFallback: content.msgtype?.startsWith("m.") ?? true,
-                        });
+                        addReplyToMessageContent(content, replyToEvent);
                     }
                 } else {
                     shouldSend = false;
@@ -534,8 +518,6 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
                     model,
                     replyToEvent,
                     this.props.relation,
-                    this.props.permalinkCreator,
-                    this.props.includeReplyLegacyFallback,
                 );
             }
             // don't bother sending an empty message

src/components/views/rooms/VoiceRecordComposerTile.tsx

@@ -31,15 +31,13 @@ import { doMaybeLocalRoomAction } from "../../../utils/local-room";
 import defaultDispatcher from "../../../dispatcher/dispatcher";
 import { attachMentions, attachRelation } from "./SendMessageComposer";
 import { addReplyToMessageContent } from "../../../utils/Reply";
-import { RoomPermalinkCreator } from "../../../utils/permalinks/Permalinks";
 import RoomContext from "../../../contexts/RoomContext";
 import { IUpload, VoiceMessageRecording } from "../../../audio/VoiceMessageRecording";
 import { createVoiceMessageContent } from "../../../utils/createVoiceMessageContent";
 import AccessibleButton from "../elements/AccessibleButton";
 
 interface IProps {
     room: Room;
-    permalinkCreator?: RoomPermalinkCreator;
     relation?: IEventRelation;
     replyToEvent?: MatrixEvent;
 }
@@ -93,7 +91,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
             throw new Error("No recording started - cannot send anything");
         }
 
-        const { replyToEvent, relation, permalinkCreator } = this.props;
+        const { replyToEvent, relation } = this.props;
 
         await this.state.recorder.stop();
 
@@ -124,10 +122,7 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
             attachMentions(MatrixClientPeg.safeGet().getSafeUserId(), content, null, replyToEvent);
             attachRelation(content, relation);
             if (replyToEvent) {
-                addReplyToMessageContent(content, replyToEvent, {
-                    permalinkCreator,
-                    includeLegacyFallback: true,
-                });
+                addReplyToMessageContent(content, replyToEvent);
                 // Clear reply_to_event as we put the message into the queue
                 // if the send fails, retry will handle resending.
                 defaultDispatcher.dispatch({

src/components/views/rooms/wysiwyg_composer/utils/createMessageContent.ts

@@ -11,7 +11,7 @@ import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/sr
 import { ReplacementEvent, RoomMessageEventContent, RoomMessageTextEventContent } from "matrix-js-sdk/src/types";
 
 import SettingsStore from "../../../../../settings/SettingsStore";
-import { parsePermalink, RoomPermalinkCreator } from "../../../../../utils/permalinks/Permalinks";
+import { parsePermalink } from "../../../../../utils/permalinks/Permalinks";
 import { addReplyToMessageContent } from "../../../../../utils/Reply";
 import { isNotNull } from "../../../../../Typeguards";
 
@@ -52,8 +52,6 @@ function getTextReplyFallback(mxEvent: MatrixEvent): string {
 interface CreateMessageContentParams {
     relation?: IEventRelation;
     replyToEvent?: MatrixEvent;
-    permalinkCreator?: RoomPermalinkCreator;
-    includeReplyLegacyFallback?: boolean;
     editedEvent?: MatrixEvent;
 }
 
@@ -62,13 +60,7 @@ const isMatrixEvent = (e: MatrixEvent | undefined): e is MatrixEvent => e instan
 export async function createMessageContent(
     message: string,
     isHTML: boolean,
-    {
-        relation,
-        replyToEvent,
-        permalinkCreator,
-        includeReplyLegacyFallback = true,
-        editedEvent,
-    }: CreateMessageContentParams,
+    { relation, replyToEvent, editedEvent }: CreateMessageContentParams,
 ): Promise<RoomMessageEventContent> {
     const isEditing = isMatrixEvent(editedEvent);
     const isReply = isEditing ? Boolean(editedEvent.replyEventId) : isMatrixEvent(replyToEvent);
@@ -126,11 +118,8 @@ export async function createMessageContent(
     // TODO Handle editing?
     attachRelation(content, newRelation);
 
-    if (!isEditing && replyToEvent && permalinkCreator) {
-        addReplyToMessageContent(content, replyToEvent, {
-            permalinkCreator,
-            includeLegacyFallback: includeReplyLegacyFallback,
-        });
+    if (!isEditing && replyToEvent) {
+        addReplyToMessageContent(content, replyToEvent);
     }
 
     return content;

src/components/views/rooms/wysiwyg_composer/utils/message.ts

@@ -19,7 +19,6 @@ import { RoomMessageEventContent } from "matrix-js-sdk/src/types";
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
 import SettingsStore from "../../../../../settings/SettingsStore";
 import { decorateStartSendingTime, sendRoundTripMetric } from "../../../../../sendTimePerformanceMetrics";
-import { RoomPermalinkCreator } from "../../../../../utils/permalinks/Permalinks";
 import { doMaybeLocalRoomAction } from "../../../../../utils/local-room";
 import { CHAT_EFFECTS } from "../../../../../effects";
 import { containsEmoji } from "../../../../../effects/utils";
@@ -41,16 +40,14 @@ export interface SendMessageParams {
     relation?: IEventRelation;
     replyToEvent?: MatrixEvent;
     roomContext: IRoomState;
-    permalinkCreator?: RoomPermalinkCreator;
-    includeReplyLegacyFallback?: boolean;
 }
 
 export async function sendMessage(
     message: string,
     isHTML: boolean,
     { roomContext, mxClient, ...params }: SendMessageParams,
 ): Promise<ISendEventResponse | undefined> {
-    const { relation, replyToEvent, permalinkCreator } = params;
+    const { relation, replyToEvent } = params;
     const { room } = roomContext;
     const roomId = room?.roomId;
 
@@ -95,11 +92,7 @@ export async function sendMessage(
             ) {
                 attachRelation(content, relation);
                 if (replyToEvent) {
-                    addReplyToMessageContent(content, replyToEvent, {
-                        permalinkCreator,
-                        // Exclude the legacy fallback for custom event types such as those used by /fireworks
-                        includeLegacyFallback: content.msgtype?.startsWith("m.") ?? true,
-                    });
+                    addReplyToMessageContent(content, replyToEvent);
                 }
             } else {
                 // instead of setting shouldSend to false as in SendMessageComposer, just return