From f091fad794b2faf7bb5ff8bc8d4cd589157c31bd Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sat, 19 Jan 2019 04:19:53 +0300
Subject: [PATCH] Drop various things, change things, hopefully it works now

---
 emojireplace.py          | 22 ++++++++++------------
 patches/mutant/831.patch | 12 +-----------
 patches/mutant/832.patch | 12 +-----------
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/emojireplace.py b/emojireplace.py
index f01cf0c..c7ffe37 100644
--- a/emojireplace.py
+++ b/emojireplace.py
@@ -20,23 +20,21 @@ custom_emojis = {"1f4af-200d-1f308.png": "emoji_1f4af_1f308.png",
                  "1f9d1-200d-1f4bb.png": "emoji_1f9d1_1f4bb.png",
                  "1f9d1-200d-1f373.png": "emoji_1f9d1_1f373.png",
                  "10169a.png": "emoji_10169a.png",
-                 "26b2.png": "emoji_26b2.png",
-                 "26a8.png": "emoji_26a8.png",
-                 "26a7.png": "emoji_26a7.png",
-                 "26a5.png": "emoji_26a5.png",
-                 "26a4.png": "emoji_26a4.png",
-                 "26a3.png": "emoji_26a3.png",
-                 "26a2.png": "emoji_26a2.png",
-                 "2674.png": "emoji_2674.png",
-                 "2642.png": "emoji_2642.png",
-                 "2640.png": "emoji_2640.png",
-                 "25be.png": "emoji_25be.png",
+                 "26b2-fe0f.png": "emoji_26b2.png",
+                 "26a8-fe0f.png": "emoji_26a8.png",
+                 "26a7-fe0f.png": "emoji_26a7.png",
+                 "26a5-fe0f.png": "emoji_26a5.png",
+                 "26a4-fe0f.png": "emoji_26a4.png",
+                 "26a3-fe0f.png": "emoji_26a3.png",
+                 "26a2-fe0f.png": "emoji_26a2.png",
+                 "2674-fe0f.png": "emoji_2674.png",
+                 "2642-fe0f.png": "emoji_2642.png",
+                 "2640-fe0f.png": "emoji_2640.png",
                  "1f9e1.png": "emoji_1f9e1.png",
                  "101685.png": "emoji_101685.png",
                  "101684.png": "emoji_101684.png",
                  "101683.png": "emoji_101683.png",
                  "101682.png": "emoji_101682.png",
-                 "262d.png": "emoji_262d.png",
                  "1f9fb.png": "emoji_1f9fb.png",
                  "1f9f1.png": "emoji_1f9f1.png",
                  "1f9e8.png": "emoji_1f9e8.png",
diff --git a/patches/mutant/831.patch b/patches/mutant/831.patch
index 11192b7..43c89e5 100644
--- a/patches/mutant/831.patch
+++ b/patches/mutant/831.patch
@@ -369,11 +369,6 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
 +       "surrogates": "♀"
 +     },
 +     {
-+       "names": ["black_medium_small_square"],
-+       "hasDiversity": false,
-+       "surrogates": "▾"
-+     },
-+     {
 +       "names": ["orange_heart"],
 +       "hasDiversity": false,
 +       "surrogates": "🧡"
@@ -397,11 +392,6 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
 +       "names": ["pink_triangle"],
 +       "hasDiversity": false,
 +       "surrogates": "􁚂"
-+     },
-+     {
-+       "names": ["hammer_and_sickle"],
-+       "hasDiversity": false,
-+       "surrogates": "☭"
       }
     ],
     "objects": [
@@ -641,4 +631,4 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
       }
     ]
   }
-\ No newline at end of file
\ No newline at end of file
+\ No newline at end of file
diff --git a/patches/mutant/832.patch b/patches/mutant/832.patch
index 11192b7..43c89e5 100644
--- a/patches/mutant/832.patch
+++ b/patches/mutant/832.patch
@@ -369,11 +369,6 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
 +       "surrogates": "♀"
 +     },
 +     {
-+       "names": ["black_medium_small_square"],
-+       "hasDiversity": false,
-+       "surrogates": "▾"
-+     },
-+     {
 +       "names": ["orange_heart"],
 +       "hasDiversity": false,
 +       "surrogates": "🧡"
@@ -397,11 +392,6 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
 +       "names": ["pink_triangle"],
 +       "hasDiversity": false,
 +       "surrogates": "􁚂"
-+     },
-+     {
-+       "names": ["hammer_and_sickle"],
-+       "hasDiversity": false,
-+       "surrogates": "☭"
       }
     ],
     "objects": [
@@ -641,4 +631,4 @@ diff -crB -x dist -x res -x build com.discord-831/assets/data/emojis.json com.di
       }
     ]
   }
-\ No newline at end of file
\ No newline at end of file
+\ No newline at end of file