summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/web/ClientServerService.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-12-29 10:14:44 +0900
committerGitHub <noreply@github.com>2022-12-29 10:14:44 +0900
commit912791b3ab6a7cb6cbfda2aa9e15d95115770a5e (patch)
treee36053e09364ad0475fae453089eea455e29d71e /packages/backend/src/server/web/ClientServerService.ts
parent:art: (diff)
downloadsharkey-912791b3ab6a7cb6cbfda2aa9e15d95115770a5e.tar.gz
sharkey-912791b3ab6a7cb6cbfda2aa9e15d95115770a5e.tar.bz2
sharkey-912791b3ab6a7cb6cbfda2aa9e15d95115770a5e.zip
refactor: 絵文字URLを引き回すのをやめる (#9423)
Diffstat (limited to 'packages/backend/src/server/web/ClientServerService.ts')
-rw-r--r--packages/backend/src/server/web/ClientServerService.ts32
1 files changed, 31 insertions, 1 deletions
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index 2b3f0ce0f5..af1ff91ac9 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -26,7 +26,7 @@ import { PageEntityService } from '@/core/entities/PageEntityService.js';
import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
-import type { ChannelsRepository, ClipsRepository, GalleryPostsRepository, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
+import type { ChannelsRepository, ClipsRepository, EmojisRepository, GalleryPostsRepository, NotesRepository, PagesRepository, UserProfilesRepository, UsersRepository } from '@/models/index.js';
import { deepClone } from '@/misc/clone.js';
import { bindThis } from '@/decorators.js';
import manifest from './manifest.json' assert { type: 'json' };
@@ -70,6 +70,9 @@ export class ClientServerService {
@Inject(DI.pagesRepository)
private pagesRepository: PagesRepository,
+ @Inject(DI.emojisRepository)
+ private emojisRepository: EmojisRepository,
+
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,
private pageEntityService: PageEntityService,
@@ -217,6 +220,33 @@ export class ClientServerService {
return reply.sendFile('/apple-touch-icon.png', staticAssets);
});
+ fastify.get<{ Params: { path: string } }>('/emoji/:path(.*)', async (request, reply) => {
+ const path = request.params.path;
+
+ if (!path.match(/^[a-zA-Z0-9\-_@\.]+?\.webp$/)) {
+ reply.code(404);
+ return;
+ }
+
+ const name = path.split('@')[0].replace('.webp', '');
+ const host = path.split('@')[1]?.replace('.webp', '');
+
+ const emoji = await this.emojisRepository.findOneBy({
+ host: host == null ? IsNull() : host,
+ name: name,
+ });
+
+ if (emoji == null) {
+ reply.code(404);
+ return;
+ }
+
+ reply.header('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\'');
+
+ // ?? emoji.originalUrl してるのは後方互換性のため
+ return await reply.redirect(301, emoji.publicUrl ?? emoji.originalUrl);
+ });
+
fastify.get<{ Params: { path: string } }>('/fluent-emoji/:path(.*)', async (request, reply) => {
const path = request.params.path;