From 6333d4aa364717715df59823093dd74e10df9d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 24 Jun 2021 14:02:06 +0200
Subject: [PATCH] Iterate PR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/TextForEvent.tsx                          | 53 +++++++++++--------
 src/components/views/messages/TextualEvent.js |  2 +-
 src/i18n/strings/en_EN.json                   |  1 +
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/TextForEvent.tsx b/src/TextForEvent.tsx
index b7e9deda8d..50bdae8ca9 100644
--- a/src/TextForEvent.tsx
+++ b/src/TextForEvent.tsx
@@ -473,29 +473,36 @@ function textForPowerEvent(event): () => string | null {
     });
 }
 
-function textForPinnedEvent(event: MatrixEvent): () => JSX.Element | null {
+function textForPinnedEvent(event: MatrixEvent, allowJSX: boolean): () => string | JSX.Element | null {
     if (!SettingsStore.getValue("feature_pinning")) return null;
-
     const senderName = event.sender ? event.sender.name : event.getSender();
-    const onPinnedMessagesClick = () => {
-        defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
-            action: Action.SetRightPanelPhase,
-            phase: RightPanelPhases.PinnedMessages,
-            allowClose: false,
-        });
-    }
 
-    return () => (
-        <span>
-            {
-                _t(
-                    "%(senderName)s changed the <a>pinned messages</a> for the room.",
-                    { senderName },
-                    { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> },
-                )
-            }
-        </span>
-    );
+    if (allowJSX) {
+        const onPinnedMessagesClick = () => {
+            defaultDispatcher.dispatch<SetRightPanelPhasePayload>({
+                action: Action.SetRightPanelPhase,
+                phase: RightPanelPhases.PinnedMessages,
+                allowClose: false,
+            });
+        }
+
+        return () => (
+            <span>
+                {
+                    _t(
+                        "%(senderName)s changed the <a>pinned messages</a> for the room.",
+                        { senderName },
+                        { "a": (sub) => <a onClick={onPinnedMessagesClick}> { sub } </a> },
+                    )
+                }
+            </span>
+        );
+    } else {
+        return () => _t(
+            "%(senderName)s changed the pinned messages for the room.",
+            { senderName },
+        );
+    }
 }
 
 function textForWidgetEvent(event): () => string | null {
@@ -621,7 +628,7 @@ function textForMjolnirEvent(event): () => string | null {
 }
 
 interface IHandlers {
-    [type: string]: (ev: any) => (() => string | JSX.Element | null);
+    [type: string]: (ev: MatrixEvent, allowJSX?: boolean) => (() => string | JSX.Element | null);
 }
 
 const handlers: IHandlers = {
@@ -662,7 +669,7 @@ export function hasText(ev): boolean {
     return Boolean(handler?.(ev));
 }
 
-export function textForEvent(ev): string | JSX.Element {
+export function textForEvent(ev: MatrixEvent, allowJSX = false): string | JSX.Element {
     const handler = (ev.isState() ? stateHandlers : handlers)[ev.getType()];
-    return handler?.(ev)?.() || '';
+    return handler?.(ev, allowJSX)?.() || '';
 }
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index a020cc6c52..25da18da0d 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -28,7 +28,7 @@ export default class TextualEvent extends React.Component {
     };
 
     render() {
-        const text = TextForEvent.textForEvent(this.props.mxEvent);
+        const text = TextForEvent.textForEvent(this.props.mxEvent, true);
         if (text == null || text.length === 0) return null;
         return (
             <div className="mx_TextualEvent">{ text }</div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c092c2b592..73bf948778 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -559,6 +559,7 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
     "%(senderName)s changed the <a>pinned messages</a> for the room.": "%(senderName)s changed the <a>pinned messages</a> for the room.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s changed the pinned messages for the room.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",