From e24d3cd67105f5d5b1e2f1b6750a79ccc1acce5a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 10 Jan 2019 15:15:45 -0700
Subject: [PATCH] Render a tile for tombstone events
Fixes https://github.com/vector-im/riot-web/issues/7997
This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though.
---
src/TextForEvent.js | 6 ++++++
src/components/views/rooms/EventTile.js | 1 +
src/i18n/strings/en_EN.json | 1 +
3 files changed, 8 insertions(+)
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 96cccf07fb..2a37295f83 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -129,6 +129,11 @@ function textForRoomNameEvent(ev) {
});
}
+function textForTombstoneEvent(ev) {
+ const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
+ return _t('%(senderDisplayName)s upgraded this room.', {senderDisplayName});
+}
+
function textForServerACLEvent(ev) {
const senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
const prevContent = ev.getPrevContent();
@@ -433,6 +438,7 @@ const stateHandlers = {
'm.room.power_levels': textForPowerEvent,
'm.room.pinned_events': textForPinnedEvent,
'm.room.server_acl': textForServerACLEvent,
+ 'm.room.tombstone': textForTombstoneEvent,
'im.vector.modular.widgets': textForWidgetEvent,
};
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e978bf438a..692111361a 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -62,6 +62,7 @@ const stateEventTileTypes = {
'm.room.pinned_events': 'messages.TextualEvent',
'm.room.server_acl': 'messages.TextualEvent',
'im.vector.modular.widgets': 'messages.TextualEvent',
+ 'm.room.tombstone': 'messages.TextualEvent',
};
function getHandlerTile(ev) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5afac11b75..0faaa5d99f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -183,6 +183,7 @@
"%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
"%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s removed the room name.",
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
+ "%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s upgraded this room.",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|other": "%(senderName)s added %(addedAddresses)s as addresses for this room.",
"%(senderName)s added %(count)s %(addedAddresses)s as addresses for this room.|one": "%(senderName)s added %(addedAddresses)s as an address for this room.",