Enhance: /users/${id}にAccept: application/ld+jsonではないリクエストが来たとき`/…

…@${username}`にリダイレクトするように (#554)
yojo-art · Nov 28, 2024 · a037a66 · a037a66
1 parent ea225d0
commit a037a66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/CHANGELOG_YOJO.md b/CHANGELOG_YOJO.md
@@ -1,3 +1,8 @@
+## 1.2.0
+
+### Server
+- Enhance: `/users/${id}`に`Accept: application/ld+json`ではないリクエストが来たとき`/@${username}`にリダイレクトするように [#554](https://github.com/yojo-art/cherrypick/pull/554)
+
 ## 1.1.0
 Cherrypick 4.11.1
 

diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
@@ -667,6 +667,20 @@ export class ActivityPubServerService {
 			return await this.userInfo(request, reply, user);
 		});
 
+		fastify.get<{ Params: { user: string; } }>('/users/:user', { constraints: { apOrHtml: 'html' } }, async (request, reply) => {
+			vary(reply.raw, 'Accept');
+
+			const userId = request.params.user;
+
+			const user = await this.usersRepository.findOneBy({
+				id: userId,
+				host: IsNull(),
+				isSuspended: false,
+			});
+			if (user) reply.redirect(`/@${user.username}`);
+			reply.code(404);
+		});
+
 		fastify.get<{ Params: { user: string; } }>('/@:user', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
 			vary(reply.raw, 'Accept');