From 60d2558ed6f99ce4f7f26966ed6fd62cce9adf47 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sat, 21 Sep 2019 21:31:38 +0900 Subject: [PATCH] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94=E3=83=83?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AE=20Unicode=2012.0=20=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E3=81=AA=E3=81=A9=20(#5441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Twemoji 12.1 * 絵文字ライブラリを持つように * Fix chess_pawn emoji * Add Unicode 12.0 emojis * Add transgender flag/symbol emoji * Add some japanese emoji keywords * format emojilist.json * fix emojilist order * Add missing flags --- gulpfile.ts | 1 + package.json | 1 - .../common/views/components/autocomplete.vue | 30 +- .../common/views/components/emoji-picker.vue | 16 +- .../app/common/views/components/emoji.vue | 6 +- src/emojilist.json | 1655 +++++++++++++++++ src/misc/emoji-regex.ts | 3 +- src/misc/emojilist.ts | 7 + src/misc/twemoji-base.ts | 5 +- yarn.lock | 5 - 10 files changed, 1691 insertions(+), 38 deletions(-) create mode 100644 src/emojilist.json create mode 100644 src/misc/emojilist.ts diff --git a/gulpfile.ts b/gulpfile.ts index 6ed597731..80500c295 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -54,6 +54,7 @@ gulp.task('build:copy:fonts', () => gulp.task('build:copy', gulp.parallel('build:copy:views', 'build:copy:fonts', () => gulp.src([ './src/const.json', + './src/emojilist.json', './src/server/web/views/**/*', './src/**/assets/**/*', '!./src/client/app/**/assets/**/*' diff --git a/package.json b/package.json index b9702e9e7..f2a75259f 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,6 @@ "deep-equal": "1.1.0", "diskusage": "1.1.3", "double-ended-queue": "2.1.0-0", - "emojilib": "2.4.0", "eslint": "6.1.0", "eslint-plugin-vue": "5.2.3", "eventemitter3": "4.0.0", diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index ca6599df2..40f253471 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -28,9 +28,9 @@