From aefa37c882a5d7f740101b483531d42e74b9365d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?n=CE=B9c=D0=BDola=D1=95=20w=CE=B9lde?= <ncwilde43@gmail.com>
Date: Mon, 29 Aug 2022 12:41:20 -0700
Subject: [PATCH] feat: sort emoji
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nιcнolaѕ wιlde <ncwilde43@gmail.com>
---
 Taskfile.yaml       |  23 ++++++
 includes/emoji.yaml | 188 ++++++++++++++++++++++----------------------
 2 files changed, 117 insertions(+), 94 deletions(-)

diff --git a/Taskfile.yaml b/Taskfile.yaml
index 9c69d8045..6de469eb5 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -76,6 +76,29 @@ tasks:
     cmds:
       - cook server
     silent: true
+  emoji:
+    desc: Show available emoji
+    cmds:
+      - yq '.emoji' includes/emoji.yaml
+  emoji-ing:
+    desc: Show available ingredients emoji
+    cmds:
+      - yq '.emoji.ingredients' includes/emoji.yaml
+  emoji-cw:
+    desc: Show available cookware emoji
+    cmds:
+      - yq '.emoji.cookware' includes/emoji.yaml
+  emoji-search:
+    desc: Search for emoji
+    cmds:
+      - yq '.emoji.ingredients[]|pick(["{{ .SHORTCODE }}"])|select(length>0)' includes/emoji.yaml
+  emoji-sort:
+    desc: Sort emoji.yaml
+    cmds:
+      - yq -i 'sort_keys(.emoji)' includes/emoji.yaml
+      - yq -i '.emoji.cookware|=sort_by(keys | .[0])' includes/emoji.yaml
+      - yq -i '.emoji.ingredients|=sort_by(keys | .[0])' includes/emoji.yaml
+      - yq includes/emoji.yaml
   sort:
     desc: Sort dictionary.txt
     cmds:
diff --git a/includes/emoji.yaml b/includes/emoji.yaml
index 2d8a2be6c..e218e33f7 100644
--- a/includes/emoji.yaml
+++ b/includes/emoji.yaml
@@ -1,41 +1,59 @@
 ---
 emoji:
+  cookware:
+    - bowl_with_spoon:
+        - large bowl
+    - cookie:
+        - baking sheet
+    - page_facing_up:
+        - parchment paper
+    - shallow_pan_of_food:
+        - medium saucepan
+    - spoon:
+        - spatula
   ingredients:
-    - seedling:
-        - pumpkin seeds
-        - sunflower seeds
-        - pepitas
-    - hot_pepper:
-        - chile
-        - paprika
-        - chili powder
-    - droplet:
-        - water
-    - hotsprings:
-        - hot water
-    - tumbler_glass:
-        - rum
-    - fallen_leaf:
-        - bay leaf
+    - bell_pepper:
+        - bell pepper
+    - bread:
+        - bread crumbs
+        - bread
+    - butter:
+        - butter
     - candy:
         - sugar
         - powdered sugar
         - confectioner's sugar
-    - maple_leaf:
-        - maple syrup
-        - syrup
-        - molasses
-        - brown sugar
-    - honey_pot:
-        - honey
+    - carrot:
+        - carrot
+        - frozen vegetables
+    - curry:
+        - curry powder
+    - droplet:
+        - water
+    - ear_of_rice:
+        - flour
+    - eggplant:
+        - eggplant
+    - fallen_leaf:
+        - bay leaf
+    - garlic:
+        - garlic
+        - shallot
+    - glass_of_milk:
+        - milk
+        - whole milk
+        - lowfat milk
+        - skim milk
     - grapes:
         - grapes
         - grape jelly
         - grape jam
-    - strawberry:
-        - strawberries
-        - strawberry jam
-        - strawberry jelly
+    - green_circle:
+        - peas
+        - pea pods
+    - green_salad:
+        - vinaigrette
+        - dressing
     - herb:
         - cumin
         - basil
@@ -44,8 +62,23 @@ emoji:
         - oregano
         - cilantro
         - coriander
-    - bell_pepper:
-        - bell pepper
+    - honey_pot:
+        - honey
+    - hot_pepper:
+        - chile
+        - paprika
+        - chili powder
+    - hotsprings:
+        - hot water
+    - ice_cream:
+        - vanilla
+        - icecream
+    - ice_cube:
+        - ice water
+    - leafy_green:
+        - cabbage
+        - red cabbage
+        - shredded cabbage
     - lemon:
         - lemon
         - lemon juice
@@ -53,76 +86,43 @@ emoji:
         - lime
         - lime juice
         - lime zest
-    - tangerine:
-        - tangerine
-        - orange
-    - curry:
-        - curry powder
-    - ear_of_rice:
-        - flour
-    - carrot:
-        - carrot
-        - frozen vegetables
-    - eggplant:
-        - eggplant
-    - green_circle:
-        - peas
-        - pea pods
-    - garlic:
-        - garlic
-        - shallot
-    - onion:
-        - onion
-    - salt:
-        - salt
-        - pepper
-    - green_salad:
-        - vinaigrette
-        - dressing
-    - takeout_box:
-        - soysauce
-    - spaghetti:
-        - spaghetti
-    - tomato:
-        - tomato
-        - marinara sauce
-    - bread:
-        - bread crumbs
-        - bread
+    - maple_leaf:
+        - maple syrup
+        - syrup
+        - molasses
+        - brown sugar
     - microbe:
         - nutritional yeast
     - olive:
         - olive
         - olive oil
-    - ice_cream:
-        - vanilla
-        - icecream
-    - rice:
-        - rice
-    - ice_cube:
-        - ice water
-    - leafy_green:
-        - cabbage
-        - red cabbage
-        - shredded cabbage
+    - onion:
+        - onion
     - peanuts:
         - peanuts
         - peanut butter
-    - butter:
-        - butter
-    - glass_of_milk:
-        - milk
-        - whole milk
-        - lowfat milk
-        - skim milk
-  cookware:
-    - cookie:
-        - baking sheet
-    - page_facing_up:
-        - parchment paper
-    - spoon:
-        - spatula
-    - bowl_with_spoon:
-        - large bowl
-    - shallow_pan_of_food:
-        - medium saucepan
+    - rice:
+        - rice
+    - salt:
+        - salt
+        - pepper
+    - seedling:
+        - pumpkin seeds
+        - sunflower seeds
+        - pepitas
+    - spaghetti:
+        - spaghetti
+    - strawberry:
+        - strawberries
+        - strawberry jam
+        - strawberry jelly
+    - takeout_box:
+        - soysauce
+    - tangerine:
+        - tangerine
+        - orange
+    - tomato:
+        - tomato
+        - marinara sauce
+    - tumbler_glass:
+        - rum