From 68836b9c680128a99588d28fbd30ca1a845fb141 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 6 Sep 2021 14:59:30 +0100 Subject: [PATCH 1/3] hide no-op m.room.encryption events and better word param changes --- src/components/views/messages/EncryptionEvent.tsx | 15 ++++++++++++--- src/i18n/strings/en_EN.json | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx index 0f716ed010d..88b96e0c5ef 100644 --- a/src/components/views/messages/EncryptionEvent.tsx +++ b/src/components/views/messages/EncryptionEvent.tsx @@ -22,20 +22,27 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg'; import EventTileBubble from "./EventTileBubble"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import DMRoomMap from "../../../utils/DMRoomMap"; +import { objectHasDiff } from "../../../utils/objects"; interface IProps { mxEvent: MatrixEvent; } +const ALGORITHM = "m.megolm.v1.aes-sha2"; + const EncryptionEvent = forwardRef(({ mxEvent }, ref) => { const cli = useContext(MatrixClientContext); const roomId = mxEvent.getRoomId(); const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId); - if (mxEvent.getContent().algorithm === 'm.megolm.v1.aes-sha2' && isRoomEncrypted) { + if (!objectHasDiff(mxEvent.getPrevContent(), mxEvent.getContent())) return null; // nop + + if (mxEvent.getContent().algorithm === ALGORITHM && isRoomEncrypted) { let subtitle: string; const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId); - if (dmPartner) { + if (mxEvent.getPrevContent().algorithm === ALGORITHM) { + subtitle = _t("Some encryption parameters have been changed."); + } else if (dmPartner) { const displayName = cli?.getRoom(roomId)?.getMember(dmPartner)?.rawDisplayName || dmPartner; subtitle = _t("Messages here are end-to-end encrypted. " + "Verify %(displayName)s in their profile - tap on their avatar.", { displayName }); @@ -49,7 +56,9 @@ const EncryptionEvent = forwardRef(({ mxEvent }, ref) => title={_t("Encryption enabled")} subtitle={subtitle} />; - } else if (isRoomEncrypted) { + } + + if (isRoomEncrypted) { return Date: Tue, 7 Sep 2021 12:01:18 +0100 Subject: [PATCH 2/3] add comment --- src/components/views/messages/EncryptionEvent.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx index 88b96e0c5ef..80b60f1fe71 100644 --- a/src/components/views/messages/EncryptionEvent.tsx +++ b/src/components/views/messages/EncryptionEvent.tsx @@ -35,6 +35,7 @@ const EncryptionEvent = forwardRef(({ mxEvent }, ref) => const roomId = mxEvent.getRoomId(); const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId); + // if no change happened then skip rendering this, a shallow check is enough as events are parsed JSON if (!objectHasDiff(mxEvent.getPrevContent(), mxEvent.getContent())) return null; // nop if (mxEvent.getContent().algorithm === ALGORITHM && isRoomEncrypted) { From 467fb55e8ecaecf6083e49538464d1a8b81041cc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 8 Sep 2021 12:53:13 +0100 Subject: [PATCH 3/3] improve typing & comment --- src/components/views/messages/EncryptionEvent.tsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/views/messages/EncryptionEvent.tsx b/src/components/views/messages/EncryptionEvent.tsx index 80b60f1fe71..8f352610e0d 100644 --- a/src/components/views/messages/EncryptionEvent.tsx +++ b/src/components/views/messages/EncryptionEvent.tsx @@ -16,6 +16,7 @@ limitations under the License. import React, { forwardRef, useContext } from 'react'; import { MatrixEvent } from "matrix-js-sdk/src/models/event"; +import { IRoomEncryption } from "matrix-js-sdk/src/crypto/RoomList"; import { _t } from '../../../languageHandler'; import { MatrixClientPeg } from '../../../MatrixClientPeg'; @@ -35,13 +36,16 @@ const EncryptionEvent = forwardRef(({ mxEvent }, ref) => const roomId = mxEvent.getRoomId(); const isRoomEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId); - // if no change happened then skip rendering this, a shallow check is enough as events are parsed JSON - if (!objectHasDiff(mxEvent.getPrevContent(), mxEvent.getContent())) return null; // nop + const prevContent = mxEvent.getPrevContent() as IRoomEncryption; + const content = mxEvent.getContent(); - if (mxEvent.getContent().algorithm === ALGORITHM && isRoomEncrypted) { + // if no change happened then skip rendering this, a shallow check is enough as all known fields are top-level. + if (!objectHasDiff(prevContent, content)) return null; // nop + + if (content.algorithm === ALGORITHM && isRoomEncrypted) { let subtitle: string; const dmPartner = DMRoomMap.shared().getUserIdForRoomId(roomId); - if (mxEvent.getPrevContent().algorithm === ALGORITHM) { + if (prevContent.algorithm === ALGORITHM) { subtitle = _t("Some encryption parameters have been changed."); } else if (dmPartner) { const displayName = cli?.getRoom(roomId)?.getMember(dmPartner)?.rawDisplayName || dmPartner;