Fix explicit replies in threads (#8210)

src/ContentMessages.ts

@@ -47,6 +47,7 @@ import { decorateStartSendingTime, sendRoundTripMetric } from "./sendTimePerform
 import { TimelineRenderingType } from "./contexts/RoomContext";
 import RoomViewStore from "./stores/RoomViewStore";
 import { addReplyToMessageContent } from "./utils/Reply";
+import { attachRelation } from "./components/views/rooms/SendMessageComposer";
 
 const MAX_WIDTH = 800;
 const MAX_HEIGHT = 600;
@@ -585,10 +586,7 @@ export default class ContentMessages {
             msgtype: "", // set later
         };
 
-        if (relation) {
+        attachRelation(content, relation);
-            content["m.relates_to"] = relation;
-        }
-
         if (replyToEvent) {
             addReplyToMessageContent(content, replyToEvent, {
                 includeLegacyFallback: false,

src/components/views/rooms/SendMessageComposer.tsx

@@ -60,14 +60,12 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
 import { PosthogAnalytics } from "../../../PosthogAnalytics";
 import { addReplyToMessageContent } from '../../../utils/Reply';
 
-export function attachRelation(
+// Merges favouring the given relation
-    content: IContent,
+export function attachRelation(content: IContent, relation?: IEventRelation): void {
-    relation?: IEventRelation,
-): void {
     if (relation) {
         content['m.relates_to'] = {
-            ...relation, // the composer can have a default
+            ...(content['m.relates_to'] || {}),
-            ...content['m.relates_to'],
+            ...relation,
         };
     }
 }
@@ -100,6 +98,7 @@ export function createMessageContent(
         content.formatted_body = formattedBody;
     }
 
+    attachRelation(content, relation);
     if (replyToEvent) {
         addReplyToMessageContent(content, replyToEvent, {
             permalinkCreator,
@@ -107,13 +106,6 @@ export function createMessageContent(
         });
     }
 
-    if (relation) {
-        content['m.relates_to'] = {
-            ...relation,
-            ...content['m.relates_to'],
-        };
-    }
-
     return content;
 }
 

src/utils/Reply.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { IContent, MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { IContent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/models/event";
 import sanitizeHtml from "sanitize-html";
 import escapeHtml from "escape-html";
 import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
@@ -22,7 +22,6 @@ import { MsgType } from "matrix-js-sdk/src/@types/event";
 
 import { PERMITTED_URL_SCHEMES } from "../HtmlUtils";
 import { makeUserPermalink, RoomPermalinkCreator } from "./permalinks/Permalinks";
-import { RecursivePartial } from "../@types/common";
 import SettingsStore from "../settings/SettingsStore";
 
 export function getParentEventId(ev?: MatrixEvent): string | undefined {
@@ -144,16 +143,20 @@ export function getNestedReplyText(
     return { body, html };
 }
 
-export function makeReplyMixIn(ev?: MatrixEvent): RecursivePartial<IContent> {
+export function makeReplyMixIn(ev?: MatrixEvent): IEventRelation {
     if (!ev) return {};
 
-    return {
+    const mixin: IEventRelation = {
-        'm.relates_to': {
+        'm.in_reply_to': {
-            'm.in_reply_to': {
+            'event_id': ev.getId(),
-                'event_id': ev.getId(),
-            },
         },
     };
+
+    if (SettingsStore.getValue("feature_thread") && ev.threadRootId) {
+        mixin.is_falling_back = false;
+    }
+
+    return mixin;
 }
 
 export function shouldDisplayReply(event: MatrixEvent): boolean {
@@ -189,8 +192,10 @@ export function addReplyToMessageContent(
         includeLegacyFallback: true,
     },
 ): void {
-    const replyContent = makeReplyMixIn(replyToEvent);
+    content["m.relates_to"] = {
-    Object.assign(content, replyContent);
+        ...(content["m.relates_to"] || {}),
+        ...makeReplyMixIn(replyToEvent),
+    };
 
     if (opts.includeLegacyFallback) {
         // Part of Replies fallback support - prepend the text we're sending with the text we're replying to