Revert "Factor out MessageEvent.from() usage (#9882)"

This reverts commit c09ca7b.
matrix-org · Jan 10, 2023 · 99e38ca · 99e38ca
1 parent b4f2db2
commit 99e38ca
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 127 deletions.
diff --git a/cypress/e2e/editing/editing.spec.ts b/cypress/e2e/editing/editing.spec.ts
@@ -16,17 +16,15 @@ limitations under the License.
 
 /// <reference types="cypress" />
 
-import type { MsgType } from "matrix-js-sdk/src/@types/event";
+import { MessageEvent } from "matrix-events-sdk";
+
 import type { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
 import type { EventType } from "matrix-js-sdk/src/@types/event";
 import { SynapseInstance } from "../../plugins/synapsedocker";
 import Chainable = Cypress.Chainable;
 
 const sendEvent = (roomId: string): Chainable<ISendEventResponse> => {
-    return cy.sendEvent(roomId, null, "m.room.message" as EventType, {
-        msgtype: "m.text" as MsgType,
-        body: "Message",
-    });
+    return cy.sendEvent(roomId, null, "m.room.message" as EventType, MessageEvent.from("Message").serialize().content);
 };
 
 describe("Editing", () => {

diff --git a/cypress/e2e/timeline/timeline.spec.ts b/cypress/e2e/timeline/timeline.spec.ts
@@ -16,8 +16,10 @@ limitations under the License.
 
 /// <reference types="cypress" />
 
+import { MessageEvent } from "matrix-events-sdk";
+
 import type { ISendEventResponse } from "matrix-js-sdk/src/@types/requests";
-import type { EventType, MsgType } from "matrix-js-sdk/src/@types/event";
+import type { EventType } from "matrix-js-sdk/src/@types/event";
 import { SynapseInstance } from "../../plugins/synapsedocker";
 import { SettingLevel } from "../../../src/settings/SettingLevel";
 import { Layout } from "../../../src/settings/enums/Layout";
@@ -53,17 +55,12 @@ const expectAvatar = (e: JQuery<HTMLElement>, avatarUrl: string): void => {
 };
 
 const sendEvent = (roomId: string, html = false): Chainable<ISendEventResponse> => {
-    const content = {
-        msgtype: "m.text" as MsgType,
-        body: "Message",
-        format: undefined,
-        formatted_body: undefined,
-    };
-    if (html) {
-        content.format = "org.matrix.custom.html";
-        content.formatted_body = "<b>Message</b>";
-    }
-    return cy.sendEvent(roomId, null, "m.room.message" as EventType, content);
+    return cy.sendEvent(
+        roomId,
+        null,
+        "m.room.message" as EventType,
+        MessageEvent.from("Message", html ? "<b>Message</b>" : undefined).serialize().content,
+    );
 };
 
 describe("Timeline", () => {
@@ -317,10 +314,12 @@ describe("Timeline", () => {
                 },
             }).as("preview_url");
 
-            cy.sendEvent(roomId, null, "m.room.message" as EventType, {
-                msgtype: "m.text" as MsgType,
-                body: "https://call.element.io/",
-            });
+            cy.sendEvent(
+                roomId,
+                null,
+                "m.room.message" as EventType,
+                MessageEvent.from("https://call.element.io/").serialize().content,
+            );
             cy.visit("/#/room/" + roomId);
 
             cy.get(".mx_LinkPreviewWidget").should("exist").should("contain.text", "Element Call");

diff --git a/test/components/structures/TimelinePanel-test.tsx b/test/components/structures/TimelinePanel-test.tsx
@@ -17,6 +17,7 @@ limitations under the License.
 import { render, RenderResult, waitFor, screen } from "@testing-library/react";
 // eslint-disable-next-line deprecate/import
 import { mount, ReactWrapper } from "enzyme";
+import { MessageEvent } from "matrix-events-sdk";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import {
     EventTimelineSet,
@@ -47,7 +48,6 @@ import SettingsStore from "../../../src/settings/SettingsStore";
 import { isCallEvent } from "../../../src/components/structures/LegacyCallEventGrouper";
 import { flushPromises, mkMembership, mkRoom, stubClient } from "../../test-utils";
 import { mkThread } from "../../test-utils/threads";
-import { createMessageEventContent } from "../../test-utils/events";
 
 const newReceipt = (eventId: string, userId: string, readTs: number, fullyReadTs: number): MatrixEvent => {
     const receiptContent = {
@@ -89,8 +89,8 @@ const mockEvents = (room: Room, count = 2): MatrixEvent[] => {
                 room_id: room.roomId,
                 event_id: `${room.roomId}_event_${index}`,
                 type: EventType.RoomMessage,
-                sender: "userId",
-                content: createMessageEventContent("`Event${index}`"),
+                user_id: "userId",
+                content: MessageEvent.from(`Event${index}`).serialize().content,
             }),
         );
     }
@@ -125,15 +125,13 @@ describe("TimelinePanel", () => {
                 event_id: "ev0",
                 sender: "@u2:m.org",
                 origin_server_ts: 111,
-                type: EventType.RoomMessage,
-                content: createMessageEventContent("hello 1"),
+                ...MessageEvent.from("hello 1").serialize(),
             });
             const ev1 = new MatrixEvent({
                 event_id: "ev1",
                 sender: "@u2:m.org",
                 origin_server_ts: 222,
-                type: EventType.RoomMessage,
-                content: createMessageEventContent("hello 2"),
+                ...MessageEvent.from("hello 2").serialize(),
             });
 
             const roomId = "#room:example.com";
@@ -387,24 +385,24 @@ describe("TimelinePanel", () => {
                 room_id: room.roomId,
                 event_id: "event_reply_1",
                 type: EventType.RoomMessage,
-                sender: "userId",
-                content: createMessageEventContent("ReplyEvent1"),
+                user_id: "userId",
+                content: MessageEvent.from(`ReplyEvent1`).serialize().content,
             });
 
             reply2 = new MatrixEvent({
                 room_id: room.roomId,
                 event_id: "event_reply_2",
                 type: EventType.RoomMessage,
-                sender: "userId",
-                content: createMessageEventContent("ReplyEvent2"),
+                user_id: "userId",
+                content: MessageEvent.from(`ReplyEvent2`).serialize().content,
             });
 
             root = new MatrixEvent({
                 room_id: room.roomId,
                 event_id: "event_root_1",
                 type: EventType.RoomMessage,
-                sender: "userId",
-                content: createMessageEventContent("RootEvent"),
+                user_id: "userId",
+                content: MessageEvent.from(`RootEvent`).serialize().content,
             });
 
             const eventMap: { [key: string]: MatrixEvent } = {