Show KDE Connect notification bodies with their quotes intact

shell/plugins/notifications/NotificationLogic.js

@@ -89,8 +89,24 @@ function styledBody(body, app, appIcon) {
   return stripImageTags(sanitizeBody(body, app, appIcon).replace(/\r\n|\r|\n/g, "<br/>"))
 }
 
+// KDE Connect escapes the title and body it relays from a phone before handing
+// them to KNotification, and they reach this server escaped a second time, so
+// a quotation mark arrives as &amp;quot; and StyledText shows &quot; on the
+// card. Undo that one layer for it. Only &amp; is rewritten: it is the sole
+// entity the double escape manufactures, and the rewrite can never produce a
+// `<`, so no tag stripImageTags did not see can come out of it.
+function isKdeConnect(app, appIcon) {
+  var source = (String(app || "") + "\n" + String(appIcon || "")).toLowerCase()
+  return source.indexOf("kdeconnect") >= 0 || source.indexOf("kde connect") >= 0
+}
+
+function undoDoubleEscape(text) {
+  return text.replace(/&amp;(?=(?:[a-z]+|#\d+|#x[0-9a-f]+);)/gi, "&")
+}
+
 function sanitizeBody(body, app, appIcon) {
   var text = stripImageTags(String(body || ""))
+  if (isKdeConnect(app, appIcon)) text = undoDoubleEscape(text)
   if (!isChromiumDerived(app, appIcon)) return text
 
   return text
@@ -450,6 +466,7 @@ if (typeof module !== "undefined") {
   module.exports = {
     isChromiumDerived: isChromiumDerived,
     sanitizeBody: sanitizeBody,
+    isKdeConnect: isKdeConnect,
     styledBody: styledBody,
     summaryStartsWithGlyph: summaryStartsWithGlyph,
     shouldBypassDnd: shouldBypassDnd,

test/shell.d/notifications-test.sh

@@ -18,6 +18,33 @@ assertEqual(
   'notifications strip inline image tags'
 )
 
+assert(notifications.isKdeConnect('KDE Connect', ''), 'notifications detect KDE Connect by name')
+assert(notifications.isKdeConnect('', 'kdeconnect'), 'notifications detect KDE Connect by icon')
+assert(!notifications.isKdeConnect('Slack', ''), 'notifications do not treat unrelated apps as KDE Connect')
+
+// KDE Connect relays phone notifications escaped twice over, so the card
+// would otherwise show the entity names themselves.
+assertEqual(
+  notifications.sanitizeBody('Someone: Reacted \u{1F913} to "\u{1F917}"', 'KDE Connect', ''),
+  'Someone: Reacted \u{1F913} to "\u{1F917}"',
+  'notifications undo one layer of escaping on KDE Connect bodies'
+)
+assertEqual(
+  notifications.sanitizeBody('a <b> c 'd' 'e'', 'KDE Connect', ''),
+  'a <b> c 'd' 'e'',
+  'the undone layer leaves the text escaped once, never as live markup'
+)
+assertEqual(
+  notifications.sanitizeBody('Tom & Jerry & friends', 'KDE Connect', ''),
+  'Tom & Jerry & friends',
+  'a bare & that escapes nothing further is left alone'
+)
+assertEqual(
+  notifications.sanitizeBody('Someone: "hi"', 'Slack', ''),
+  'Someone: "hi"',
+  'other apps keep their entities as sent'
+)
+
 // The body renders as StyledText, which fetches <img src> over the network. The
 // invariant that matters is not a particular output string but that no tag Qt
 // would honour as an image survives, so assert that directly. Tags are bounded