From 2b71123ddcacb103d2338d8d525fd4922d24ff68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 6 May 2017 01:45:28 +0100
Subject: [PATCH] suppress null member rejoins again

reverts https://github.com/matrix-org/matrix-react-sdk/commit/f5fe4b24336a8245b5a08050fefe13b9999d92fb
should fix https://github.com/vector-im/riot-web/issues/3788
---
 src/TextForEvent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 40d6a49998..3f200a089d 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -65,8 +65,8 @@ function textForMemberEvent(ev) {
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
                     return senderName + " set a profile picture";
                 } else {
-                    // hacky hack for https://github.com/vector-im/vector-web/issues/2020
-                    return senderName + " rejoined the room.";
+                    // suppress null rejoins
+                    return '';
                 }
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);