From 3c3c5e190ac602fff271f2ea8c96c248de7e4a0e Mon Sep 17 00:00:00 2001 From: Marie Date: Thu, 4 Jan 2024 20:42:25 +0100 Subject: [PATCH] upd: add tossface emojis as an option --- .gitmodules | 3 +++ Dockerfile | 1 + .../backend/src/server/web/ClientServerService.ts | 15 +++++++++++++++ .../frontend/src/components/MkAutocomplete.vue | 4 ++-- .../frontend/src/components/global/MkEmoji.vue | 4 ++-- packages/frontend/src/pages/settings/general.vue | 1 + packages/frontend/src/scripts/emoji-base.ts | 12 ++++++++++++ packages/frontend/vite.config.local-dev.ts | 1 + packages/frontend/vite.config.ts | 1 + tossface-emojis | 1 + 10 files changed, 39 insertions(+), 4 deletions(-) create mode 160000 tossface-emojis diff --git a/.gitmodules b/.gitmodules index 225a69a65..92d3a8753 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "fluent-emojis"] path = fluent-emojis url = https://github.com/misskey-dev/emojis.git +[submodule "tossface-emojis"] + path = tossface-emojis + url = https://git.joinsharkey.org/Sharkey/tossface-emojis.git diff --git a/Dockerfile b/Dockerfile index 99286b39b..2f2861960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ COPY --from=build /sharkey/packages/megalodon/node_modules ./packages/megalodon/ COPY --from=build /sharkey/packages/misskey-js/built ./packages/misskey-js/built COPY --from=build /sharkey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules COPY --from=build /sharkey/fluent-emojis ./fluent-emojis +COPY --from=build /sharkey/tossface-emojis/dist ./tossface-emojis/dist COPY --from=build /sharkey/sharkey-assets ./packages/frontend/assets COPY package.json ./package.json diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index aa696046e..280bdb20b 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -327,6 +327,21 @@ export class ClientServerService { }); }); + fastify.get<{ Params: { path: string } }>('/tossface/:path(.*)', async (request, reply) => { + const path = request.params.path; + + if (!path.match(/^[0-9a-f-]+\.svg$/)) { + reply.code(404); + return; + } + + reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\''); + + return await reply.sendFile(path, `${_dirname}/../../../../../tossface-emojis/dist`, { + maxAge: ms('30 days'), + }); + }); + fastify.get<{ Params: { path: string } }>('/twemoji-badge/:path(.*)', async (request, reply) => { const path = request.params.path; diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue index 1f819cf60..6fd42f1ee 100644 --- a/packages/frontend/src/components/MkAutocomplete.vue +++ b/packages/frontend/src/components/MkAutocomplete.vue @@ -42,7 +42,7 @@ SPDX-License-Identifier: AGPL-3.0-only import { markRaw, ref, shallowRef, computed, onUpdated, onMounted, onBeforeUnmount, nextTick, watch } from 'vue'; import sanitizeHtml from 'sanitize-html'; import contains from '@/scripts/contains.js'; -import { char2twemojiFilePath, char2fluentEmojiFilePath } from '@/scripts/emoji-base.js'; +import { char2twemojiFilePath, char2fluentEmojiFilePath, char2tossfaceFilePath } from '@/scripts/emoji-base.js'; import { acct } from '@/filters/user.js'; import * as os from '@/os.js'; import { defaultStore } from '@/store.js'; @@ -68,7 +68,7 @@ const lib = emojilist.filter(x => x.category !== 'flags'); const emojiDb = computed(() => { //#region Unicode Emoji - const char2path = defaultStore.reactiveState.emojiStyle.value === 'twemoji' ? char2twemojiFilePath : char2fluentEmojiFilePath; + const char2path = defaultStore.reactiveState.emojiStyle.value === 'twemoji' ? char2twemojiFilePath : defaultStore.reactiveState.emojiStyle.value === 'tossface' ? char2tossfaceFilePath : char2fluentEmojiFilePath; const unicodeEmojiDB: EmojiDef[] = lib.map(x => ({ emoji: x.char, diff --git a/packages/frontend/src/components/global/MkEmoji.vue b/packages/frontend/src/components/global/MkEmoji.vue index b1d62db33..f03bf26fa 100644 --- a/packages/frontend/src/components/global/MkEmoji.vue +++ b/packages/frontend/src/components/global/MkEmoji.vue @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0-only