From fafdc8ef8aecc4c8b15f18f0994533863d612264 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 11 Dec 2020 09:12:54 -0600
Subject: [PATCH 1/2] Fix heart emoji react for Pleroma develop branch

---
 app/soapbox/utils/emoji_reacts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js
index 03b80a39a..ae73df165 100644
--- a/app/soapbox/utils/emoji_reacts.js
+++ b/app/soapbox/utils/emoji_reacts.js
@@ -7,7 +7,7 @@ import {
 // I've customized them.
 export const ALLOWED_EMOJI = [
   '👍',
-  '❤',
+  '❤️',
   '😆',
   '😮',
   '😢',

From 3d4bd238707a12c466c64e699e369774edc1118a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 24 Dec 2020 14:40:47 -0600
Subject: [PATCH 2/2] Fix emoji heart tests

---
 .../__tests__/__snapshots__/emoji_selector-test.js.snap      | 2 +-
 app/soapbox/utils/__tests__/emoji_reacts-test.js             | 2 +-
 app/soapbox/utils/emoji_reacts.js                            | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
index 6b6307012..80bd49f8e 100644
--- a/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
+++ b/app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
@@ -16,7 +16,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
     className="emoji-react-selector__emoji"
     dangerouslySetInnerHTML={
       Object {
-        "__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
+        "__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤️\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
       }
     }
   />
diff --git a/app/soapbox/utils/__tests__/emoji_reacts-test.js b/app/soapbox/utils/__tests__/emoji_reacts-test.js
index 4663304b2..e21dda5e1 100644
--- a/app/soapbox/utils/__tests__/emoji_reacts-test.js
+++ b/app/soapbox/utils/__tests__/emoji_reacts-test.js
@@ -158,7 +158,7 @@ describe('getReactForStatus', () => {
         ],
       },
     });
-    expect(getReactForStatus(status)).toEqual('❤');
+    expect(getReactForStatus(status, ALLOWED_EMOJI)).toEqual('❤');
   });
 
   it('returns a thumbs-up for a favourite', () => {
diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js
index ae73df165..774fdba39 100644
--- a/app/soapbox/utils/emoji_reacts.js
+++ b/app/soapbox/utils/emoji_reacts.js
@@ -75,11 +75,12 @@ export const reduceEmoji = (emojiReacts, favouritesCount, favourited, allowedEmo
     emojiReacts, favouritesCount, favourited,
   ))), allowedEmoji));
 
-export const getReactForStatus = status => {
+export const getReactForStatus = (status, allowedEmoji=ALLOWED_EMOJI) => {
   return reduceEmoji(
     status.getIn(['pleroma', 'emoji_reactions'], ImmutableList()),
-    status.get('favourites_count'),
+    status.get('favourites_count', 0),
     status.get('favourited'),
+    allowedEmoji,
   ).filter(e => e.get('me') === true)
     .getIn([0, 'name']);
 };