FIX: correctly uses woman version of previously genderless emojis (#7285)

lib/emoji/db.json

@@ -845,7 +845,7 @@
       "name": "man_shrugging"
     },
     {
-      "code": "1f481",
+      "code": "1f481-200d-2640-fe0f",
       "name": "tipping_hand_woman"
     },
     {
@@ -853,7 +853,7 @@
       "name": "tipping_hand_man"
     },
     {
-      "code": "1f645",
+      "code": "1f645-200d-2640-fe0f",
       "name": "no_good_woman"
     },
     {
@@ -861,7 +861,7 @@
       "name": "no_good_man"
     },
     {
-      "code": "1f646",
+      "code": "1f646-200d-2640-fe0f",
       "name": "ok_woman"
     },
     {
@@ -869,7 +869,7 @@
       "name": "ok_man"
     },
     {
-      "code": "1f64b",
+      "code": "1f64b-200d-2640-fe0f",
       "name": "raising_hand_woman"
     },
     {
@@ -877,7 +877,7 @@
       "name": "raising_hand_man"
     },
     {
-      "code": "1f64e",
+      "code": "1f64e-200d-2640-fe0f",
       "name": "pouting_woman"
     },
     {
@@ -885,7 +885,7 @@
       "name": "pouting_man"
     },
     {
-      "code": "1f64d",
+      "code": "1f64d-200d-2640-fe0f",
       "name": "frowning_woman"
     },
     {
@@ -893,7 +893,7 @@
       "name": "frowning_man"
     },
     {
-      "code": "1f487",
+      "code": "1f487-200d-2640-fe0f",
       "name": "haircut_woman"
     },
     {
@@ -901,7 +901,7 @@
       "name": "haircut_man"
     },
     {
-      "code": "1f486",
+      "code": "1f486-200d-2640-fe0f",
       "name": "massage_woman"
     },
     {

lib/emoji/groups.json

@@ -849,16 +849,12 @@
         "name": "older_woman",
         "diversity": true
       },
-      {
-        "name": "frowning_woman",
-        "diversity": true
-      },
       {
         "name": "frowning_man",
         "diversity": true
       },
       {
-        "name": "pouting_woman",
+        "name": "frowning_woman",
         "diversity": true
       },
       {
@@ -866,7 +862,7 @@
         "diversity": true
       },
       {
-        "name": "no_good_woman",
+        "name": "pouting_woman",
         "diversity": true
       },
       {
@@ -874,7 +870,7 @@
         "diversity": true
       },
       {
-        "name": "ok_woman",
+        "name": "no_good_woman",
         "diversity": true
       },
       {
@@ -882,7 +878,7 @@
         "diversity": true
       },
       {
-        "name": "tipping_hand_woman",
+        "name": "ok_woman",
         "diversity": true
       },
       {
@@ -890,13 +886,17 @@
         "diversity": true
       },
       {
-        "name": "raising_hand_woman",
+        "name": "tipping_hand_woman",
         "diversity": true
       },
       {
         "name": "raising_hand_man",
         "diversity": true
       },
+      {
+        "name": "raising_hand_woman",
+        "diversity": true
+      },
       {
         "name": "bowing_man",
         "diversity": true
@@ -1201,22 +1201,22 @@
         "name": "woman_zombie",
         "diversity": false
       },
-      {
-        "name": "massage_woman",
-        "diversity": true
-      },
       {
         "name": "massage_man",
         "diversity": true
       },
       {
-        "name": "haircut_woman",
+        "name": "massage_woman",
         "diversity": true
       },
       {
         "name": "haircut_man",
         "diversity": true
       },
+      {
+        "name": "haircut_woman",
+        "diversity": true
+      },
       {
         "name": "walking_man",
         "diversity": true