Merge branch 'heart-react' into develop

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\\" />",
       }
     }
   />

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', () => {

app/soapbox/utils/emoji_reacts.js

@@ -7,7 +7,7 @@ import {
 // I've customized them.
 export const ALLOWED_EMOJI = [
   '👍',
-  '❤',
+  '❤️',
   '😆',
   '😮',
   '😢',
@@ -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']);
 };