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/4] Fix heart emoji react for Pleroma develop branch

---
 app/soapbox/utils/emoji_reacts.js | Bin 3419 -> 3422 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js
index 03b80a39ac2bfb2e06b358e9cf3a9e45893ad7c2..ae73df16521d76a74e450655c229efc910712cc7 100644
GIT binary patch
delta 14
WcmcaDbx&%-PUiPJ`Zw-e!~+00{0E2t

delta 10
Scmca7bz5q}&W(E(@c;lGa|KcW


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/4] Fix emoji heart tests

---
 .../__snapshots__/emoji_selector-test.js.snap |   2 +-
 .../utils/__tests__/emoji_reacts-test.js      | Bin 8307 -> 8322 bytes
 app/soapbox/utils/emoji_reacts.js             | Bin 3422 -> 3473 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

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 6b63070125..80bd49f8ec 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 4663304b29366b315d74b7fce626c3b5bce576fe..e21dda5e14ca6d8fdae735b7d7457103b2d73ca6 100644
GIT binary patch
delta 16
YcmezD(B!ybmDuDc0jbSf#rAOm06z2v!vFvP

delta 16
YcmZp2{Oqt{mDuD0ah}ab#rARn06yOa;Q#;t

diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js
index ae73df16521d76a74e450655c229efc910712cc7..774fdba39f16cb599a670d269566e5dd488c6b9e 100644
GIT binary patch
delta 51
zcmca7HBoxQ0}ghL;*!LY(&EXo9Ey`)anvyDC>Tsm<5cETP)N+l$uCb$am~%o%G}(_
Hd6O9c)Xfpq

delta 31
ncmbOzeNSq`0}i(0lEjkI;>j$W4U-c%WtdacH8=0zyvYmzz5)v-


From e4344c956101129d80651de6f791a84c612d730c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 24 Dec 2020 18:17:53 -0600
Subject: [PATCH 3/4] Let allowedEmoji be customizable by the admin, fixes #538

---
 app/soapbox/actions/soapbox.js                | Bin 1947 -> 2055 bytes
 app/soapbox/components/emoji_selector.js      | Bin 910 -> 1166 bytes
 app/soapbox/components/status.js              | Bin 17922 -> 17965 bytes
 app/soapbox/components/status_action_bar.js   | Bin 15302 -> 15418 bytes
 app/soapbox/containers/status_container.js    | Bin 6306 -> 6429 bytes
 .../features/status/components/action_bar.js  | Bin 12458 -> 12554 bytes
 .../status/components/detailed_status.js      | Bin 7413 -> 7409 bytes
 .../components/status_interaction_bar.js      | Bin 2203 -> 2588 bytes
 app/soapbox/features/status/index.js          | Bin 16717 -> 16897 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js
index 58a2417c710912dcb64a8be11adc6ddfdbc93db4..ee203dbb15efedac73ef0086895fa15c2f4e5f2d 100644
GIT binary patch
delta 144
zcmbQu-!8DBm#JPsAu%T>zdSX?H8(#i(@McJH@CDTF)1h2C$qRjBbrMA2-H8!pV+Ie
z17Sa!yX5_jei-k={26UX>~%=&MM&(GV0Nsg4p*(FH5XTEML~X1i9%Xw-sCw<Hk<D-
H?Pmc1*4{8R

delta 21
ccmZn{n9aYTmud1}CT|v()YO8_9?bh$09OhJp#T5?

diff --git a/app/soapbox/components/emoji_selector.js b/app/soapbox/components/emoji_selector.js
index 7ef0e2b0ac91838a6cec67def391fafe194397b8..4cd0395e3f0e8df1275a880e8579810c109646fc 100644
GIT binary patch
delta 389
zcmZXQ!AiqG5Qd2drHl9sb4vn^1#enfgreZB5MN-EOiE;TC+toz5Q-<S#n9LA<`a4H
zHC$^e4IXFsX1@7nbG8}1-DeM4H!L%S%f{k@bWH{gLupAvXi?^zR0kxfJ(J`ID4dGQ
z^Om85oQ%PoVLh0%STt?l&aXOHA*UqkjM@d6vReI-?zcPfrizT4?CbtLe(_5kgO+v5
zlJSw2mTCtxa6cu?<`8uPKq^JgSlnrPs&4*yq8%JxdVdriqhUN2>v$>zwz~`kma<U{
xxBDoOz8;EWkt^vO>_jOlAD1j(%V-J*gFkLhgU^fc;Ii#k(4QasKVDBp!8dGej=cZ?

delta 118
zcmeC<>|>wcW>l@<=;Pxb?&=cn>g(_2sZgtsR+OKspkADxSdf%op<h~(nNzHvnwy`M
z8DEr|m|RjkafRJvB}RGv)QW=qq7sFa)U?FXoDzk}7Z_#Of<P+tCjVr7IQa$BL|zo5
KH@7l#G6DdHJ1J2B

diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index 175d6a0e4804284cf2abaad9ff0f7351d629f55c..95abc4eb153851b1ed39f65d271ab3b3e6a921c5 100644
GIT binary patch
delta 38
ucmZqbVO-n8xM3|XpMpYSPELM#YKm)aepcq>i=3h?Ihn;Jn^*EiS^xkOI1U;B

delta 14
VcmZ46!`RfrxM3~t<{P}B762|Z1=#=q

diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js
index 92123b704ff1beae108f9afbc97b4a9e4fe77134..1c2a9207b550549c6ce52d556cdd818e2d5bb72a 100644
GIT binary patch
delta 126
zcmX?BzN=zG9Y3FfLSjx%etBw&Yi@p4=Hv%FqAWR?#U-1o_`6snbrec6GK=*Jit-DJ
i^^nzVW)bO;;L}0TyLp1n6Gn9N^7OLMmEF*L#{&SRH7_Fo

delta 35
tcmV+;0Nnq&c*b|Ieh;&$4~7J@NED11lh79xv-d2|0h8J;WV1{!?hGTJ53v9M

diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js
index 02dc76c21e6badea6002ff3f314af8cf78a67a31..989b393c557ae73668c35da1779178892fac4ec3 100644
GIT binary patch
delta 133
zcmZ2vIM-;yE@sQj+=Bd~5`}7o^wg5z{KSH!{0is%ytK@8g<6HQqWoM1^<s#qeqwS-
zW`16=K9s+CJM&={O9h3*oSgjf)D+j;{H#nX3{y0UOA<>`HT8g|Yp5eD-CV+<CjbCV
CJ~7<@

delta 17
ZcmbPhw8(J7F6PbOm=CaQ{>q^t002mG2WS8Q

diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js
index 886e1a2b495f0780411b998eed10aa61cb675a75..6fb88fb865754ee2f9d1ff4d1e28e2c7228bcdff 100644
GIT binary patch
delta 126
zcmZ3L*p;-wiceiZAu%T>zdSX?H8(#i(@McJH@CDTF)1fCpeVl}q_QBjST85DxMZ^#
v-vky(9fgvN%woL)pj5FQvcAp7gj_lKbWqHiyih=NvVzQWG~vzcvWtZQcP=f$

delta 26
icmeB5T9vrLif?l&Uk}S>E@4;B$+0qjHmA!j76t%^sR_9N

diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js
index 6f8608d5e7a22ce3ebaf381ce112508589530eaa..5735589f5e6c03c61a6ef449cd0bd263856d5979 100644
GIT binary patch
delta 16
Xcmexr`O$KN9rI)dX3@>z%=07xJIMw4

delta 37
scmexp`PFiR9kWEWLU2i9NolcXUP)?EVsc4lex6fekwWd}Am;g!03S#Wa{vGU

diff --git a/app/soapbox/features/status/components/status_interaction_bar.js b/app/soapbox/features/status/components/status_interaction_bar.js
index b81ce6087e4bf979febee407b3d74d0b3d3ff85a..d921efca085d5292b522ecd18cfcdb5d2f65e191 100644
GIT binary patch
delta 397
zcmZ9I!AiqG5I{+xmw<@q#e*>7AqklD<VC3n#e)Z-(4K{DvWY9%on?1|fl~YhOOAT<
z2gI9S<6n4nTiep~I5ThN&CJ`u`_b#e<W9<p*repc%J2b7jfyLR+@OTOaF$Xm)<~=!
z6Q^q^xblVL4Z##rREnnrvsS0!Syg|IFT9rxSa2F4(-W)*sB%$kI_!V8=ZpfC?X6-b
z@!fDsAekN!BR<BVL2aQAb`e7V8p5d$z{(Pzd3G!DNnAqPb1#Z;Nk@q*guyl&MCbl2
zavEMQkI8t>s*>PlbyK(_j{Iiso$a+A*L-`${>}>X)5C633QNsN=jRxJ9)(TxV)bNO
K|MlDX=>7rD6OWz%

delta 43
zcmbOuGFxy$+{RPdj2v946$SZ4B?^-dGAXkKr6wkq=uQ5}ls>tc`OfA#mU*lITTl=j

diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index c4b7590afaf38c9063eb5906085cae0f5af103a0..f64ac5f74f315f3680dcc18786c2b7160726372e 100644
GIT binary patch
delta 162
zcmX@x#Ms!vxZw+%WM*zbeo=`+wL*GoNpOB*K~jE&bADc0X8Pm{Y*K6xfz2P;T(~S1
z6cTfC^2<|GTyyiYGOaK)XcU(umZWOx0S(enM^?I7S8%<)I;wWt>XMAiV!eW*{DNXV
PWW|#Y+6qs;?~n%oiWxo1

delta 23
fcmZo{VLaQ!xZw-iW&?IduFabSm+McS;8+L%ar6mS


From 83d7622e172cce3130182ab5ed0638914824a6c4 Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Thu, 24 Dec 2020 22:48:22 -0700
Subject: [PATCH 4/4] Fix emoji selector test failing

---
 .../components/__tests__/emoji_selector-test.js | Bin 332 -> 344 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/soapbox/components/__tests__/emoji_selector-test.js b/app/soapbox/components/__tests__/emoji_selector-test.js
index c475aae4b7aab47c4ac81fcae9da01e7db045f2a..c8083c3aa7ca2cf0d04b3d22ba0301735bbd8c0c 100644
GIT binary patch
delta 75
zcmX@Zbc1Pvl3uk!a#3nxNvd;xZb5!tYF>##twLH+ey)OgaeiV!QhtSgNosLPd`4<c
SL26O)M3;&DXzC|E$p8R6iygTD

delta 63
zcmcb?bcShyl2TD>UP@|FYLP-(QGTw1dQoa(a*1w9YH^7!OlD%hM1B}sFBzzyBz5A4
F3;_Dd7}5X$