From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 1 Feb 2019 10:41:34 +0000 (+0100)
Subject: Fix hashtag processing when sending toots
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=762e4fdf557ff7cbdd9fce301060f11bb23cb84e;p=mastodon.git

Fix hashtag processing when sending toots

This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
---

diff --git a/app/javascript/flavours/glitch/util/hashtag.js b/app/javascript/flavours/glitch/util/hashtag.js
index d5ea57662..9b663487f 100644
--- a/app/javascript/flavours/glitch/util/hashtag.js
+++ b/app/javascript/flavours/glitch/util/hashtag.js
@@ -2,7 +2,7 @@ export function recoverHashtags (recognizedTags, text) {
   return recognizedTags.map(tag => {
       const re = new RegExp(`(?:^|[^\/\)\w])#(${tag.name})`, 'i');
       const matched_hashtag = text.match(re);
-      return matched_hashtag ? matched_hashtag[1] : tag;
+      return matched_hashtag ? matched_hashtag[1] : null;
     }
-  );
+  ).filter(x => x !== null);
 }