Merge branch 'develop' into t3chguy/fix/7156

Author: t3chguy

.github/codecov.yml

@@ -0,0 +1,12 @@
+coverage:
+  status:
+    patch:
+      default:
+        enabled: no
+        if_not_found: success
+comment:
+  layout: "diff, files"
+  behavior: default
+  require_changes: false
+  require_base: no
+  require_head: no

.github/workflows/test_coverage.yml

@@ -0,0 +1,25 @@
+name: Test coverage
+on:
+  pull_request: {}
+  push:
+    branches: [develop, main, master]
+jobs:
+  test-coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Yarn cache
+        uses: c-hive/gha-yarn-cache@v2
+
+      - name: Install Deps
+        run: "./scripts/ci/install-deps.sh --ignore-scripts"
+
+      - name: Run tests with coverage
+        run: "yarn install && yarn reskindex && yarn coverage"
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v2
+        with:
+          verbose: true

package.json

@@ -231,7 +231,8 @@
       "<rootDir>/src/**/*.{js,ts,tsx}"
     ],
     "coverageReporters": [
-      "text"
+      "text",
+      "json"
     ]
   }
 }

res/css/views/rooms/_EventTile.scss

@@ -968,6 +968,7 @@ $left-gutter: 64px;
         .mx_EventTile_content,
         .mx_HiddenBody,
         .mx_RedactedBody,
+        .mx_MPollBody,
         .mx_ReplyChain_wrapper {
             margin-left: 36px;
             margin-right: 8px;

src/components/views/rooms/BasicMessageComposer.tsx

@@ -348,7 +348,7 @@ export default class BasicMessageEditor extends React.Component<IProps, IState>
             parts = deserializedParts;
         } else {
             const text = event.clipboardData.getData("text/plain");
-            parts = parsePlainTextMessage(text, partCreator);
+            parts = parsePlainTextMessage(text, partCreator, { shouldEscape: false });
         }
         this.modifiedFlag = true;
         const range = getRangeForSelection(this.editorRef.current, model, document.getSelection());

src/components/views/rooms/ThreadSummary.tsx

@@ -68,11 +68,13 @@ const ThreadSummary = ({ mxEvent, thread }: IProps) => {
 
 export const ThreadMessagePreview = ({ thread }: Pick<IProps, "thread">) => {
     const cli = useContext(MatrixClientContext);
-    const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.lastReply());
+    const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.replyToEvent);
     const preview = useAsyncMemo(async () => {
+        if (!lastReply) return;
         await cli.decryptEventIfNeeded(lastReply);
         return MessagePreviewStore.instance.generatePreviewForEvent(lastReply);
     }, [lastReply]);
+    if (!preview) return null;
 
     const sender = thread.roomState.getSentinelMember(lastReply.getSender());
     return <>
@@ -83,13 +85,11 @@ export const ThreadMessagePreview = ({ thread }: Pick<IProps, "thread">) => {
             height={24}
             className="mx_ThreadInfo_avatar"
         />
-        { preview && (
-            <div className="mx_ThreadInfo_content">
-                <span className="mx_ThreadInfo_message-preview">
-                    { preview }
-                </span>
-            </div>
-        ) }
+        <div className="mx_ThreadInfo_content">
+            <span className="mx_ThreadInfo_message-preview">
+                { preview }
+            </span>
+        </div>
     </>;
 };
 

src/editor/deserialize.ts

@@ -52,12 +52,12 @@ function isListChild(n: Node): boolean {
     return LIST_TYPES.includes(n.parentNode?.nodeName);
 }
 
-function parseAtRoomMentions(text: string, pc: PartCreator): Part[] {
+function parseAtRoomMentions(text: string, pc: PartCreator, shouldEscape = true): Part[] {
     const ATROOM = "@room";
     const parts: Part[] = [];
     text.split(ATROOM).forEach((textPart, i, arr) => {
         if (textPart.length) {
-            parts.push(...pc.plainWithEmoji(escape(textPart)));
+            parts.push(...pc.plainWithEmoji(shouldEscape ? escape(textPart) : textPart));
         }
         // it's safe to never append @room after the last textPart
         // as split will report an empty string at the end if
@@ -261,13 +261,17 @@ function parseHtmlMessage(html: string, pc: PartCreator, isQuotedMessage: boolea
     return parts;
 }
 
-export function parsePlainTextMessage(body: string, pc: PartCreator, isQuotedMessage?: boolean): Part[] {
+export function parsePlainTextMessage(
+    body: string,
+    pc: PartCreator,
+    opts: { isQuotedMessage?: boolean, shouldEscape?: boolean },
+): Part[] {
     const lines = body.split(/\r\n|\r|\n/g); // split on any new-line combination not just \n, collapses \r\n
     return lines.reduce((parts, line, i) => {
-        if (isQuotedMessage) {
+        if (opts.isQuotedMessage) {
             parts.push(pc.plain("> "));
         }
-        parts.push(...parseAtRoomMentions(line, pc));
+        parts.push(...parseAtRoomMentions(line, pc, opts.shouldEscape));
         const isLast = i === lines.length - 1;
         if (!isLast) {
             parts.push(pc.newline());
@@ -288,7 +292,7 @@ export function parseEvent(event: MatrixEvent, pc: PartCreator, { isQuotedMessag
             isRainbow = true;
         }
     } else {
-        parts = parsePlainTextMessage(content.body || "", pc, isQuotedMessage);
+        parts = parsePlainTextMessage(content.body || "", pc, { isQuotedMessage });
     }
 
     if (isEmote && isRainbow) {