From 1854e4200d4baaab5b44d09a8bce537e44f50014 Mon Sep 17 00:00:00 2001 From: KaKi87 Date: Sat, 13 Apr 2024 03:05:03 +0200 Subject: [PATCH 1/4] Add twemoji submodule --- .gitignore | 1 - .gitmodules | 3 +++ public/twemoji | 1 + src/util/twemojify.jsx | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 public/twemoji diff --git a/.gitignore b/.gitignore index 765aa787c..19b73ac1e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ experiment dist node_modules devAssets -public/img/twemoji electron/main/notification/sounds vendor diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..5d02d62fe --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "public/twemoji"] + path = public/twemoji + url = https://github.com/twitter/twemoji diff --git a/public/twemoji b/public/twemoji new file mode 160000 index 000000000..d94f4cf79 --- /dev/null +++ b/public/twemoji @@ -0,0 +1 @@ +Subproject commit d94f4cf793e6d5ca592aa00f58a88f6a4229ad43 diff --git a/src/util/twemojify.jsx b/src/util/twemojify.jsx index 70e3cb533..be337577c 100644 --- a/src/util/twemojify.jsx +++ b/src/util/twemojify.jsx @@ -84,7 +84,7 @@ const insertKeyWords = () => { }; // Emoji Base -export const TWEMOJI_BASE_URL = './img/twemoji/'; +export const TWEMOJI_BASE_URL = './twemoji/assets/'; // String Protocols global.String.prototype.toUnicode = function () { From 8c30e071dbea212c59502a38dc1d5e7c105d935d Mon Sep 17 00:00:00 2001 From: Yasmin Seidel Date: Fri, 12 Apr 2024 23:41:10 -0300 Subject: [PATCH 2/4] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 5d02d62fe..1a50706de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "public/twemoji"] - path = public/twemoji + path = vendor/twemoji url = https://github.com/twitter/twemoji From 2d0cb9118ee5d3975cc6e8f07e0c18a9089f25e3 Mon Sep 17 00:00:00 2001 From: Yasmin Seidel Date: Fri, 12 Apr 2024 23:42:36 -0300 Subject: [PATCH 3/4] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1a50706de..720bbc918 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "public/twemoji"] +[submodule "vendor/twemoji"] path = vendor/twemoji url = https://github.com/twitter/twemoji From 4a294784363846f3df549c6971c63e2f09e702ac Mon Sep 17 00:00:00 2001 From: Yasmin Seidel Date: Fri, 12 Apr 2024 23:43:50 -0300 Subject: [PATCH 4/4] Update twemojify.jsx --- src/util/twemojify.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/twemojify.jsx b/src/util/twemojify.jsx index be337577c..70e3cb533 100644 --- a/src/util/twemojify.jsx +++ b/src/util/twemojify.jsx @@ -84,7 +84,7 @@ const insertKeyWords = () => { }; // Emoji Base -export const TWEMOJI_BASE_URL = './twemoji/assets/'; +export const TWEMOJI_BASE_URL = './img/twemoji/'; // String Protocols global.String.prototype.toUnicode = function () {