summarylogtreecommitdiffstats
path: root/noto-emoji.patch
blob: 8aa01ee0c7545dfa31227988a37d723d6959f33b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
diff --git a/create-noto-emoji-patch.sh b/create-noto-emoji-patch.sh
new file mode 100755
index 00000000..b1692606
--- /dev/null
+++ b/create-noto-emoji-patch.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# $1 out-path
+set -e
+exec git diff origin/master origin/noto-emoji > ${1:-'noto-emoji.patch'}
diff --git a/package.json b/package.json
index 9a52afe2..9a572cda 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "curve25519-n": "https://github.com/scottnonnenberg-signal/node-curve25519.git#3e94f60bc54b2426476520d8d1a0aa835c25f5cc",
     "draft-js": "0.10.5",
     "emoji-datasource": "5.0.1",
-    "emoji-datasource-apple": "5.0.1",
+    "emoji-datasource-google": "5.0.1",
     "emoji-regex": "8.0.0",
     "fast-glob": "3.2.1",
     "filesize": "3.6.1",
@@ -370,8 +370,8 @@
       "sticker-creator/dist/**",
       "!node_modules/emoji-datasource/emoji_pretty.json",
       "!node_modules/emoji-datasource/**/*.png",
-      "!node_modules/emoji-datasource-apple/emoji_pretty.json",
-      "!node_modules/emoji-datasource-apple/img/apple/sheets*",
+      "!node_modules/emoji-datasource-google/emoji_pretty.json",
+      "!node_modules/emoji-datasource-google/img/google/sheets*",
       "!node_modules/spellchecker/vendor/hunspell/**/*",
       "!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme,test,__tests__,tests,powered-test,example,examples,*.d.ts}",
       "!**/node_modules/.bin",
diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
index 49704d80..4c1157bc 100644
--- a/ts/components/emoji/lib.ts
+++ b/ts/components/emoji/lib.ts
@@ -69,7 +69,7 @@ export type EmojiData = {
 };
 
 const data = (untypedData as Array<EmojiData>)
-  .filter(emoji => emoji.has_img_apple)
+  .filter(emoji => emoji.has_img_google)
   .map(emoji =>
     // Why this weird map?
     // the emoji dataset has two separate categories for Emotions and People
@@ -91,7 +91,7 @@ const ROOT_PATH = get(
 );
 
 const makeImagePath = (src: string) => {
-  return `${ROOT_PATH}node_modules/emoji-datasource-apple/img/apple/64/${src}`;
+  return `${ROOT_PATH}node_modules/emoji-datasource-google/img/google/64/${src}`;
 };
 
 const imageQueue = new PQueue({ concurrency: 10 });
diff --git a/yarn.lock b/yarn.lock
index 028c8fcd..40595788 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6530,10 +6530,10 @@ email-validator@^2.0.4:
   resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
   integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
 
-emoji-datasource-apple@5.0.1:
+emoji-datasource-google@5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emoji-datasource-apple/-/emoji-datasource-apple-5.0.1.tgz#fd3a3fb9993f1c58a53b015e3a30fe640641044f"
-  integrity sha512-VmbD3iwv5FS2XUuxzmRpkicGNwXWrMe45f5ZL6YkcMznp0YtCsKO2bCxsSZ41XU1aWtwH5IZDqF12038TC01kw==
+  resolved "https://registry.yarnpkg.com/emoji-datasource-google/-/emoji-datasource-google-5.0.1.tgz#81ac5bdbbd153976196a516d840e04303f19375d"
+  integrity sha512-JLlz6tcuNRqg/BUhfWjWmOAaj8VhBvF7E88yRblMh+6c3IBmSeAqlYbepsavS1QPEhhvZICGUkch7+yxWTrRlQ==
 
 emoji-datasource@5.0.1:
   version "5.0.1"