diff --git a/src/Notifier.js b/src/Notifier.js
index 36a6f13bb6..ec92840998 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -37,6 +37,18 @@ import SettingsStore, {SettingLevel} from "./settings/SettingsStore";
const MAX_PENDING_ENCRYPTED = 20;
+/*
+Override both the content body and the TextForEvent handler for specific msgtypes, in notifications.
+This is useful when the content body contains fallback text that would explain that the client can't handle a particular
+type of tile.
+*/
+const typehandlers = {
+ "m.key.verification.request": (event) => {
+ const name = (event.sender || {}).name;
+ return _t("%(name)s is requesting verification", { name });
+ },
+};
+
const Notifier = {
notifsByRoom: {},
@@ -46,6 +58,9 @@ const Notifier = {
pendingEncryptedEventIds: [],
notificationMessageForEvent: function(ev) {
+ if (typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+ return typehandlers[ev.getContent().msgtype](ev);
+ }
return TextForEvent.textForEvent(ev);
},
@@ -69,7 +84,9 @@ const Notifier = {
title = room.name;
// notificationMessageForEvent includes sender,
// but we already have the sender here
- if (ev.getContent().body) msg = ev.getContent().body;
+ if (ev.getContent().body && !typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+ msg = ev.getContent().body;
+ }
} else if (ev.getType() === 'm.room.member') {
// context is all in the message here, we don't need
// to display sender info
@@ -78,7 +95,9 @@ const Notifier = {
title = ev.sender.name + " (" + room.name + ")";
// notificationMessageForEvent includes sender,
// but we've just out sender in the title
- if (ev.getContent().body) msg = ev.getContent().body;
+ if (ev.getContent().body && !typehandlers.hasOwnProperty(ev.getContent().msgtype)) {
+ msg = ev.getContent().body;
+ }
}
if (!this.isBodyEnabled()) {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4a2edf66a6..aa2f0aa819 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -125,6 +125,7 @@
"This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.": "This action requires accessing the default identity server to validate an email address or phone number, but the server does not have any terms of service.",
"Only continue if you trust the owner of the server.": "Only continue if you trust the owner of the server.",
"Trust": "Trust",
+ "%(name)s is requesting verification": "%(name)s is requesting verification",
"Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
"Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
"Unable to enable Notifications": "Unable to enable Notifications",