From b3fdd166e819819a7a8f7cfa540986af047c05fa Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 3 Sep 2018 17:30:55 +0200
Subject: [Glitch] Skip VS15 (Emoji textual presentation)

Port a060beee726de5295e1f608231975a90b7709a0a to glitch-soc
---
 app/javascript/flavours/glitch/util/emoji/index.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/javascript/flavours/glitch/util/emoji/index.js')

diff --git a/app/javascript/flavours/glitch/util/emoji/index.js b/app/javascript/flavours/glitch/util/emoji/index.js
index c6416db2d..82a1ef89c 100644
--- a/app/javascript/flavours/glitch/util/emoji/index.js
+++ b/app/javascript/flavours/glitch/util/emoji/index.js
@@ -62,6 +62,10 @@ const emojify = (str, customEmojis = {}) => {
       const title = shortCode ? `:${shortCode}:` : '';
       replacement = `<img draggable="false" class="emojione" alt="${match}" title="${title}" src="${assetHost}/emoji/${filename}.svg" />`;
       rend = i + match.length;
+      // If the matched character was followed by VS15 (for selecting text presentation), skip it.
+      if (str.codePointAt(rend) === 65038) {
+        rend += 1;
+      }
     }
     rtn += str.slice(0, i) + replacement;
     str = str.slice(rend);
-- 
cgit