From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 11 May 2017 00:22:40 +0000 (+0900)
Subject: Refine unescapeHTML (#2977)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7ff84cb07e799ae997b1f8bcc1e1a1bddd178dfb;p=mastodon.git

Refine unescapeHTML (#2977)
---

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 61a245822..1be4ae3a1 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -1,7 +1,6 @@
 import api, { getLinks } from '../api'
 import Immutable from 'immutable';
 import IntlMessageFormat from 'intl-messageformat';
-import { unescape } from 'lodash';
 import { fetchRelationships } from './accounts';
 
 export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
@@ -25,7 +24,11 @@ const fetchRelatedRelationships = (dispatch, notifications) => {
   }
 };
 
-const unescapeHTML = (html) => unescape(html).replace(/<\/?\w+(?:\s[^>]*)?>/g, '');
+const unescapeHTML = (html) => {
+  const wrapper = document.createElement('div');
+  wrapper.innerHTML = html;
+  return wrapper.textContent;
+}
 
 export function updateNotifications(notification, intlMessages, intlLocale) {
   return (dispatch, getState) => {