From d13a0e621b9a87a50392450c96e7f293cb1e550c Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 24 Jun 2021 00:02:23 +0100
Subject: [PATCH] Do not show No match found for tribute (#16231)

Tribute.js will show an untranslated no match found if no emoji or mentions.

Further the mentions should really require a preceding space.

This PR fixes both of these.

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 web_src/js/features/tribute.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/features/tribute.js b/web_src/js/features/tribute.js
index 851ff74e57..6fdb2f5df0 100644
--- a/web_src/js/features/tribute.js
+++ b/web_src/js/features/tribute.js
@@ -32,7 +32,7 @@ function makeCollections({mentions, emoji}) {
   if (emoji) {
     collections.push({
       values: window.config.tributeValues,
-      noMatchTemplate: () => null,
+      requireLeadingSpace: true,
       menuItemTemplate: (item) => {
         return `
           <div class="tribute-item">
@@ -69,7 +69,7 @@ export default async function attachTribute(elementOrNodeList, {mentions, emoji}
     emoji: emoji || emojiNodes.length > 0,
   });
 
-  const tribute = new Tribute({collection: collections});
+  const tribute = new Tribute({collection: collections, noMatchTemplate: ''});
   for (const node of uniqueNodes) {
     tribute.attach(node);
   }