Version 3.0.0

README.md

@@ -130,3 +130,7 @@ Push the packaged snap to the `edge` channel on the snap store.
 ```bash
 snapcraft push --release=edge <path to .snap>
 ```
+
+### Attribution
+
+Emoji data is sourced from https://raw.githubusercontent.com/hfg-gmuend/openmoji/master/data/openmoji.csv which is compiled by the lovely people at https://openmoji.org.

emote/emojis.py

@@ -1,5 +1,4 @@
-import os
-import json
+import csv
 from collections import defaultdict
 from emote import user_data, config
 
@@ -9,25 +8,41 @@
 
 emojis_by_category = defaultdict(list)
 all_emojis = []
+blocklisted_emoji_categories = ["component", "extras-openmoji", "extras-unicode"]
 
 
 def init():
     global all_emojis
     global emojis_by_category
 
-    if config.is_snap:
-        filename = f"{config.snap_root}/static/emojis.json"
-    else:
-        filename = "static/emojis.json"
-
-    with open(filename, "r") as f:
-        emojis = json.load(f)
-
-        for emoji_key in emojis.keys():
-            emoji = emojis[emoji_key].copy()
-            emoji.update({"name": emoji_key})
-
-            emojis_by_category[emoji["category"]].append(emoji)
+    filename = (
+        f"{config.snap_root}/static/emojis.csv"
+        if config.is_snap
+        else "static/emojis.csv"
+    )
+
+    with open(filename, newline="") as csvfile:
+        reader = csv.DictReader(csvfile)
+
+        for row in reader:
+            category = row["group"]
+
+            if category in blocklisted_emoji_categories:
+                continue
+
+            if row["skintone"] != "":
+                continue
+
+            emoji = {
+                "keywords": row["tags"].split(", "),
+                "char": row["emoji"],
+                "name": " ".join(
+                    [part.capitalize() for part in row["annotation"].split(" ")]
+                ),
+                "shortcode": row["annotation"].replace(" ", "_").replace("-", "_"),
+                "skintone": row["skintone_combination"] == "simple",
+            }
+            emojis_by_category[row["group"]].append(emoji)
             all_emojis.append(emoji)
 
     update_recent_category()
@@ -63,11 +78,11 @@ def get_category_order():
     """
     return [
         ("recent", "Recently Used", "🕙"),
-        ("people", "Smileys & People", "🙂"),
-        ("animals_and_nature", "Animals & Nature", "🐯"),
-        ("food_and_drink", "Food & Drink", "🍔"),
-        ("activity", "Activities", "⚽"),
-        ("travel_and_places", "Travel & Places", "✈️"),
+        ("people-body", "Smileys & People", "🙂"),
+        ("animals-nature", "Animals & Nature", "🐯"),
+        ("food-drink", "Food & Drink", "🍔"),
+        ("activities", "Activities", "⚽"),
+        ("travel-places", "Travel & Places", "✈️"),
         ("objects", "Objects", "💡"),
         ("symbols", "Symbols", "❤️"),
         ("flags", "Flags", "🇺🇳"),

emote/picker.py

@@ -198,10 +198,8 @@ def init_action_bar(self):
     def show_emoji_preview(self, char):
         emoji = emojis.get_emoji_by_char(char)
         self.previewed_emoji_label.set_text(emoji["char"])
-        self.previewed_emoji_shortcode_label.set_text(f':{emoji["name"]}:')
-        self.previewed_emoji_name_label.set_text(
-            " ".join([part.capitalize() for part in emoji["name"].split("_")])
-        )
+        self.previewed_emoji_shortcode_label.set_text(f':{emoji["shortcode"]}:')
+        self.previewed_emoji_name_label.set_text(emoji["name"])
 
     def reset_emoji_preview(self):
         if len(self.current_emojis) > 0: