Merge pull request #5846 from matrix-org/t3chguy/fix/16822

Improve kick state to not show if the target was not joined to begin with
2021-04-12 14:45:13 +01:00 · 2021-04-12 14:45:13 +01:00 · 4aef7a879a
parent d9adf0ddd8 c1d88be260
commit 4aef7a879a
1 changed files with 3 additions and 2 deletions
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@ -95,9 +95,10 @@ function textForMemberEvent(ev) {
                    senderName,
                    targetName,
                }) + ' ' + reason;
-            } else {
-                // sender is not target and made the target leave, if not from invite/ban then this is a kick
+            } else if (prevContent.membership === "join") {
                return _t('%(senderName)s kicked %(targetName)s.', {senderName, targetName}) + ' ' + reason;
+            } else {
+                return "";
            }
    }
 }