summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2025-12-01 18:36:55 +0900
committerGitHub <noreply@github.com>2025-12-01 18:36:55 +0900
commitf222d7e24d3d134a078868c89363cacde906ccdc (patch)
tree987edf63823a078365a514b0c755258b196a5d1b /packages/backend/src
parentfix(frontend): visibilityStateがhiddenな状態でstartViewTransitionしな... (diff)
downloadmisskey-f222d7e24d3d134a078868c89363cacde906ccdc.tar.gz
misskey-f222d7e24d3d134a078868c89363cacde906ccdc.tar.bz2
misskey-f222d7e24d3d134a078868c89363cacde906ccdc.zip
enhance(backend): pugをやめ、JSXベースのテンプレートに変更 (#16908)
* enhance(backend): pugをやめ、JSXベースのテンプレートに変更 (to misskey-dev dev branch) (#16889) * wip * wip * wip * wip * fix lint * attempt to fix test * fix * fix * fix: oauthページの描画がおかしい問題を修正 * typo [ci skip] * fix * fix * fix * fix * fix * refactor * fix * fix * fix broken lockfile * fix: expose supported languages as global variable * remove i18n package from root as it is no longer required [ci skip] * fix * fix: add i18n package.json to Docker target-builder stage for federation tests (#16909) * Initial plan * fix: add i18n package.json to Docker target-builder stage for federation tests Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> * fix: followup-test-federation for enh-remove-pug (#16910) * fix: followup-test-federation for enh-remove-pug * Revert "fix: add i18n package.json to Docker target-builder stage for federation tests (#16909)" This reverts commit 14313468d34f49c363eef4d0a932e9fc0d9a37fb. * fix: CSSが読み込まれない場合がある問題を修正 * fix [ci skip] * fix: propsのデフォルト値をnull合体演算子から論理和演算子に変更(空文字に対処するため) * remove @types/pug * enhance: bootloaderを埋め込むように * fix possible race condition * remove esbuild --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/config.ts5
-rw-r--r--packages/backend/src/misc/json-stringify-html-safe.ts18
-rw-r--r--packages/backend/src/server/ServerModule.ts2
-rw-r--r--packages/backend/src/server/oauth/OAuth2ProviderService.ts23
-rw-r--r--packages/backend/src/server/web/ClientServerService.ts215
-rw-r--r--packages/backend/src/server/web/HtmlTemplateService.ts105
-rw-r--r--packages/backend/src/server/web/bios.css46
-rw-r--r--packages/backend/src/server/web/bios.js92
-rw-r--r--packages/backend/src/server/web/boot.embed.js208
-rw-r--r--packages/backend/src/server/web/boot.js336
-rw-r--r--packages/backend/src/server/web/cli.css25
-rw-r--r--packages/backend/src/server/web/cli.js63
-rw-r--r--packages/backend/src/server/web/error.css111
-rw-r--r--packages/backend/src/server/web/error.js40
-rw-r--r--packages/backend/src/server/web/style.css78
-rw-r--r--packages/backend/src/server/web/style.embed.css100
-rw-r--r--packages/backend/src/server/web/views/_.ts49
-rw-r--r--packages/backend/src/server/web/views/_splash.tsx26
-rw-r--r--packages/backend/src/server/web/views/announcement.pug21
-rw-r--r--packages/backend/src/server/web/views/announcement.tsx41
-rw-r--r--packages/backend/src/server/web/views/base-embed.pug71
-rw-r--r--packages/backend/src/server/web/views/base-embed.tsx88
-rw-r--r--packages/backend/src/server/web/views/base.pug100
-rw-r--r--packages/backend/src/server/web/views/base.tsx108
-rw-r--r--packages/backend/src/server/web/views/bios.pug20
-rw-r--r--packages/backend/src/server/web/views/bios.tsx35
-rw-r--r--packages/backend/src/server/web/views/channel.pug19
-rw-r--r--packages/backend/src/server/web/views/channel.tsx40
-rw-r--r--packages/backend/src/server/web/views/cli.pug21
-rw-r--r--packages/backend/src/server/web/views/cli.tsx37
-rw-r--r--packages/backend/src/server/web/views/clip.pug35
-rw-r--r--packages/backend/src/server/web/views/clip.tsx59
-rw-r--r--packages/backend/src/server/web/views/error.pug71
-rw-r--r--packages/backend/src/server/web/views/error.tsx89
-rw-r--r--packages/backend/src/server/web/views/flash.pug35
-rw-r--r--packages/backend/src/server/web/views/flash.tsx59
-rw-r--r--packages/backend/src/server/web/views/flush.pug51
-rw-r--r--packages/backend/src/server/web/views/flush.tsx23
-rw-r--r--packages/backend/src/server/web/views/gallery-post.pug41
-rw-r--r--packages/backend/src/server/web/views/gallery-post.tsx65
-rw-r--r--packages/backend/src/server/web/views/info-card.pug50
-rw-r--r--packages/backend/src/server/web/views/info-card.tsx40
-rw-r--r--packages/backend/src/server/web/views/note.pug62
-rw-r--r--packages/backend/src/server/web/views/note.tsx94
-rw-r--r--packages/backend/src/server/web/views/oauth.pug11
-rw-r--r--packages/backend/src/server/web/views/oauth.tsx37
-rw-r--r--packages/backend/src/server/web/views/page.pug35
-rw-r--r--packages/backend/src/server/web/views/page.tsx64
-rw-r--r--packages/backend/src/server/web/views/reversi-game.pug20
-rw-r--r--packages/backend/src/server/web/views/reversi-game.tsx37
-rw-r--r--packages/backend/src/server/web/views/user.pug44
-rw-r--r--packages/backend/src/server/web/views/user.tsx74
52 files changed, 1287 insertions, 1952 deletions
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index fdf6fe18e2..fc83899eb7 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -11,6 +11,7 @@ import { type FastifyServerOptions } from 'fastify';
import type * as Sentry from '@sentry/node';
import type * as SentryVue from '@sentry/vue';
import type { RedisOptions } from 'ioredis';
+import type { ManifestChunk } from 'vite';
type RedisOptionsSource = Partial<RedisOptions> & {
host: string;
@@ -187,9 +188,9 @@ export type Config = {
authUrl: string;
driveUrl: string;
userAgent: string;
- frontendEntry: { file: string | null };
+ frontendEntry: ManifestChunk;
frontendManifestExists: boolean;
- frontendEmbedEntry: { file: string | null };
+ frontendEmbedEntry: ManifestChunk;
frontendEmbedManifestExists: boolean;
mediaProxy: string;
externalMediaProxyEnabled: boolean;
diff --git a/packages/backend/src/misc/json-stringify-html-safe.ts b/packages/backend/src/misc/json-stringify-html-safe.ts
new file mode 100644
index 0000000000..aac12d57db
--- /dev/null
+++ b/packages/backend/src/misc/json-stringify-html-safe.ts
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+const ESCAPE_LOOKUP = {
+ '&': '\\u0026',
+ '>': '\\u003e',
+ '<': '\\u003c',
+ '\u2028': '\\u2028',
+ '\u2029': '\\u2029',
+} as Record<string, string>;
+
+const ESCAPE_REGEX = /[&><\u2028\u2029]/g;
+
+export function htmlSafeJsonStringify(obj: any): string {
+ return JSON.stringify(obj).replace(ESCAPE_REGEX, x => ESCAPE_LOOKUP[x]);
+}
diff --git a/packages/backend/src/server/ServerModule.ts b/packages/backend/src/server/ServerModule.ts
index 0223650329..111421472d 100644
--- a/packages/backend/src/server/ServerModule.ts
+++ b/packages/backend/src/server/ServerModule.ts
@@ -25,6 +25,7 @@ import { SignupApiService } from './api/SignupApiService.js';
import { StreamingApiServerService } from './api/StreamingApiServerService.js';
import { OpenApiServerService } from './api/openapi/OpenApiServerService.js';
import { ClientServerService } from './web/ClientServerService.js';
+import { HtmlTemplateService } from './web/HtmlTemplateService.js';
import { FeedService } from './web/FeedService.js';
import { UrlPreviewService } from './web/UrlPreviewService.js';
import { ClientLoggerService } from './web/ClientLoggerService.js';
@@ -58,6 +59,7 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j
providers: [
ClientServerService,
ClientLoggerService,
+ HtmlTemplateService,
FeedService,
HealthServerService,
UrlPreviewService,
diff --git a/packages/backend/src/server/oauth/OAuth2ProviderService.ts b/packages/backend/src/server/oauth/OAuth2ProviderService.ts
index 1c15f35399..d2391c43ab 100644
--- a/packages/backend/src/server/oauth/OAuth2ProviderService.ts
+++ b/packages/backend/src/server/oauth/OAuth2ProviderService.ts
@@ -12,8 +12,6 @@ import ipaddr from 'ipaddr.js';
import oauth2orize, { type OAuth2, AuthorizationError, ValidateFunctionArity2, OAuth2Req, MiddlewareRequest } from 'oauth2orize';
import oauth2Pkce from 'oauth2orize-pkce';
import fastifyCors from '@fastify/cors';
-import fastifyView from '@fastify/view';
-import pug from 'pug';
import bodyParser from 'body-parser';
import fastifyExpress from '@fastify/express';
import { verifyChallenge } from 'pkce-challenge';
@@ -31,6 +29,8 @@ import { MemoryKVCache } from '@/misc/cache.js';
import { LoggerService } from '@/core/LoggerService.js';
import Logger from '@/logger.js';
import { StatusError } from '@/misc/status-error.js';
+import { HtmlTemplateService } from '@/server/web/HtmlTemplateService.js';
+import { OAuthPage } from '@/server/web/views/oauth.js';
import type { ServerResponse } from 'node:http';
import type { FastifyInstance } from 'fastify';
@@ -273,6 +273,7 @@ export class OAuth2ProviderService {
private usersRepository: UsersRepository,
private cacheService: CacheService,
loggerService: LoggerService,
+ private htmlTemplateService: HtmlTemplateService,
) {
this.#logger = loggerService.getLogger('oauth');
@@ -406,24 +407,16 @@ export class OAuth2ProviderService {
this.#logger.info(`Rendering authorization page for "${oauth2.client.name}"`);
reply.header('Cache-Control', 'no-store');
- return await reply.view('oauth', {
+ return await HtmlTemplateService.replyHtml(reply, OAuthPage({
+ ...await this.htmlTemplateService.getCommonData(),
transactionId: oauth2.transactionID,
clientName: oauth2.client.name,
- clientLogo: oauth2.client.logo,
- scope: oauth2.req.scope.join(' '),
- });
+ clientLogo: oauth2.client.logo ?? undefined,
+ scope: oauth2.req.scope,
+ }));
});
fastify.post('/decision', async () => { });
- fastify.register(fastifyView, {
- root: fileURLToPath(new URL('../web/views', import.meta.url)),
- engine: { pug },
- defaultContext: {
- version: this.config.version,
- config: this.config,
- },
- });
-
await fastify.register(fastifyExpress);
fastify.use('/authorize', this.#server.authorize(((areq, done) => {
(async (): Promise<Parameters<typeof done>> => {
diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts
index fef6a27087..bcea935409 100644
--- a/packages/backend/src/server/web/ClientServerService.ts
+++ b/packages/backend/src/server/web/ClientServerService.ts
@@ -9,20 +9,16 @@ import { fileURLToPath } from 'node:url';
import { Inject, Injectable } from '@nestjs/common';
import ms from 'ms';
import sharp from 'sharp';
-import pug from 'pug';
import { In, IsNull } from 'typeorm';
import fastifyStatic from '@fastify/static';
-import fastifyView from '@fastify/view';
import fastifyProxy from '@fastify/http-proxy';
import vary from 'vary';
import type { Config } from '@/config.js';
-import { getNoteSummary } from '@/misc/get-note-summary.js';
import { DI } from '@/di-symbols.js';
import * as Acct from '@/misc/acct.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
import { PageEntityService } from '@/core/entities/PageEntityService.js';
-import { MetaEntityService } from '@/core/entities/MetaEntityService.js';
import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
@@ -41,14 +37,33 @@ import type {
} from '@/models/_.js';
import type Logger from '@/logger.js';
import { handleRequestRedirectToOmitSearch } from '@/misc/fastify-hook-handlers.js';
+import { htmlSafeJsonStringify } from '@/misc/json-stringify-html-safe.js';
import { bindThis } from '@/decorators.js';
import { FlashEntityService } from '@/core/entities/FlashEntityService.js';
-import { RoleService } from '@/core/RoleService.js';
import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntityService.js';
import { FeedService } from './FeedService.js';
import { UrlPreviewService } from './UrlPreviewService.js';
import { ClientLoggerService } from './ClientLoggerService.js';
+import { HtmlTemplateService } from './HtmlTemplateService.js';
+
+import { BasePage } from './views/base.js';
+import { UserPage } from './views/user.js';
+import { NotePage } from './views/note.js';
+import { PagePage } from './views/page.js';
+import { ClipPage } from './views/clip.js';
+import { FlashPage } from './views/flash.js';
+import { GalleryPostPage } from './views/gallery-post.js';
+import { ChannelPage } from './views/channel.js';
+import { ReversiGamePage } from './views/reversi-game.js';
+import { AnnouncementPage } from './views/announcement.js';
+import { BaseEmbed } from './views/base-embed.js';
+import { InfoCardPage } from './views/info-card.js';
+import { BiosPage } from './views/bios.js';
+import { CliPage } from './views/cli.js';
+import { FlushPage } from './views/flush.js';
+import { ErrorPage } from './views/error.js';
+
import type { FastifyError, FastifyInstance, FastifyPluginOptions, FastifyReply } from 'fastify';
const _filename = fileURLToPath(import.meta.url);
@@ -62,20 +77,6 @@ const frontendViteOut = `${_dirname}/../../../../../built/_frontend_vite_/`;
const frontendEmbedViteOut = `${_dirname}/../../../../../built/_frontend_embed_vite_/`;
const tarball = `${_dirname}/../../../../../built/tarball/`;
-const ESCAPE_LOOKUP = {
- '&': '\\u0026',
- '>': '\\u003e',
- '<': '\\u003c',
- '\u2028': '\\u2028',
- '\u2029': '\\u2029',
-} as Record<string, string>;
-
-const ESCAPE_REGEX = /[&><\u2028\u2029]/g;
-
-function htmlSafeJsonStringify(obj: any): string {
- return JSON.stringify(obj).replace(ESCAPE_REGEX, x => ESCAPE_LOOKUP[x]);
-}
-
@Injectable()
export class ClientServerService {
private logger: Logger;
@@ -121,7 +122,6 @@ export class ClientServerService {
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,
private pageEntityService: PageEntityService,
- private metaEntityService: MetaEntityService,
private galleryPostEntityService: GalleryPostEntityService,
private clipEntityService: ClipEntityService,
private channelEntityService: ChannelEntityService,
@@ -129,7 +129,7 @@ export class ClientServerService {
private announcementEntityService: AnnouncementEntityService,
private urlPreviewService: UrlPreviewService,
private feedService: FeedService,
- private roleService: RoleService,
+ private htmlTemplateService: HtmlTemplateService,
private clientLoggerService: ClientLoggerService,
) {
//this.createServer = this.createServer.bind(this);
@@ -196,37 +196,9 @@ export class ClientServerService {
}
@bindThis
- private async generateCommonPugData(meta: MiMeta) {
- return {
- instanceName: meta.name ?? 'Misskey',
- icon: meta.iconUrl,
- appleTouchIcon: meta.app512IconUrl,
- themeColor: meta.themeColor,
- serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://xn--931a.moe/assets/error.jpg',
- infoImageUrl: meta.infoImageUrl ?? 'https://xn--931a.moe/assets/info.jpg',
- notFoundImageUrl: meta.notFoundImageUrl ?? 'https://xn--931a.moe/assets/not-found.jpg',
- instanceUrl: this.config.url,
- metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)),
- now: Date.now(),
- federationEnabled: this.meta.federation !== 'none',
- };
- }
-
- @bindThis
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
const configUrl = new URL(this.config.url);
- fastify.register(fastifyView, {
- root: _dirname + '/views',
- engine: {
- pug: pug,
- },
- defaultContext: {
- version: this.config.version,
- config: this.config,
- },
- });
-
fastify.addHook('onRequest', (request, reply, done) => {
// クリックジャッキング防止のためiFrameの中に入れられないようにする
reply.header('X-Frame-Options', 'DENY');
@@ -427,16 +399,15 @@ export class ClientServerService {
//#endregion
- const renderBase = async (reply: FastifyReply, data: { [key: string]: any } = {}) => {
+ const renderBase = async (reply: FastifyReply, data: Partial<Parameters<typeof BasePage>[0]> = {}) => {
reply.header('Cache-Control', 'public, max-age=30');
- return await reply.view('base', {
- img: this.meta.bannerUrl,
- url: this.config.url,
+ return await HtmlTemplateService.replyHtml(reply, BasePage({
+ img: this.meta.bannerUrl ?? undefined,
title: this.meta.name ?? 'Misskey',
- desc: this.meta.description,
- ...await this.generateCommonPugData(this.meta),
+ desc: this.meta.description ?? undefined,
+ ...await this.htmlTemplateService.getCommonData(),
...data,
- });
+ }));
};
// URL preview endpoint
@@ -518,11 +489,6 @@ export class ClientServerService {
)
) {
const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
- const me = profile.fields
- ? profile.fields
- .filter(filed => filed.value != null && filed.value.match(/^https?:/))
- .map(field => field.value)
- : [];
reply.header('Cache-Control', 'public, max-age=15');
if (profile.preventAiLearning) {
@@ -535,15 +501,15 @@ export class ClientServerService {
userProfile: profile,
});
- return await reply.view('user', {
- user, profile, me,
- avatarUrl: _user.avatarUrl,
+ return await HtmlTemplateService.replyHtml(reply, UserPage({
+ user: _user,
+ profile,
sub: request.params.sub,
- ...await this.generateCommonPugData(this.meta),
- clientCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ clientCtxJson: htmlSafeJsonStringify({
user: _user,
}),
- });
+ }));
} else {
// リモートユーザーなので
// モデレータがAPI経由で参照可能にするために404にはしない
@@ -594,17 +560,14 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
- return await reply.view('note', {
+ return await HtmlTemplateService.replyHtml(reply, NotePage({
note: _note,
profile,
- avatarUrl: _note.user.avatarUrl,
- // TODO: Let locale changeable by instance setting
- summary: getNoteSummary(_note),
- ...await this.generateCommonPugData(this.meta),
- clientCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ clientCtxJson: htmlSafeJsonStringify({
note: _note,
}),
- });
+ }));
} else {
return await renderBase(reply);
}
@@ -637,12 +600,11 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
- return await reply.view('page', {
+ return await HtmlTemplateService.replyHtml(reply, PagePage({
page: _page,
profile,
- avatarUrl: _page.user.avatarUrl,
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -662,12 +624,11 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
- return await reply.view('flash', {
+ return await HtmlTemplateService.replyHtml(reply, FlashPage({
flash: _flash,
profile,
- avatarUrl: _flash.user.avatarUrl,
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -687,15 +648,14 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
- return await reply.view('clip', {
+ return await HtmlTemplateService.replyHtml(reply, ClipPage({
clip: _clip,
profile,
- avatarUrl: _clip.user.avatarUrl,
- ...await this.generateCommonPugData(this.meta),
- clientCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ clientCtxJson: htmlSafeJsonStringify({
clip: _clip,
}),
- });
+ }));
} else {
return await renderBase(reply);
}
@@ -713,12 +673,11 @@ export class ClientServerService {
reply.header('X-Robots-Tag', 'noimageai');
reply.header('X-Robots-Tag', 'noai');
}
- return await reply.view('gallery-post', {
- post: _post,
+ return await HtmlTemplateService.replyHtml(reply, GalleryPostPage({
+ galleryPost: _post,
profile,
- avatarUrl: _post.user.avatarUrl,
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -733,10 +692,10 @@ export class ClientServerService {
if (channel) {
const _channel = await this.channelEntityService.pack(channel);
reply.header('Cache-Control', 'public, max-age=15');
- return await reply.view('channel', {
+ return await HtmlTemplateService.replyHtml(reply, ChannelPage({
channel: _channel,
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -751,10 +710,10 @@ export class ClientServerService {
if (game) {
const _game = await this.reversiGameEntityService.packDetail(game);
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('reversi-game', {
- game: _game,
- ...await this.generateCommonPugData(this.meta),
- });
+ return await HtmlTemplateService.replyHtml(reply, ReversiGamePage({
+ reversiGame: _game,
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -770,10 +729,10 @@ export class ClientServerService {
if (announcement) {
const _announcement = await this.announcementEntityService.pack(announcement);
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('announcement', {
+ return await HtmlTemplateService.replyHtml(reply, AnnouncementPage({
announcement: _announcement,
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
} else {
return await renderBase(reply);
}
@@ -806,13 +765,13 @@ export class ClientServerService {
const _user = await this.userEntityService.pack(user);
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('base-embed', {
+ return await HtmlTemplateService.replyHtml(reply, BaseEmbed({
title: this.meta.name ?? 'Misskey',
- ...await this.generateCommonPugData(this.meta),
- embedCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ embedCtxJson: htmlSafeJsonStringify({
user: _user,
}),
- });
+ }));
});
fastify.get<{ Params: { note: string; } }>('/embed/notes/:note', async (request, reply) => {
@@ -832,13 +791,13 @@ export class ClientServerService {
const _note = await this.noteEntityService.pack(note, null, { detail: true });
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('base-embed', {
+ return await HtmlTemplateService.replyHtml(reply, BaseEmbed({
title: this.meta.name ?? 'Misskey',
- ...await this.generateCommonPugData(this.meta),
- embedCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ embedCtxJson: htmlSafeJsonStringify({
note: _note,
}),
- });
+ }));
});
fastify.get<{ Params: { clip: string; } }>('/embed/clips/:clip', async (request, reply) => {
@@ -853,48 +812,46 @@ export class ClientServerService {
const _clip = await this.clipEntityService.pack(clip);
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('base-embed', {
+ return await HtmlTemplateService.replyHtml(reply, BaseEmbed({
title: this.meta.name ?? 'Misskey',
- ...await this.generateCommonPugData(this.meta),
- embedCtx: htmlSafeJsonStringify({
+ ...await this.htmlTemplateService.getCommonData(),
+ embedCtxJson: htmlSafeJsonStringify({
clip: _clip,
}),
- });
+ }));
});
fastify.get('/embed/*', async (request, reply) => {
reply.removeHeader('X-Frame-Options');
reply.header('Cache-Control', 'public, max-age=3600');
- return await reply.view('base-embed', {
+ return await HtmlTemplateService.replyHtml(reply, BaseEmbed({
title: this.meta.name ?? 'Misskey',
- ...await this.generateCommonPugData(this.meta),
- });
+ ...await this.htmlTemplateService.getCommonData(),
+ }));
});
fastify.get('/_info_card_', async (request, reply) => {
reply.removeHeader('X-Frame-Options');
- return await reply.view('info-card', {
+ return await HtmlTemplateService.replyHtml(reply, InfoCardPage({
version: this.config.version,
- host: this.config.host,
+ config: this.config,
meta: this.meta,
- originalUsersCount: await this.usersRepository.countBy({ host: IsNull() }),
- originalNotesCount: await this.notesRepository.countBy({ userHost: IsNull() }),
- });
+ }));
});
//#endregion
fastify.get('/bios', async (request, reply) => {
- return await reply.view('bios', {
+ return await HtmlTemplateService.replyHtml(reply, BiosPage({
version: this.config.version,
- });
+ }));
});
fastify.get('/cli', async (request, reply) => {
- return await reply.view('cli', {
+ return await HtmlTemplateService.replyHtml(reply, CliPage({
version: this.config.version,
- });
+ }));
});
const override = (source: string, target: string, depth = 0) =>
@@ -917,7 +874,7 @@ export class ClientServerService {
reply.header('Clear-Site-Data', '"*"');
}
reply.header('Set-Cookie', 'http-flush-failed=1; Path=/flush; Max-Age=60');
- return await reply.view('flush');
+ return await HtmlTemplateService.replyHtml(reply, FlushPage());
});
// streamingに非WebSocketリクエストが来た場合にbase htmlをキャシュ付きで返すと、Proxy等でそのパスがキャッシュされておかしくなる
@@ -943,10 +900,10 @@ export class ClientServerService {
});
reply.code(500);
reply.header('Cache-Control', 'max-age=10, must-revalidate');
- return await reply.view('error', {
+ return await HtmlTemplateService.replyHtml(reply, ErrorPage({
code: error.code,
id: errId,
- });
+ }));
});
done();
diff --git a/packages/backend/src/server/web/HtmlTemplateService.ts b/packages/backend/src/server/web/HtmlTemplateService.ts
new file mode 100644
index 0000000000..80c767d886
--- /dev/null
+++ b/packages/backend/src/server/web/HtmlTemplateService.ts
@@ -0,0 +1,105 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { promises as fsp } from 'node:fs';
+import { languages } from 'i18n';
+import { Injectable, Inject } from '@nestjs/common';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+import { htmlSafeJsonStringify } from '@/misc/json-stringify-html-safe.js';
+import { MetaEntityService } from '@/core/entities/MetaEntityService.js';
+import type { FastifyReply } from 'fastify';
+import type { Config } from '@/config.js';
+import type { MiMeta } from '@/models/Meta.js';
+import type { CommonData } from './views/_.js';
+
+const _filename = fileURLToPath(import.meta.url);
+const _dirname = dirname(_filename);
+
+const frontendVitePublic = `${_dirname}/../../../../frontend/public/`;
+const frontendEmbedVitePublic = `${_dirname}/../../../../frontend-embed/public/`;
+
+@Injectable()
+export class HtmlTemplateService {
+ private frontendBootloadersFetched = false;
+ public frontendBootloaderJs: string | null = null;
+ public frontendBootloaderCss: string | null = null;
+ public frontendEmbedBootloaderJs: string | null = null;
+ public frontendEmbedBootloaderCss: string | null = null;
+
+ constructor(
+ @Inject(DI.config)
+ private config: Config,
+
+ @Inject(DI.meta)
+ private meta: MiMeta,
+
+ private metaEntityService: MetaEntityService,
+ ) {
+ }
+
+ @bindThis
+ private async prepareFrontendBootloaders() {
+ if (this.frontendBootloadersFetched) return;
+ this.frontendBootloadersFetched = true;
+
+ const [bootJs, bootCss, embedBootJs, embedBootCss] = await Promise.all([
+ fsp.readFile(`${frontendVitePublic}loader/boot.js`, 'utf-8').catch(() => null),
+ fsp.readFile(`${frontendVitePublic}loader/style.css`, 'utf-8').catch(() => null),
+ fsp.readFile(`${frontendEmbedVitePublic}loader/boot.js`, 'utf-8').catch(() => null),
+ fsp.readFile(`${frontendEmbedVitePublic}loader/style.css`, 'utf-8').catch(() => null),
+ ]);
+
+ if (bootJs != null) {
+ this.frontendBootloaderJs = bootJs;
+ }
+
+ if (bootCss != null) {
+ this.frontendBootloaderCss = bootCss;
+ }
+
+ if (embedBootJs != null) {
+ this.frontendEmbedBootloaderJs = embedBootJs;
+ }
+
+ if (embedBootCss != null) {
+ this.frontendEmbedBootloaderCss = embedBootCss;
+ }
+ }
+
+ @bindThis
+ public async getCommonData(): Promise<CommonData> {
+ await this.prepareFrontendBootloaders();
+
+ return {
+ version: this.config.version,
+ config: this.config,
+ langs: [...languages],
+ instanceName: this.meta.name ?? 'Misskey',
+ icon: this.meta.iconUrl,
+ appleTouchIcon: this.meta.app512IconUrl,
+ themeColor: this.meta.themeColor,
+ serverErrorImageUrl: this.meta.serverErrorImageUrl ?? 'https://xn--931a.moe/assets/error.jpg',
+ infoImageUrl: this.meta.infoImageUrl ?? 'https://xn--931a.moe/assets/info.jpg',
+ notFoundImageUrl: this.meta.notFoundImageUrl ?? 'https://xn--931a.moe/assets/not-found.jpg',
+ instanceUrl: this.config.url,
+ metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(this.meta)),
+ now: Date.now(),
+ federationEnabled: this.meta.federation !== 'none',
+ frontendBootloaderJs: this.frontendBootloaderJs,
+ frontendBootloaderCss: this.frontendBootloaderCss,
+ frontendEmbedBootloaderJs: this.frontendEmbedBootloaderJs,
+ frontendEmbedBootloaderCss: this.frontendEmbedBootloaderCss,
+ };
+ }
+
+ public static async replyHtml(reply: FastifyReply, html: string | Promise<string>) {
+ reply.header('Content-Type', 'text/html; charset=utf-8');
+ const _html = await html;
+ return reply.send(_html);
+ }
+}
diff --git a/packages/backend/src/server/web/bios.css b/packages/backend/src/server/web/bios.css
deleted file mode 100644
index 91d1af10b4..0000000000
--- a/packages/backend/src/server/web/bios.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-* {
- font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace;
-}
-
-html {
- background: #ffb4e1;
-}
-
-main {
- background: #dedede;
-}
-main > .tabs {
- padding: 16px;
- border-bottom: solid 4px #c3c3c3;
-}
-
-#lsEditor > .adder {
- margin: 16px;
- padding: 16px;
- border: solid 2px #c3c3c3;
-}
-#lsEditor > .adder > textarea {
- display: block;
- width: 100%;
- min-height: 5em;
- box-sizing: border-box;
-}
-#lsEditor > .record {
- padding: 16px;
- border-bottom: solid 1px #c3c3c3;
-}
-#lsEditor > .record > header {
- font-weight: bold;
-}
-#lsEditor > .record > textarea {
- display: block;
- width: 100%;
- min-height: 5em;
- box-sizing: border-box;
-}
diff --git a/packages/backend/src/server/web/bios.js b/packages/backend/src/server/web/bios.js
deleted file mode 100644
index 9ff5dca72a..0000000000
--- a/packages/backend/src/server/web/bios.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-window.onload = async () => {
- const account = JSON.parse(localStorage.getItem('account'));
- const i = account.token;
-
- const api = (endpoint, data = {}) => {
- const promise = new Promise((resolve, reject) => {
- // Append a credential
- if (i) data.i = i;
-
- // Send request
- window.fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
- method: 'POST',
- body: JSON.stringify(data),
- credentials: 'omit',
- cache: 'no-cache'
- }).then(async (res) => {
- const body = res.status === 204 ? null : await res.json();
-
- if (res.status === 200) {
- resolve(body);
- } else if (res.status === 204) {
- resolve();
- } else {
- reject(body.error);
- }
- }).catch(reject);
- });
-
- return promise;
- };
-
- const content = document.getElementById('content');
-
- document.getElementById('ls').addEventListener('click', () => {
- content.innerHTML = '';
-
- const lsEditor = document.createElement('div');
- lsEditor.id = 'lsEditor';
-
- const adder = document.createElement('div');
- adder.classList.add('adder');
- const addKeyInput = document.createElement('input');
- const addValueTextarea = document.createElement('textarea');
- const addButton = document.createElement('button');
- addButton.textContent = 'add';
- addButton.addEventListener('click', () => {
- localStorage.setItem(addKeyInput.value, addValueTextarea.value);
- location.reload();
- });
-
- adder.appendChild(addKeyInput);
- adder.appendChild(addValueTextarea);
- adder.appendChild(addButton);
- lsEditor.appendChild(adder);
-
- for (let i = 0; i < localStorage.length; i++) {
- const k = localStorage.key(i);
- const record = document.createElement('div');
- record.classList.add('record');
- const header = document.createElement('header');
- header.textContent = k;
- const textarea = document.createElement('textarea');
- textarea.textContent = localStorage.getItem(k);
- const saveButton = document.createElement('button');
- saveButton.textContent = 'save';
- saveButton.addEventListener('click', () => {
- localStorage.setItem(k, textarea.value);
- location.reload();
- });
- const removeButton = document.createElement('button');
- removeButton.textContent = 'remove';
- removeButton.addEventListener('click', () => {
- localStorage.removeItem(k);
- location.reload();
- });
- record.appendChild(header);
- record.appendChild(textarea);
- record.appendChild(saveButton);
- record.appendChild(removeButton);
- lsEditor.appendChild(record);
- }
-
- content.appendChild(lsEditor);
- });
-};
diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js
deleted file mode 100644
index ba6366b3db..0000000000
--- a/packages/backend/src/server/web/boot.embed.js
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-// ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
-(async () => {
- window.onerror = (e) => {
- console.error(e);
- renderError('SOMETHING_HAPPENED');
- };
- window.onunhandledrejection = (e) => {
- console.error(e);
- renderError('SOMETHING_HAPPENED_IN_PROMISE');
- };
-
- let forceError = localStorage.getItem('forceError');
- if (forceError != null) {
- renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
- return;
- }
-
- // パラメータに応じてsplashのスタイルを変更
- const params = new URLSearchParams(location.search);
- if (params.has('rounded') && params.get('rounded') === 'false') {
- document.documentElement.classList.add('norounded');
- }
- if (params.has('border') && params.get('border') === 'false') {
- document.documentElement.classList.add('noborder');
- }
-
- //#region Detect language & fetch translations
- const supportedLangs = LANGS;
- /** @type { string } */
- let lang = localStorage.getItem('lang');
- if (lang == null || !supportedLangs.includes(lang)) {
- if (supportedLangs.includes(navigator.language)) {
- lang = navigator.language;
- } else {
- lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
-
- // Fallback
- if (lang == null) lang = 'en-US';
- }
- }
-
- // for https://github.com/misskey-dev/misskey/issues/10202
- if (lang == null || lang.toString == null || lang.toString() === 'null') {
- console.error('invalid lang value detected!!!', typeof lang, lang);
- lang = 'en-US';
- }
- //#endregion
-
- //#region Script
- async function importAppScript() {
- await import(CLIENT_ENTRY ? `/embed_vite/${CLIENT_ENTRY.replace('scripts', lang)}` : '/embed_vite/src/boot.ts')
- .catch(async e => {
- console.error(e);
- renderError('APP_IMPORT');
- });
- }
-
- // タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある
- if (document.readyState !== 'loading') {
- importAppScript();
- } else {
- window.addEventListener('DOMContentLoaded', () => {
- importAppScript();
- });
- }
- //#endregion
-
- async function addStyle(styleText) {
- let css = document.createElement('style');
- css.appendChild(document.createTextNode(styleText));
- document.head.appendChild(css);
- }
-
- async function renderError(code) {
- // Cannot set property 'innerHTML' of null を回避
- if (document.readyState === 'loading') {
- await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
- }
-
- let messages = null;
- const bootloaderLocales = localStorage.getItem('bootloaderLocales');
- if (bootloaderLocales) {
- messages = JSON.parse(bootloaderLocales);
- }
- if (!messages) {
- // older version of misskey does not store bootloaderLocales, stores locale as a whole
- const legacyLocale = localStorage.getItem('locale');
- if (legacyLocale) {
- const parsed = JSON.parse(legacyLocale);
- messages = {
- ...(parsed._bootErrors ?? {}),
- reload: parsed.reload,
- };
- }
- }
- if (!messages) messages = {};
-
- const title = messages?.title || 'Failed to initialize Misskey';
- const reload = messages?.reload || 'Reload';
-
- document.body.innerHTML = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0" /><path d="M12 9v4" /><path d="M12 16v.01" /></svg>
- <div class="message">${title}</div>
- <div class="submessage">Error Code: ${code}</div>
- <button onclick="location.reload(!0)">
- <div>${reload}</div>
- </button>`;
- addStyle(`
- #misskey_app,
- #splash {
- display: none !important;
- }
-
- html,
- body {
- margin: 0;
- }
-
- body {
- position: relative;
- color: #dee7e4;
- font-family: Hiragino Maru Gothic Pro, BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
- line-height: 1.35;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- min-height: 100vh;
- margin: 0;
- padding: 24px;
- box-sizing: border-box;
- overflow: hidden;
-
- border-radius: var(--radius, 12px);
- border: 1px solid rgba(231, 255, 251, 0.14);
- }
-
- body::before {
- content: '';
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: #192320;
- border-radius: var(--radius, 12px);
- z-index: -1;
- }
-
- html.embed.norounded body,
- html.embed.norounded body::before {
- border-radius: 0;
- }
-
- html.embed.noborder body {
- border: none;
- }
-
- .icon {
- max-width: 60px;
- width: 100%;
- height: auto;
- margin-bottom: 20px;
- color: #dec340;
- }
-
- .message {
- text-align: center;
- font-size: 20px;
- font-weight: 700;
- margin-bottom: 20px;
- }
-
- .submessage {
- text-align: center;
- font-size: 90%;
- margin-bottom: 7.5px;
- }
-
- .submessage:last-of-type {
- margin-bottom: 20px;
- }
-
- button {
- padding: 7px 14px;
- min-width: 100px;
- font-weight: 700;
- font-family: Hiragino Maru Gothic Pro, BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
- line-height: 1.35;
- border-radius: 99rem;
- background-color: #b4e900;
- color: #192320;
- border: none;
- cursor: pointer;
- -webkit-tap-highlight-color: transparent;
- }
-
- button:hover {
- background-color: #c6ff03;
- }`);
- }
-})();
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
deleted file mode 100644
index ab4b158287..0000000000
--- a/packages/backend/src/server/web/boot.js
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-// ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
-(async () => {
- window.onerror = (e) => {
- console.error(e);
- renderError('SOMETHING_HAPPENED', e);
- };
- window.onunhandledrejection = (e) => {
- console.error(e);
- renderError('SOMETHING_HAPPENED_IN_PROMISE', e.reason || e);
- };
-
- let forceError = localStorage.getItem('forceError');
- if (forceError != null) {
- renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
- return;
- }
-
- //#region Detect language
- const supportedLangs = LANGS;
- /** @type { string } */
- let lang = localStorage.getItem('lang');
- if (lang == null || !supportedLangs.includes(lang)) {
- if (supportedLangs.includes(navigator.language)) {
- lang = navigator.language;
- } else {
- lang = supportedLangs.find(x => x.split('-')[0] === navigator.language);
-
- // Fallback
- if (lang == null) lang = 'en-US';
- }
- }
-
- // for https://github.com/misskey-dev/misskey/issues/10202
- if (lang == null || lang.toString == null || lang.toString() === 'null') {
- console.error('invalid lang value detected!!!', typeof lang, lang);
- lang = 'en-US';
- }
- //#endregion
-
- //#region Script
- async function importAppScript() {
- await import(CLIENT_ENTRY ? `/vite/${CLIENT_ENTRY.replace('scripts', lang)}` : '/vite/src/_boot_.ts')
- .catch(async e => {
- console.error(e);
- renderError('APP_IMPORT', e);
- });
- }
-
- // タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある
- if (document.readyState !== 'loading') {
- importAppScript();
- } else {
- window.addEventListener('DOMContentLoaded', () => {
- importAppScript();
- });
- }
- //#endregion
-
- let isSafeMode = (localStorage.getItem('isSafeMode') === 'true');
-
- if (!isSafeMode) {
- const urlParams = new URLSearchParams(window.location.search);
-
- if (urlParams.has('safemode') && urlParams.get('safemode') === 'true') {
- localStorage.setItem('isSafeMode', 'true');
- isSafeMode = true;
- }
- }
-
- //#region Theme
- if (!isSafeMode) {
- const theme = localStorage.getItem('theme');
- if (theme) {
- for (const [k, v] of Object.entries(JSON.parse(theme))) {
- document.documentElement.style.setProperty(`--MI_THEME-${k}`, v.toString());
-
- // HTMLの theme-color 適用
- if (k === 'htmlThemeColor') {
- for (const tag of document.head.children) {
- if (tag.tagName === 'META' && tag.getAttribute('name') === 'theme-color') {
- tag.setAttribute('content', v);
- break;
- }
- }
- }
- }
- }
- }
-
- const colorScheme = localStorage.getItem('colorScheme');
- if (colorScheme) {
- document.documentElement.style.setProperty('color-scheme', colorScheme);
- }
- //#endregion
-
- const fontSize = localStorage.getItem('fontSize');
- if (fontSize) {
- document.documentElement.classList.add('f-' + fontSize);
- }
-
- const useSystemFont = localStorage.getItem('useSystemFont');
- if (useSystemFont) {
- document.documentElement.classList.add('useSystemFont');
- }
-
- if (!isSafeMode) {
- const customCss = localStorage.getItem('customCss');
- if (customCss && customCss.length > 0) {
- const style = document.createElement('style');
- style.innerHTML = customCss;
- document.head.appendChild(style);
- }
- }
-
- async function addStyle(styleText) {
- let css = document.createElement('style');
- css.appendChild(document.createTextNode(styleText));
- document.head.appendChild(css);
- }
-
- async function renderError(code, details) {
- // Cannot set property 'innerHTML' of null を回避
- if (document.readyState === 'loading') {
- await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
- }
-
- let messages = null;
- const bootloaderLocales = localStorage.getItem('bootloaderLocales');
- if (bootloaderLocales) {
- messages = JSON.parse(bootloaderLocales);
- }
- if (!messages) {
- // older version of misskey does not store bootloaderLocales, stores locale as a whole
- const legacyLocale = localStorage.getItem('locale');
- if (legacyLocale) {
- const parsed = JSON.parse(legacyLocale);
- messages = {
- ...(parsed._bootErrors ?? {}),
- reload: parsed.reload,
- };
- }
- }
- if (!messages) messages = {};
-
- messages = Object.assign({
- title: 'Failed to initialize Misskey',
- solution: 'The following actions may solve the problem.',
- solution1: 'Update your os and browser',
- solution2: 'Disable an adblocker',
- solution3: 'Clear the browser cache',
- solution4: '(Tor Browser) Set dom.webaudio.enabled to true',
- otherOption: 'Other options',
- otherOption1: 'Clear preferences and cache',
- otherOption2: 'Start the simple client',
- otherOption3: 'Start the repair tool',
- otherOption4: 'Start Misskey in safe mode',
- reload: 'Reload',
- }, messages);
-
- const safeModeUrl = new URL(window.location.href);
- safeModeUrl.searchParams.set('safemode', 'true');
-
- let errorsElement = document.getElementById('errors');
-
- if (!errorsElement) {
- document.body.innerHTML = `
- <svg class="icon-warning" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
- <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
- <path d="M12 9v2m0 4v.01"></path>
- <path d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75"></path>
- </svg>
- <h1>${messages.title}</h1>
- <button class="button-big" onclick="location.reload(true);">
- <span class="button-label-big">${messages?.reload}</span>
- </button>
- <p><b>${messages.solution}</b></p>
- <p>${messages.solution1}</p>
- <p>${messages.solution2}</p>
- <p>${messages.solution3}</p>
- <p>${messages.solution4}</p>
- <details style="color: #86b300;">
- <summary>${messages.otherOption}</summary>
- <a href="${safeModeUrl}">
- <button class="button-small">
- <span class="button-label-small">${messages.otherOption4}</span>
- </button>
- </a>
- <br>
- <a href="/flush">
- <button class="button-small">
- <span class="button-label-small">${messages.otherOption1}</span>
- </button>
- </a>
- <br>
- <a href="/cli">
- <button class="button-small">
- <span class="button-label-small">${messages.otherOption2}</span>
- </button>
- </a>
- <br>
- <a href="/bios">
- <button class="button-small">
- <span class="button-label-small">${messages.otherOption3}</span>
- </button>
- </a>
- </details>
- <br>
- <div id="errors"></div>
- `;
- errorsElement = document.getElementById('errors');
- }
- const detailsElement = document.createElement('details');
- detailsElement.id = 'errorInfo';
- detailsElement.innerHTML = `
- <br>
- <summary>
- <code>ERROR CODE: ${code}</code>
- </summary>
- <code>${details.toString()} ${JSON.stringify(details)}</code>`;
- errorsElement.appendChild(detailsElement);
- addStyle(`
- * {
- font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
- }
-
- #misskey_app,
- #splash {
- display: none !important;
- }
-
- body,
- html {
- background-color: #222;
- color: #dfddcc;
- justify-content: center;
- margin: auto;
- padding: 10px;
- text-align: center;
- }
-
- button {
- border-radius: 999px;
- padding: 0px 12px 0px 12px;
- border: none;
- cursor: pointer;
- margin-bottom: 12px;
- }
-
- .button-big {
- background: linear-gradient(90deg, rgb(134, 179, 0), rgb(74, 179, 0));
- line-height: 50px;
- }
-
- .button-big:hover {
- background: rgb(153, 204, 0);
- }
-
- .button-small {
- background: #444;
- line-height: 40px;
- }
-
- .button-small:hover {
- background: #555;
- }
-
- .button-label-big {
- color: #222;
- font-weight: bold;
- font-size: 1.2em;
- padding: 12px;
- }
-
- .button-label-small {
- color: rgb(153, 204, 0);
- font-size: 16px;
- padding: 12px;
- }
-
- a {
- color: rgb(134, 179, 0);
- text-decoration: none;
- }
-
- p,
- li {
- font-size: 16px;
- }
-
- .icon-warning {
- color: #dec340;
- height: 4rem;
- padding-top: 2rem;
- }
-
- h1 {
- font-size: 1.5em;
- margin: 1em;
- }
-
- code {
- font-family: Fira, FiraCode, monospace;
- }
-
- #errorInfo {
- background: #333;
- margin-bottom: 2rem;
- padding: 0.5rem 1rem;
- width: 40rem;
- border-radius: 10px;
- justify-content: center;
- margin: auto;
- }
-
- #errorInfo summary {
- cursor: pointer;
- }
-
- #errorInfo summary > * {
- display: inline;
- }
-
- @media screen and (max-width: 500px) {
- #errorInfo {
- width: 50%;
- }
- }`);
- }
-})();
diff --git a/packages/backend/src/server/web/cli.css b/packages/backend/src/server/web/cli.css
deleted file mode 100644
index 4e6136d59c..0000000000
--- a/packages/backend/src/server/web/cli.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-* {
- font-family: Fira code, Fira Mono, Consolas, Menlo, Courier, monospace;
-}
-
-html {
- background: #ffb4e1;
-}
-
-main {
- background: #dedede;
-}
-
-#tl > div {
- padding: 16px;
- border-bottom: solid 1px #c3c3c3;
-}
-#tl > div > header {
- font-weight: bold;
-}
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
deleted file mode 100644
index 30ee77f4d9..0000000000
--- a/packages/backend/src/server/web/cli.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-window.onload = async () => {
- const account = JSON.parse(localStorage.getItem('account'));
- const i = account.token;
-
- const api = (endpoint, data = {}) => {
- const promise = new Promise((resolve, reject) => {
- // Append a credential
- if (i) data.i = i;
-
- // Send request
- fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
- headers: {
- 'Content-Type': 'application/json'
- },
- method: 'POST',
- body: JSON.stringify(data),
- credentials: 'omit',
- cache: 'no-cache'
- }).then(async (res) => {
- const body = res.status === 204 ? null : await res.json();
-
- if (res.status === 200) {
- resolve(body);
- } else if (res.status === 204) {
- resolve();
- } else {
- reject(body.error);
- }
- }).catch(reject);
- });
-
- return promise;
- };
-
- document.getElementById('submit').addEventListener('click', () => {
- api('notes/create', {
- text: document.getElementById('text').value
- }).then(() => {
- location.reload();
- });
- });
-
- api('notes/timeline').then(notes => {
- const tl = document.getElementById('tl');
- for (const note of notes) {
- const el = document.createElement('div');
- const name = document.createElement('header');
- name.textContent = `${note.user.name} @${note.user.username}`;
- const text = document.createElement('div');
- text.textContent = `${note.text}`;
- el.appendChild(name);
- el.appendChild(text);
- tl.appendChild(el);
- }
- });
-};
diff --git a/packages/backend/src/server/web/error.css b/packages/backend/src/server/web/error.css
deleted file mode 100644
index 803bd1b4b5..0000000000
--- a/packages/backend/src/server/web/error.css
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-* {
- font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
-}
-
-#misskey_app,
-#splash {
- display: none !important;
-}
-
-body,
-html {
- background-color: #222;
- color: #dfddcc;
- justify-content: center;
- margin: auto;
- padding: 10px;
- text-align: center;
-}
-
-button {
- border-radius: 999px;
- padding: 0px 12px 0px 12px;
- border: none;
- cursor: pointer;
- margin-bottom: 12px;
-}
-
-.button-big {
- background: linear-gradient(90deg, rgb(134, 179, 0), rgb(74, 179, 0));
- line-height: 50px;
-}
-
-.button-big:hover {
- background: rgb(153, 204, 0);
-}
-
-.button-small {
- background: #444;
- line-height: 40px;
-}
-
-.button-small:hover {
- background: #555;
-}
-
-.button-label-big {
- color: #222;
- font-weight: bold;
- font-size: 1.2em;
- padding: 12px;
-}
-
-.button-label-small {
- color: rgb(153, 204, 0);
- font-size: 16px;
- padding: 12px;
-}
-
-a {
- color: rgb(134, 179, 0);
- text-decoration: none;
-}
-
-p,
-li {
- font-size: 16px;
-}
-
-.icon-warning {
- color: #dec340;
- height: 4rem;
- padding-top: 2rem;
-}
-
-h1 {
- font-size: 1.5em;
- margin: 1em;
-}
-
-code {
- display: block;
- font-family: Fira, FiraCode, monospace;
- background: #333;
- padding: 0.5rem 1rem;
- max-width: 40rem;
- border-radius: 10px;
- justify-content: center;
- margin: auto;
- white-space: pre-wrap;
- word-break: break-word;
-}
-
-#errorInfo summary {
- cursor: pointer;
-}
-
-#errorInfo summary>* {
- display: inline;
-}
-
-@media screen and (max-width: 500px) {
- #errorInfo {
- width: 50%;
- }
-}
diff --git a/packages/backend/src/server/web/error.js b/packages/backend/src/server/web/error.js
deleted file mode 100644
index 4838dd6ef3..0000000000
--- a/packages/backend/src/server/web/error.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-'use strict';
-
-(() => {
- document.addEventListener('DOMContentLoaded', () => {
- const locale = JSON.parse(localStorage.getItem('locale') || '{}');
-
- const messages = Object.assign({
- title: 'Failed to initialize Misskey',
- serverError: 'If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.',
- solution: 'The following actions may solve the problem.',
- solution1: 'Update your os and browser',
- solution2: 'Disable an adblocker',
- solution3: 'Clear the browser cache',
- solution4: '(Tor Browser) Set dom.webaudio.enabled to true',
- otherOption: 'Other options',
- otherOption1: 'Clear preferences and cache',
- otherOption2: 'Start the simple client',
- otherOption3: 'Start the repair tool',
- }, locale?._bootErrors || {});
- const reload = locale?.reload || 'Reload';
-
- const reloadEls = document.querySelectorAll('[data-i18n-reload]');
- for (const el of reloadEls) {
- el.textContent = reload;
- }
-
- const i18nEls = document.querySelectorAll('[data-i18n]');
- for (const el of i18nEls) {
- const key = el.dataset.i18n;
- if (key && messages[key]) {
- el.textContent = messages[key];
- }
- }
- });
-})();
diff --git a/packages/backend/src/server/web/style.css b/packages/backend/src/server/web/style.css
deleted file mode 100644
index 8e63a2ea66..0000000000
--- a/packages/backend/src/server/web/style.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-html {
- background-color: var(--MI_THEME-bg);
- color: var(--MI_THEME-fg);
-}
-
-#splash {
- position: fixed;
- z-index: 10000;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
- cursor: wait;
- background-color: var(--MI_THEME-bg);
- opacity: 1;
- transition: opacity 0.5s ease;
-}
-
-#splashIcon {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- margin: auto;
- width: 64px;
- height: 64px;
- border-radius: 10px;
- pointer-events: none;
-}
-
-#splashSpinner {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- margin: auto;
- display: inline-block;
- width: 28px;
- height: 28px;
- transform: translateY(70px);
- color: var(--MI_THEME-accent);
-}
-
-#splashSpinner > .spinner {
- position: absolute;
- top: 0;
- left: 0;
- width: 28px;
- height: 28px;
- fill-rule: evenodd;
- clip-rule: evenodd;
- stroke-linecap: round;
- stroke-linejoin: round;
- stroke-miterlimit: 1.5;
-}
-#splashSpinner > .spinner.bg {
- opacity: 0.275;
-}
-#splashSpinner > .spinner.fg {
- animation: splashSpinner 0.5s linear infinite;
-}
-
-@keyframes splashSpinner {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(360deg);
- }
-}
diff --git a/packages/backend/src/server/web/style.embed.css b/packages/backend/src/server/web/style.embed.css
deleted file mode 100644
index 0911d562bf..0000000000
--- a/packages/backend/src/server/web/style.embed.css
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-html {
- background-color: var(--MI_THEME-bg);
- color: var(--MI_THEME-fg);
-}
-
-html.embed {
- box-sizing: border-box;
- background-color: transparent;
- color-scheme: light dark;
- max-width: 500px;
-}
-
-#splash {
- position: fixed;
- z-index: 10000;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
- cursor: wait;
- background-color: var(--MI_THEME-bg);
- opacity: 1;
- transition: opacity 0.5s ease;
-}
-
-html.embed #splash {
- box-sizing: border-box;
- min-height: 300px;
- border-radius: var(--radius, 12px);
- border: 1px solid var(--MI_THEME-divider, #e8e8e8);
-}
-
-html.embed.norounded #splash {
- border-radius: 0;
-}
-
-html.embed.noborder #splash {
- border: none;
-}
-
-#splashIcon {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- margin: auto;
- width: 64px;
- height: 64px;
- border-radius: 10px;
- pointer-events: none;
-}
-
-#splashSpinner {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- margin: auto;
- display: inline-block;
- width: 28px;
- height: 28px;
- transform: translateY(70px);
- color: var(--MI_THEME-accent);
-}
-
-#splashSpinner > .spinner {
- position: absolute;
- top: 0;
- left: 0;
- width: 28px;
- height: 28px;
- fill-rule: evenodd;
- clip-rule: evenodd;
- stroke-linecap: round;
- stroke-linejoin: round;
- stroke-miterlimit: 1.5;
-}
-#splashSpinner > .spinner.bg {
- opacity: 0.275;
-}
-#splashSpinner > .spinner.fg {
- animation: splashSpinner 0.5s linear infinite;
-}
-
-@keyframes splashSpinner {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(360deg);
- }
-}
diff --git a/packages/backend/src/server/web/views/_.ts b/packages/backend/src/server/web/views/_.ts
new file mode 100644
index 0000000000..ac7418f362
--- /dev/null
+++ b/packages/backend/src/server/web/views/_.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Config } from '@/config.js';
+
+export const comment = `<!--
+ _____ _ _
+ | |_|___ ___| |_ ___ _ _
+ | | | | |_ -|_ -| '_| -_| | |
+ |_|_|_|_|___|___|_,_|___|_ |
+ |___|
+ Thank you for using Misskey!
+ If you are reading this message... how about joining the development?
+ https://github.com/misskey-dev/misskey
+
+-->`;
+
+export const defaultDescription = '✨🌎✨ A interplanetary communication platform ✨🚀✨';
+
+export type MinimumCommonData = {
+ version: string;
+ config: Config;
+};
+
+export type CommonData = MinimumCommonData & {
+ langs: string[];
+ instanceName: string;
+ icon: string | null;
+ appleTouchIcon: string | null;
+ themeColor: string | null;
+ serverErrorImageUrl: string;
+ infoImageUrl: string;
+ notFoundImageUrl: string;
+ instanceUrl: string;
+ now: number;
+ federationEnabled: boolean;
+ frontendBootloaderJs: string | null;
+ frontendBootloaderCss: string | null;
+ frontendEmbedBootloaderJs: string | null;
+ frontendEmbedBootloaderCss: string | null;
+ metaJson?: string;
+ clientCtxJson?: string;
+};
+
+export type CommonPropsMinimum<T = Record<string, any>> = MinimumCommonData & T;
+
+export type CommonProps<T = Record<string, any>> = CommonData & T;
diff --git a/packages/backend/src/server/web/views/_splash.tsx b/packages/backend/src/server/web/views/_splash.tsx
new file mode 100644
index 0000000000..ea79b8d61d
--- /dev/null
+++ b/packages/backend/src/server/web/views/_splash.tsx
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export function Splash(props: {
+ icon?: string | null;
+}) {
+ return (
+ <div id="splash">
+ <img id="splashIcon" src={props.icon || '/static-assets/splash.png'} />
+ <div id="splashSpinner">
+ <svg class="spinner bg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(1,0,0,1,12,12)">
+ <circle cx="64" cy="64" r="64" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
+ </g>
+ </svg>
+ <svg class="spinner fg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
+ <g transform="matrix(1,0,0,1,12,12)">
+ <path d="M128,64C128,28.654 99.346,0 64,0C99.346,0 128,28.654 128,64Z" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
+ </g>
+ </svg>
+ </div>
+ </div>
+ );
+}
diff --git a/packages/backend/src/server/web/views/announcement.pug b/packages/backend/src/server/web/views/announcement.pug
deleted file mode 100644
index 7a4052e8a4..0000000000
--- a/packages/backend/src/server/web/views/announcement.pug
+++ /dev/null
@@ -1,21 +0,0 @@
-extends ./base
-
-block vars
- - const title = announcement.title;
- - const description = announcement.text.length > 100 ? announcement.text.slice(0, 100) + '…' : announcement.text;
- - const url = `${config.url}/announcements/${announcement.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content=description)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= description)
- meta(property='og:url' content= url)
- if announcement.imageUrl
- meta(property='og:image' content=announcement.imageUrl)
- meta(property='twitter:card' content='summary_large_image')
diff --git a/packages/backend/src/server/web/views/announcement.tsx b/packages/backend/src/server/web/views/announcement.tsx
new file mode 100644
index 0000000000..bc1c808177
--- /dev/null
+++ b/packages/backend/src/server/web/views/announcement.tsx
@@ -0,0 +1,41 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function AnnouncementPage(props: CommonProps<{
+ announcement: Packed<'Announcement'>;
+}>) {
+ const description = props.announcement.text.length > 100 ? props.announcement.text.slice(0, 100) + '…' : props.announcement.text;
+
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={props.announcement.title} />
+ <meta property="og:description" content={description} />
+ <meta property="og:url" content={`${props.config.url}/announcements/${props.announcement.id}`} />
+ {props.announcement.imageUrl ? (
+ <>
+ <meta property="og:image" content={props.announcement.imageUrl} />
+ <meta property="twitter:card" content="summary_large_image" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.announcement.title} | ${props.instanceName}`}
+ desc={description}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug
deleted file mode 100644
index 29de86b8b6..0000000000
--- a/packages/backend/src/server/web/views/base-embed.pug
+++ /dev/null
@@ -1,71 +0,0 @@
-block vars
-
-block loadClientEntry
- - const entry = config.frontendEmbedEntry;
-
-doctype html
-
-html(class='embed')
-
- head
- meta(charset='utf-8')
- meta(name='application-name' content='Misskey')
- meta(name='referrer' content='origin')
- meta(name='theme-color' content= themeColor || '#86b300')
- meta(name='theme-color-orig' content= themeColor || '#86b300')
- meta(property='og:site_name' content= instanceName || 'Misskey')
- meta(property='instance_url' content= instanceUrl)
- meta(name='viewport' content='width=device-width, initial-scale=1')
- meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
- link(rel='icon' href= icon || '/favicon.ico')
- link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
-
- if !config.frontendEmbedManifestExists
- script(type="module" src="/embed_vite/@vite/client")
-
- if Array.isArray(entry.css)
- each href in entry.css
- link(rel='stylesheet' href=`/embed_vite/${href}`)
-
- title
- block title
- = title || 'Misskey'
-
- block meta
- meta(name='robots' content='noindex')
-
- style
- include ../style.embed.css
-
- script.
- var VERSION = "#{version}";
- var CLIENT_ENTRY = !{JSON.stringify(entry.file)};
-
- script(type='application/json' id='misskey_meta' data-generated-at=now)
- != metaJson
-
- script(type='application/json' id='misskey_embedCtx' data-generated-at=now)
- != embedCtx
-
- script
- include ../boot.embed.js
-
- body
- noscript: p
- | JavaScriptを有効にしてください
- br
- | Please turn on your JavaScript
- div#splash
- img#splashIcon(src= icon || '/static-assets/splash.png')
- div#splashSpinner
- <svg class="spinner bg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
- <g transform="matrix(1,0,0,1,12,12)">
- <circle cx="64" cy="64" r="64" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
- </g>
- </svg>
- <svg class="spinner fg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
- <g transform="matrix(1,0,0,1,12,12)">
- <path d="M128,64C128,28.654 99.346,0 64,0C99.346,0 128,28.654 128,64Z" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
- </g>
- </svg>
- block content
diff --git a/packages/backend/src/server/web/views/base-embed.tsx b/packages/backend/src/server/web/views/base-embed.tsx
new file mode 100644
index 0000000000..011b66592e
--- /dev/null
+++ b/packages/backend/src/server/web/views/base-embed.tsx
@@ -0,0 +1,88 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { comment } from '@/server/web/views/_.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Splash } from '@/server/web/views/_splash.js';
+import type { PropsWithChildren, Children } from '@kitajs/html';
+
+export function BaseEmbed(props: PropsWithChildren<CommonProps<{
+ title?: string;
+ noindex?: boolean;
+ desc?: string;
+ img?: string;
+ serverErrorImageUrl?: string;
+ infoImageUrl?: string;
+ notFoundImageUrl?: string;
+ metaJson?: string;
+ embedCtxJson?: string;
+
+ titleSlot?: Children;
+ metaSlot?: Children;
+}>>) {
+ const now = Date.now();
+
+ // 変数名をsafeで始めることでエラーをスキップ
+ const safeMetaJson = props.metaJson;
+ const safeEmbedCtxJson = props.embedCtxJson;
+
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ {comment}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <meta name="referer" content="origin" />
+ <meta name="theme-color" content={props.themeColor ?? '#86b300'} />
+ <meta name="theme-color-orig" content={props.themeColor ?? '#86b300'} />
+ <meta property="og:site_name" content={props.instanceName || 'Misskey'} />
+ <meta property="instance_url" content={props.instanceUrl} />
+ <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" />
+ <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no" />
+ <link rel="icon" href={props.icon ?? '/favicon.ico'} />
+ <link rel="apple-touch-icon" href={props.appleTouchIcon ?? '/apple-touch-icon.png'} />
+
+ {!props.config.frontendEmbedManifestExists ? <script type="module" src="/embed_vite/@vite/client"></script> : null}
+
+ {props.config.frontendEmbedEntry.css != null ? props.config.frontendEmbedEntry.css.map((href) => (
+ <link rel="stylesheet" href={`/embed_vite/${href}`} />
+ )) : null}
+
+ {props.titleSlot ?? <title safe>{props.title || 'Misskey'}</title>}
+
+ {props.metaSlot}
+
+ <meta name="robots" content="noindex" />
+
+ {props.frontendEmbedBootloaderCss != null ? <style safe>{props.frontendEmbedBootloaderCss}</style> : <link rel="stylesheet" href="/embed_vite/loader/style.css" />}
+
+ <script>
+ const VERSION = '{props.version}';
+ const CLIENT_ENTRY = {JSON.stringify(props.config.frontendEmbedEntry.file)};
+ const LANGS = {JSON.stringify(props.langs)};
+ </script>
+
+ {safeMetaJson != null ? <script type="application/json" id="misskey_meta" data-generated-at={now}>{safeMetaJson}</script> : null}
+ {safeEmbedCtxJson != null ? <script type="application/json" id="misskey_embedCtx" data-generated-at={now}>{safeEmbedCtxJson}</script> : null}
+
+ {props.frontendEmbedBootloaderJs != null ? <script>{props.frontendEmbedBootloaderJs}</script> : <script src="/embed_vite/loader/boot.js"></script>}
+ </head>
+ <body>
+ <noscript>
+ <p>
+ JavaScriptを有効にしてください<br />
+ Please turn on your JavaScript
+ </p>
+ </noscript>
+ <Splash icon={props.icon} />
+ {props.children}
+ </body>
+ </html>
+ </>
+ );
+}
+
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
deleted file mode 100644
index 46b365a9c7..0000000000
--- a/packages/backend/src/server/web/views/base.pug
+++ /dev/null
@@ -1,100 +0,0 @@
-block vars
-
-block loadClientEntry
- - const entry = config.frontendEntry;
- - const baseUrl = config.url;
-
-doctype html
-
-//
- -
- _____ _ _
- | |_|___ ___| |_ ___ _ _
- | | | | |_ -|_ -| '_| -_| | |
- |_|_|_|_|___|___|_,_|___|_ |
- |___|
- Thank you for using Misskey!
- If you are reading this message... how about joining the development?
- https://github.com/misskey-dev/misskey
-
-
-html
-
- head
- meta(charset='utf-8')
- meta(name='application-name' content='Misskey')
- meta(name='referrer' content='origin')
- meta(name='theme-color' content= themeColor || '#86b300')
- meta(name='theme-color-orig' content= themeColor || '#86b300')
- meta(property='og:site_name' content= instanceName || 'Misskey')
- meta(property='instance_url' content= instanceUrl)
- meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover')
- meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
- link(rel='icon' href= icon || '/favicon.ico')
- link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
- link(rel='manifest' href='/manifest.json')
- link(rel='search' type='application/opensearchdescription+xml' title=(title || "Misskey") href=`${baseUrl}/opensearch.xml`)
- link(rel='prefetch' href=serverErrorImageUrl)
- link(rel='prefetch' href=infoImageUrl)
- link(rel='prefetch' href=notFoundImageUrl)
-
- if !config.frontendManifestExists
- script(type="module" src="/vite/@vite/client")
-
- if Array.isArray(entry.css)
- each href in entry.css
- link(rel='stylesheet' href=`/vite/${href}`)
-
- title
- block title
- = title || 'Misskey'
-
- if noindex
- meta(name='robots' content='noindex')
-
- block desc
- meta(name='description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
-
- block meta
-
- block og
- meta(property='og:title' content= title || 'Misskey')
- meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
- meta(property='og:image' content= img)
- meta(property='twitter:card' content='summary')
-
- style
- include ../style.css
-
- script.
- var VERSION = "#{version}";
- var CLIENT_ENTRY = !{JSON.stringify(entry.file)};
-
- script(type='application/json' id='misskey_meta' data-generated-at=now)
- != metaJson
-
- script(type='application/json' id='misskey_clientCtx' data-generated-at=now)
- != clientCtx
-
- script
- include ../boot.js
-
- body
- noscript: p
- | JavaScriptを有効にしてください
- br
- | Please turn on your JavaScript
- div#splash
- img#splashIcon(src= icon || '/static-assets/splash.png')
- div#splashSpinner
- <svg class="spinner bg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
- <g transform="matrix(1,0,0,1,12,12)">
- <circle cx="64" cy="64" r="64" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
- </g>
- </svg>
- <svg class="spinner fg" viewBox="0 0 152 152" xmlns="http://www.w3.org/2000/svg">
- <g transform="matrix(1,0,0,1,12,12)">
- <path d="M128,64C128,28.654 99.346,0 64,0C99.346,0 128,28.654 128,64Z" style="fill:none;stroke:currentColor;stroke-width:24px;"/>
- </g>
- </svg>
- block content
diff --git a/packages/backend/src/server/web/views/base.tsx b/packages/backend/src/server/web/views/base.tsx
new file mode 100644
index 0000000000..6fa3395fb8
--- /dev/null
+++ b/packages/backend/src/server/web/views/base.tsx
@@ -0,0 +1,108 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { comment, defaultDescription } from '@/server/web/views/_.js';
+import { Splash } from '@/server/web/views/_splash.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import type { PropsWithChildren, Children } from '@kitajs/html';
+
+export function Layout(props: PropsWithChildren<CommonProps<{
+ title?: string;
+ noindex?: boolean;
+ desc?: string;
+ img?: string;
+ serverErrorImageUrl?: string;
+ infoImageUrl?: string;
+ notFoundImageUrl?: string;
+ metaJson?: string;
+ clientCtxJson?: string;
+
+ titleSlot?: Children;
+ descSlot?: Children;
+ metaSlot?: Children;
+ ogSlot?: Children;
+}>>) {
+ const now = Date.now();
+
+ // 変数名をsafeで始めることでエラーをスキップ
+ const safeMetaJson = props.metaJson;
+ const safeClientCtxJson = props.clientCtxJson;
+
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ {comment}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <meta name="referer" content="origin" />
+ <meta name="theme-color" content={props.themeColor ?? '#86b300'} />
+ <meta name="theme-color-orig" content={props.themeColor ?? '#86b300'} />
+ <meta property="og:site_name" content={props.instanceName || 'Misskey'} />
+ <meta property="instance_url" content={props.instanceUrl} />
+ <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover" />
+ <meta name="format-detection" content="telephone=no,date=no,address=no,email=no,url=no" />
+ <link rel="icon" href={props.icon || '/favicon.ico'} />
+ <link rel="apple-touch-icon" href={props.appleTouchIcon || '/apple-touch-icon.png'} />
+ <link rel="manifest" href="/manifest.json" />
+ <link rel="search" type="application/opensearchdescription+xml" title={props.title || 'Misskey'} href={`${props.config.url}/opensearch.xml`} />
+ {props.serverErrorImageUrl != null ? <link rel="prefetch" as="image" href={props.serverErrorImageUrl} /> : null}
+ {props.infoImageUrl != null ? <link rel="prefetch" as="image" href={props.infoImageUrl} /> : null}
+ {props.notFoundImageUrl != null ? <link rel="prefetch" as="image" href={props.notFoundImageUrl} /> : null}
+
+ {!props.config.frontendManifestExists ? <script type="module" src="/vite/@vite/client"></script> : null}
+
+ {props.config.frontendEntry.css != null ? props.config.frontendEntry.css.map((href) => (
+ <link rel="stylesheet" href={`/vite/${href}`} />
+ )) : null}
+
+ {props.titleSlot ?? <title safe>{props.title || 'Misskey'}</title>}
+
+ {props.noindex ? <meta name="robots" content="noindex" /> : null}
+
+ {props.descSlot ?? (props.desc != null ? <meta name="description" content={props.desc || defaultDescription} /> : null)}
+
+ {props.metaSlot}
+
+ {props.ogSlot ?? (
+ <>
+ <meta property="og:title" content={props.title || 'Misskey'} />
+ <meta property="og:description" content={props.desc || defaultDescription} />
+ {props.img != null ? <meta property="og:image" content={props.img} /> : null}
+ <meta property="twitter:card" content="summary" />
+ </>
+ )}
+
+ {props.frontendBootloaderCss != null ? <style safe>{props.frontendBootloaderCss}</style> : <link rel="stylesheet" href="/vite/loader/style.css" />}
+
+ <script>
+ const VERSION = '{props.version}';
+ const CLIENT_ENTRY = {JSON.stringify(props.config.frontendEntry.file)};
+ const LANGS = {JSON.stringify(props.langs)};
+ </script>
+
+ {safeMetaJson != null ? <script type="application/json" id="misskey_meta" data-generated-at={now}>{safeMetaJson}</script> : null}
+ {safeClientCtxJson != null ? <script type="application/json" id="misskey_clientCtx" data-generated-at={now}>{safeClientCtxJson}</script> : null}
+
+ {props.frontendBootloaderJs != null ? <script>{props.frontendBootloaderJs}</script> : <script src="/vite/loader/boot.js"></script>}
+ </head>
+ <body>
+ <noscript>
+ <p>
+ JavaScriptを有効にしてください<br />
+ Please turn on your JavaScript
+ </p>
+ </noscript>
+ <Splash icon={props.icon} />
+ {props.children}
+ </body>
+ </html>
+ </>
+ );
+}
+
+export { Layout as BasePage };
+
diff --git a/packages/backend/src/server/web/views/bios.pug b/packages/backend/src/server/web/views/bios.pug
deleted file mode 100644
index 39a151a29b..0000000000
--- a/packages/backend/src/server/web/views/bios.pug
+++ /dev/null
@@ -1,20 +0,0 @@
-doctype html
-
-html
-
- head
- meta(charset='utf-8')
- meta(name='application-name' content='Misskey')
- title Misskey Repair Tool
- style
- include ../bios.css
- script
- include ../bios.js
-
- body
- header
- h1 Misskey Repair Tool #{version}
- main
- div.tabs
- button#ls edit local storage
- div#content
diff --git a/packages/backend/src/server/web/views/bios.tsx b/packages/backend/src/server/web/views/bios.tsx
new file mode 100644
index 0000000000..9010de8d75
--- /dev/null
+++ b/packages/backend/src/server/web/views/bios.tsx
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export function BiosPage(props: {
+ version: string;
+}) {
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <title>Misskey Repair Tool</title>
+ <link rel="stylesheet" href="/static-assets/misc/bios.css" />
+ </head>
+
+ <body>
+ <header>
+ <h1 safe>Misskey Repair Tool {props.version}</h1>
+ </header>
+ <main>
+ <div class="tabs">
+ <button id="ls">edit local storage</button>
+ </div>
+ <div id="content"></div>
+ </main>
+ <script src="/static-assets/misc/bios.js"></script>
+ </body>
+ </html>
+ </>
+ );
+}
diff --git a/packages/backend/src/server/web/views/channel.pug b/packages/backend/src/server/web/views/channel.pug
deleted file mode 100644
index c514025e0b..0000000000
--- a/packages/backend/src/server/web/views/channel.pug
+++ /dev/null
@@ -1,19 +0,0 @@
-extends ./base
-
-block vars
- - const title = channel.name;
- - const url = `${config.url}/channels/${channel.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= channel.description)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= channel.description)
- meta(property='og:url' content= url)
- meta(property='og:image' content= channel.bannerUrl)
- meta(property='twitter:card' content='summary')
diff --git a/packages/backend/src/server/web/views/channel.tsx b/packages/backend/src/server/web/views/channel.tsx
new file mode 100644
index 0000000000..7d8123ea85
--- /dev/null
+++ b/packages/backend/src/server/web/views/channel.tsx
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function ChannelPage(props: CommonProps<{
+ channel: Packed<'Channel'>;
+}>) {
+
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="website" />
+ <meta property="og:title" content={props.channel.name} />
+ {props.channel.description != null ? <meta property="og:description" content={props.channel.description} /> : null}
+ <meta property="og:url" content={`${props.config.url}/channels/${props.channel.id}`} />
+ {props.channel.bannerUrl ? (
+ <>
+ <meta property="og:image" content={props.channel.bannerUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.channel.name} | ${props.instanceName}`}
+ desc={props.channel.description ?? undefined}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/cli.pug b/packages/backend/src/server/web/views/cli.pug
deleted file mode 100644
index d2cf7c4335..0000000000
--- a/packages/backend/src/server/web/views/cli.pug
+++ /dev/null
@@ -1,21 +0,0 @@
-doctype html
-
-html
-
- head
- meta(charset='utf-8')
- meta(name='application-name' content='Misskey')
- title Misskey Cli
- style
- include ../cli.css
- script
- include ../cli.js
-
- body
- header
- h1 Misskey Cli #{version}
- main
- div#form
- textarea#text
- button#submit submit
- div#tl
diff --git a/packages/backend/src/server/web/views/cli.tsx b/packages/backend/src/server/web/views/cli.tsx
new file mode 100644
index 0000000000..009d982b35
--- /dev/null
+++ b/packages/backend/src/server/web/views/cli.tsx
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export function CliPage(props: {
+ version: string;
+}) {
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <title>Misskey CLI Tool</title>
+
+ <link rel="stylesheet" href="/static-assets/misc/cli.css" />
+ </head>
+
+ <body>
+ <header>
+ <h1 safe>Misskey CLI {props.version}</h1>
+ </header>
+ <main>
+ <div id="form">
+ <textarea id="text"></textarea>
+ <button id="submit">Submit</button>
+ </div>
+ <div id="tl"></div>
+ </main>
+ <script src="/static-assets/misc/cli.js"></script>
+ </body>
+ </html>
+ </>
+ );
+}
diff --git a/packages/backend/src/server/web/views/clip.pug b/packages/backend/src/server/web/views/clip.pug
deleted file mode 100644
index 5a0018803a..0000000000
--- a/packages/backend/src/server/web/views/clip.pug
+++ /dev/null
@@ -1,35 +0,0 @@
-extends ./base
-
-block vars
- - const user = clip.user;
- - const title = clip.name;
- - const url = `${config.url}/clips/${clip.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= clip.description)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= clip.description)
- meta(property='og:url' content= url)
- meta(property='og:image' content= avatarUrl)
- meta(property='twitter:card' content='summary')
-
-block meta
- if profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
- meta(name='misskey:clip-id' content=clip.id)
-
- // todo
- if user.twitter
- meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/src/server/web/views/clip.tsx b/packages/backend/src/server/web/views/clip.tsx
new file mode 100644
index 0000000000..c3cc505e35
--- /dev/null
+++ b/packages/backend/src/server/web/views/clip.tsx
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function ClipPage(props: CommonProps<{
+ clip: Packed<'Clip'>;
+ profile: MiUserProfile;
+}>) {
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={props.clip.name} />
+ {props.clip.description != null ? <meta property="og:description" content={props.clip.description} /> : null}
+ <meta property="og:url" content={`${props.config.url}/clips/${props.clip.id}`} />
+ {props.clip.user.avatarUrl ? (
+ <>
+ <meta property="og:image" content={props.clip.user.avatarUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.clip.user.username} />
+ <meta name="misskey:user-id" content={props.clip.user.id} />
+ <meta name="misskey:clip-id" content={props.clip.id} />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.clip.name} | ${props.instanceName}`}
+ desc={props.clip.description ?? ''}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug
deleted file mode 100644
index 6a78d1878c..0000000000
--- a/packages/backend/src/server/web/views/error.pug
+++ /dev/null
@@ -1,71 +0,0 @@
-doctype html
-
-//
- -
- _____ _ _
- | |_|___ ___| |_ ___ _ _
- | | | | |_ -|_ -| '_| -_| | |
- |_|_|_|_|___|___|_,_|___|_ |
- |___|
- Thank you for using Misskey!
- If you are reading this message... how about joining the development?
- https://github.com/misskey-dev/misskey
-
-
-html
-
- head
- meta(charset='utf-8')
- meta(name='viewport' content='width=device-width, initial-scale=1')
- meta(name='application-name' content='Misskey')
- meta(name='referrer' content='origin')
-
- title
- block title
- = 'An error has occurred... | Misskey'
-
- style
- include ../error.css
-
- script
- include ../error.js
-
-body
- svg.icon-warning(xmlns="http://www.w3.org/2000/svg", viewBox="0 0 24 24", stroke-width="2", stroke="currentColor", fill="none", stroke-linecap="round", stroke-linejoin="round")
- path(stroke="none", d="M0 0h24v24H0z", fill="none")
- path(d="M12 9v2m0 4v.01")
- path(d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75")
-
- h1(data-i18n="title") Failed to initialize Misskey
-
- button.button-big(onclick="location.reload();")
- span.button-label-big(data-i18n-reload) Reload
-
- p(data-i18n="serverError") If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.
-
- div#errors
- code.
- ERROR CODE: #{code}
- ERROR ID: #{id}
-
- p
- b(data-i18n="solution") The following actions may solve the problem.
-
- p(data-i18n="solution1") Update your os and browser
- p(data-i18n="solution2") Disable an adblocker
- p(data-i18n="solution3") Clear your browser cache
- p(data-i18n="solution4") (Tor Browser) Set dom.webaudio.enabled to true
-
- details(style="color: #86b300;")
- summary(data-i18n="otherOption") Other options
- a(href="/flush")
- button.button-small
- span.button-label-small(data-i18n="otherOption1") Clear preferences and cache
- br
- a(href="/cli")
- button.button-small
- span.button-label-small(data-i18n="otherOption2") Start the simple client
- br
- a(href="/bios")
- button.button-small
- span.button-label-small(data-i18n="otherOption3") Start the repair tool
diff --git a/packages/backend/src/server/web/views/error.tsx b/packages/backend/src/server/web/views/error.tsx
new file mode 100644
index 0000000000..9d0e60aa30
--- /dev/null
+++ b/packages/backend/src/server/web/views/error.tsx
@@ -0,0 +1,89 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { comment } from '@/server/web/views/_.js';
+import type { CommonPropsMinimum } from '@/server/web/views/_.js';
+
+export function ErrorPage(props: {
+ title?: string;
+ code: string;
+ id: string;
+}) {
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ {comment}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta name="referrer" content="origin" />
+ <title safe>{props.title ?? 'An error has occurred... | Misskey'}</title>
+ <link rel="stylesheet" href="/static-assets/misc/error.css" />
+ <script src="/static-assets/misc/error.js"></script>
+ </head>
+ <body>
+ <svg
+ class="icon-warning"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 24 24"
+ stroke-width="2"
+ stroke="currentColor"
+ fill="none"
+ stroke-linecap="round"
+ stroke-linejoin="round"
+ >
+ <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+ <path d="M12 9v2m0 4v.01" />
+ <path d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75" />
+ </svg>
+ <h1 data-i18n="title">Failed to initialize Misskey</h1>
+
+ <button class="button-big" onclick="location.reload();">
+ <span class="button-label-big" data-i18n="reload">Reload</span>
+ </button>
+
+ <p data-i18n="serverError">
+ If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.
+ </p>
+
+ <div id="errors">
+ <code safe>
+ ERROR CODE: {props.code}<br />
+ ERROR ID: {props.id}
+ </code>
+ </div>
+
+ <p><b data-i18n="solution">The following actions may solve the problem.</b></p>
+
+ <p data-i18n="solution1">Update your os and browser</p>
+ <p data-i18n="solution2">Disable an adblocker</p>
+ <p data-i18n="solution3">Clear your browser cache</p>
+ <p data-i18n="solution4">(Tor Browser) Set dom.webaudio.enabled to true</p>
+
+ <details style="color: #86b300;">
+ <summary data-i18n="otherOption">Other options</summary>
+ <a href="/flush">
+ <button class="button-small">
+ <span class="button-label-small" data-i18n="otherOption1">Clear preferences and cache</span>
+ </button>
+ </a>
+ <a href="/cli">
+ <button class="button-small">
+ <span class="button-label-small" data-i18n="otherOption2">Start the simple client</span>
+ </button>
+ </a>
+ <a href="/bios">
+ <button class="button-small">
+ <span class="button-label-small" data-i18n="otherOption3">Start the repair tool</span>
+ </button>
+ </a>
+ </details>
+ </body>
+ </html>
+ </>
+ );
+}
diff --git a/packages/backend/src/server/web/views/flash.pug b/packages/backend/src/server/web/views/flash.pug
deleted file mode 100644
index 1549aa7906..0000000000
--- a/packages/backend/src/server/web/views/flash.pug
+++ /dev/null
@@ -1,35 +0,0 @@
-extends ./base
-
-block vars
- - const user = flash.user;
- - const title = flash.title;
- - const url = `${config.url}/play/${flash.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= flash.summary)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= flash.summary)
- meta(property='og:url' content= url)
- meta(property='og:image' content= avatarUrl)
- meta(property='twitter:card' content='summary')
-
-block meta
- if profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
- meta(name='misskey:flash-id' content=flash.id)
-
- // todo
- if user.twitter
- meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/src/server/web/views/flash.tsx b/packages/backend/src/server/web/views/flash.tsx
new file mode 100644
index 0000000000..25a6b2c0ae
--- /dev/null
+++ b/packages/backend/src/server/web/views/flash.tsx
@@ -0,0 +1,59 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function FlashPage(props: CommonProps<{
+ flash: Packed<'Flash'>;
+ profile: MiUserProfile;
+}>) {
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={props.flash.title} />
+ <meta property="og:description" content={props.flash.summary} />
+ <meta property="og:url" content={`${props.config.url}/play/${props.flash.id}`} />
+ {props.flash.user.avatarUrl ? (
+ <>
+ <meta property="og:image" content={props.flash.user.avatarUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.flash.user.username} />
+ <meta name="misskey:user-id" content={props.flash.user.id} />
+ <meta name="misskey:flash-id" content={props.flash.id} />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.flash.title} | ${props.instanceName}`}
+ desc={props.flash.summary}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/flush.pug b/packages/backend/src/server/web/views/flush.pug
deleted file mode 100644
index 7884495d08..0000000000
--- a/packages/backend/src/server/web/views/flush.pug
+++ /dev/null
@@ -1,51 +0,0 @@
-doctype html
-
-html
- #msg
- script.
- const msg = document.getElementById('msg');
- const successText = `\nSuccess Flush! <a href="/">Back to Misskey</a>\n成功しました。<a href="/">Misskeyを開き直してください。</a>`;
-
- if (!document.cookie) {
- message('Your site data is fully cleared by your browser.');
- message(successText);
- } else {
- message('Your browser does not support Clear-Site-Data header. Start opportunistic flushing.');
- (async function() {
- try {
- localStorage.clear();
- message('localStorage cleared.');
-
- const idbPromises = ['MisskeyClient', 'keyval-store'].map((name, i, arr) => new Promise((res, rej) => {
- const delidb = indexedDB.deleteDatabase(name);
- delidb.onsuccess = () => res(message(`indexedDB "${name}" cleared. (${i + 1}/${arr.length})`));
- delidb.onerror = e => rej(e)
- }));
-
- await Promise.all(idbPromises);
-
- if (navigator.serviceWorker.controller) {
- navigator.serviceWorker.controller.postMessage('clear');
- await navigator.serviceWorker.getRegistrations()
- .then(registrations => {
- return Promise.all(registrations.map(registration => registration.unregister()));
- })
- .catch(e => { throw new Error(e) });
- }
-
- message(successText);
- } catch (e) {
- message(`\n${e}\n\nFlush Failed. <a href="/flush">Please retry.</a>\n失敗しました。<a href="/flush">もう一度試してみてください。</a>`);
- message(`\nIf you retry more than 3 times, try manually clearing the browser cache or contact to instance admin.\n3回以上試しても失敗する場合、ブラウザのキャッシュを手動で消去し、それでもだめならインスタンス管理者に連絡してみてください。\n`)
-
- console.error(e);
- setTimeout(() => {
- location = '/';
- }, 10000)
- }
- })();
- }
-
- function message(text) {
- msg.insertAdjacentHTML('beforeend', `<p>[${(new Date()).toString()}] ${text.replace(/\n/g,'<br>')}</p>`)
- }
diff --git a/packages/backend/src/server/web/views/flush.tsx b/packages/backend/src/server/web/views/flush.tsx
new file mode 100644
index 0000000000..f3fdc8fcb0
--- /dev/null
+++ b/packages/backend/src/server/web/views/flush.tsx
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export function FlushPage(props?: {}) {
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <title>Clear preferences and cache</title>
+ </head>
+ <body>
+ <div id="msg"></div>
+ <script src="/static-assets/misc/flush.js"></script>
+ </body>
+ </html>
+ </>
+ );
+}
diff --git a/packages/backend/src/server/web/views/gallery-post.pug b/packages/backend/src/server/web/views/gallery-post.pug
deleted file mode 100644
index 9ae25d9ac8..0000000000
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ /dev/null
@@ -1,41 +0,0 @@
-extends ./base
-
-block vars
- - const user = post.user;
- - const title = post.title;
- - const url = `${config.url}/gallery/${post.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= post.description)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= post.description)
- meta(property='og:url' content= url)
- if post.isSensitive
- meta(property='og:image' content= avatarUrl)
- meta(property='twitter:card' content='summary')
- else
- meta(property='og:image' content= post.files[0].thumbnailUrl)
- meta(property='twitter:card' content='summary_large_image')
-
-block meta
- if user.host || profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
-
- // todo
- if user.twitter
- meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
-
- if !user.host
- link(rel='alternate' href=url type='application/activity+json')
diff --git a/packages/backend/src/server/web/views/gallery-post.tsx b/packages/backend/src/server/web/views/gallery-post.tsx
new file mode 100644
index 0000000000..2bec2de930
--- /dev/null
+++ b/packages/backend/src/server/web/views/gallery-post.tsx
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function GalleryPostPage(props: CommonProps<{
+ galleryPost: Packed<'GalleryPost'>;
+ profile: MiUserProfile;
+}>) {
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={props.galleryPost.title} />
+ {props.galleryPost.description != null ? <meta property="og:description" content={props.galleryPost.description} /> : null}
+ <meta property="og:url" content={`${props.config.url}/gallery/${props.galleryPost.id}`} />
+ {props.galleryPost.isSensitive && props.galleryPost.user.avatarUrl ? (
+ <>
+ <meta property="og:image" content={props.galleryPost.user.avatarUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ ) : null}
+ {!props.galleryPost.isSensitive && props.galleryPost.files != null ? (
+ <>
+ <meta property="og:image" content={props.galleryPost.files[0]!.thumbnailUrl ?? props.galleryPost.files[0]!.url} />
+ <meta property="twitter:card" content="summary_large_image" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.galleryPost.user.username} />
+ <meta name="misskey:user-id" content={props.galleryPost.user.id} />
+ <meta name="misskey:gallery-post-id" content={props.galleryPost.id} />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.galleryPost.title} | ${props.instanceName}`}
+ desc={props.galleryPost.description ?? ''}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/info-card.pug b/packages/backend/src/server/web/views/info-card.pug
deleted file mode 100644
index 2a4954ec8b..0000000000
--- a/packages/backend/src/server/web/views/info-card.pug
+++ /dev/null
@@ -1,50 +0,0 @@
-doctype html
-
-html
-
- head
- meta(charset='utf-8')
- meta(name='application-name' content='Misskey')
- title= meta.name || host
- style.
- html, body {
- margin: 0;
- padding: 0;
- min-height: 100vh;
- background: #fff;
- }
-
- #a {
- display: block;
- }
-
- #banner {
- background-size: cover;
- background-position: center center;
- }
-
- #title {
- display: inline-block;
- margin: 24px;
- padding: 0.5em 0.8em;
- color: #fff;
- background: rgba(0, 0, 0, 0.5);
- font-weight: bold;
- font-size: 1.3em;
- }
-
- #content {
- overflow: auto;
- color: #353c3e;
- }
-
- #description {
- margin: 24px;
- }
-
- body
- a#a(href=`https://${host}` target="_blank")
- header#banner(style=`background-image: url(${meta.bannerUrl})`)
- div#title= meta.name || host
- div#content
- div#description!= meta.description
diff --git a/packages/backend/src/server/web/views/info-card.tsx b/packages/backend/src/server/web/views/info-card.tsx
new file mode 100644
index 0000000000..27be4c69e8
--- /dev/null
+++ b/packages/backend/src/server/web/views/info-card.tsx
@@ -0,0 +1,40 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { comment, CommonPropsMinimum } from '@/server/web/views/_.js';
+import type { MiMeta } from '@/models/Meta.js';
+
+export function InfoCardPage(props: CommonPropsMinimum<{
+ meta: MiMeta;
+}>) {
+ // 変数名をsafeで始めることでエラーをスキップ
+ const safeDescription = props.meta.description;
+
+ return (
+ <>
+ {'<!DOCTYPE html>'}
+ {comment}
+ <html>
+ <head>
+ <meta charset="UTF-8" />
+ <meta name="application-name" content="Misskey" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title safe>{props.meta.name ?? props.config.url}</title>
+ <link rel="stylesheet" href="/static-assets/misc/info-card.css" />
+ </head>
+ <body>
+ <a id="a" href={props.config.url} target="_blank" rel="noopener noreferrer">
+ <header id="banner" style={props.meta.bannerUrl != null ? `background-image: url(${props.meta.bannerUrl});` : ''}>
+ <div id="title" safe>{props.meta.name ?? props.config.url}</div>
+ </header>
+ </a>
+ <div id="content">
+ <div id="description">{safeDescription}</div>
+ </div>
+ </body>
+ </html>
+ </>
+ );
+}
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
deleted file mode 100644
index ea1993aed0..0000000000
--- a/packages/backend/src/server/web/views/note.pug
+++ /dev/null
@@ -1,62 +0,0 @@
-extends ./base
-
-block vars
- - const user = note.user;
- - const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
- - const url = `${config.url}/notes/${note.id}`;
- - const isRenote = note.renote && note.text == null && note.fileIds.length == 0 && note.poll == null;
- - const images = (note.files || []).filter(file => file.type.startsWith('image/') && !file.isSensitive)
- - const videos = (note.files || []).filter(file => file.type.startsWith('video/') && !file.isSensitive)
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= summary)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= summary)
- meta(property='og:url' content= url)
- if videos.length
- each video in videos
- meta(property='og:video:url' content= video.url)
- meta(property='og:video:secure_url' content= video.url)
- meta(property='og:video:type' content= video.type)
- // FIXME: add width and height
- // FIXME: add embed player for Twitter
- if images.length
- meta(property='twitter:card' content='summary_large_image')
- each image in images
- meta(property='og:image' content= image.url)
- else
- meta(property='twitter:card' content='summary')
- meta(property='og:image' content= avatarUrl)
-
-
-block meta
- if user.host || isRenote || profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
- meta(name='misskey:note-id' content=note.id)
-
- // todo
- if user.twitter
- meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
-
- if note.prev
- link(rel='prev' href=`${config.url}/notes/${note.prev}`)
- if note.next
- link(rel='next' href=`${config.url}/notes/${note.next}`)
-
- if federationEnabled
- if !user.host
- link(rel='alternate' href=url type='application/activity+json')
- if note.uri
- link(rel='alternate' href=note.uri type='application/activity+json')
diff --git a/packages/backend/src/server/web/views/note.tsx b/packages/backend/src/server/web/views/note.tsx
new file mode 100644
index 0000000000..803c3d2537
--- /dev/null
+++ b/packages/backend/src/server/web/views/note.tsx
@@ -0,0 +1,94 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+import { isRenotePacked } from '@/misc/is-renote.js';
+import { getNoteSummary } from '@/misc/get-note-summary.js';
+
+export function NotePage(props: CommonProps<{
+ note: Packed<'Note'>;
+ profile: MiUserProfile;
+}>) {
+ const title = props.note.user.name ? `${props.note.user.name} (@${props.note.user.username}${props.note.user.host ? `@${props.note.user.host}` : ''})` : `@${props.note.user.username}${props.note.user.host ? `@${props.note.user.host}` : ''}`
+ const isRenote = isRenotePacked(props.note);
+ const images = (props.note.files ?? []).filter(f => f.type.startsWith('image/'));
+ const videos = (props.note.files ?? []).filter(f => f.type.startsWith('video/'));
+ const summary = getNoteSummary(props.note);
+
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={title} />
+ <meta property="og:description" content={summary} />
+ <meta property="og:url" content={`${props.config.url}/notes/${props.note.id}`} />
+ {videos.map(video => (
+ <>
+ <meta property="og:video:url" content={video.url} />
+ <meta property="og:video:secure_url" content={video.url} />
+ <meta property="og:video:type" content={video.type} />
+ {video.thumbnailUrl ? <meta property="og:video:image" content={video.thumbnailUrl} /> : null}
+ {video.properties.width != null ? <meta property="og:video:width" content={video.properties.width.toString()} /> : null}
+ {video.properties.height != null ? <meta property="og:video:height" content={video.properties.height.toString()} /> : null}
+ </>
+ ))}
+ {images.length > 0 ? (
+ <>
+ <meta property="twitter:card" content="summary_large_image" />
+ {images.map(image => (
+ <>
+ <meta property="og:image" content={image.url} />
+ {image.properties.width != null ? <meta property="og:image:width" content={image.properties.width.toString()} /> : null}
+ {image.properties.height != null ? <meta property="og:image:height" content={image.properties.height.toString()} /> : null}
+ </>
+ ))}
+ </>
+ ) : (
+ <>
+ <meta property="twitter:card" content="summary" />
+ <meta property="og:image" content={props.note.user.avatarUrl} />
+ </>
+ )}
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.note.user.host != null || isRenote || props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.note.user.username} />
+ <meta name="misskey:user-id" content={props.note.user.id} />
+ <meta name="misskey:note-id" content={props.note.id} />
+
+ {props.federationEnabled ? (
+ <>
+ {props.note.user.host == null ? <link rel="alternate" type="application/activity+json" href={`${props.config.url}/notes/${props.note.id}`} /> : null}
+ {props.note.uri != null ? <link rel="alternate" type="application/activity+json" href={props.note.uri} /> : null}
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${title} | ${props.instanceName}`}
+ desc={summary}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ ></Layout>
+ )
+}
diff --git a/packages/backend/src/server/web/views/oauth.pug b/packages/backend/src/server/web/views/oauth.pug
deleted file mode 100644
index 4195ccc3a3..0000000000
--- a/packages/backend/src/server/web/views/oauth.pug
+++ /dev/null
@@ -1,11 +0,0 @@
-extends ./base
-
-block meta
- //- Should be removed by the page when it loads, so that it won't needlessly
- //- stay when user navigates away via the navigation bar
- //- XXX: Remove navigation bar in auth page?
- meta(name='misskey:oauth:transaction-id' content=transactionId)
- meta(name='misskey:oauth:client-name' content=clientName)
- if clientLogo
- meta(name='misskey:oauth:client-logo' content=clientLogo)
- meta(name='misskey:oauth:scope' content=scope)
diff --git a/packages/backend/src/server/web/views/oauth.tsx b/packages/backend/src/server/web/views/oauth.tsx
new file mode 100644
index 0000000000..d12b0d15fd
--- /dev/null
+++ b/packages/backend/src/server/web/views/oauth.tsx
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function OAuthPage(props: CommonProps<{
+ transactionId: string;
+ clientName: string;
+ clientLogo?: string;
+ scope: string[];
+}>) {
+
+ //- Should be removed by the page when it loads, so that it won't needlessly
+ //- stay when user navigates away via the navigation bar
+ //- XXX: Remove navigation bar in auth page?
+ function metaBlock() {
+ return (
+ <>
+ <meta name="misskey:oauth:transaction-id" content={props.transactionId} />
+ <meta name="misskey:oauth:client-name" content={props.clientName} />
+ {props.clientLogo ? <meta name="misskey:oauth:client-logo" content={props.clientLogo} /> : null}
+ <meta name="misskey:oauth:scope" content={props.scope.join(' ')} />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ metaSlot={metaBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/page.pug b/packages/backend/src/server/web/views/page.pug
deleted file mode 100644
index 03c50eca8a..0000000000
--- a/packages/backend/src/server/web/views/page.pug
+++ /dev/null
@@ -1,35 +0,0 @@
-extends ./base
-
-block vars
- - const user = page.user;
- - const title = page.title;
- - const url = `${config.url}/@${user.username}/pages/${page.name}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= page.summary)
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content= page.summary)
- meta(property='og:url' content= url)
- meta(property='og:image' content= page.eyeCatchingImage ? page.eyeCatchingImage.thumbnailUrl : avatarUrl)
- meta(property='twitter:card' content= page.eyeCatchingImage ? 'summary_large_image' : 'summary')
-
-block meta
- if profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
- meta(name='misskey:page-id' content=page.id)
-
- // todo
- if user.twitter
- meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/src/server/web/views/page.tsx b/packages/backend/src/server/web/views/page.tsx
new file mode 100644
index 0000000000..d0484612df
--- /dev/null
+++ b/packages/backend/src/server/web/views/page.tsx
@@ -0,0 +1,64 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function PagePage(props: CommonProps<{
+ page: Packed<'Page'>;
+ profile: MiUserProfile;
+}>) {
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={props.page.title} />
+ {props.page.summary != null ? <meta property="og:description" content={props.page.summary} /> : null}
+ <meta property="og:url" content={`${props.config.url}/pages/${props.page.id}`} />
+ {props.page.eyeCatchingImage != null ? (
+ <>
+ <meta property="og:image" content={props.page.eyeCatchingImage.thumbnailUrl ?? props.page.eyeCatchingImage.url} />
+ <meta property="twitter:card" content="summary_large_image" />
+ </>
+ ) : props.page.user.avatarUrl ? (
+ <>
+ <meta property="og:image" content={props.page.user.avatarUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ ) : null}
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.page.user.username} />
+ <meta name="misskey:user-id" content={props.page.user.id} />
+ <meta name="misskey:page-id" content={props.page.id} />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.page.title} | ${props.instanceName}`}
+ desc={props.page.summary ?? ''}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/reversi-game.pug b/packages/backend/src/server/web/views/reversi-game.pug
deleted file mode 100644
index 0b5ffb2bb0..0000000000
--- a/packages/backend/src/server/web/views/reversi-game.pug
+++ /dev/null
@@ -1,20 +0,0 @@
-extends ./base
-
-block vars
- - const user1 = game.user1;
- - const user2 = game.user2;
- - const title = `${user1.username} vs ${user2.username}`;
- - const url = `${config.url}/reversi/g/${game.id}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content='⚫⚪Misskey Reversi⚪⚫')
-
-block og
- meta(property='og:type' content='article')
- meta(property='og:title' content= title)
- meta(property='og:description' content='⚫⚪Misskey Reversi⚪⚫')
- meta(property='og:url' content= url)
- meta(property='twitter:card' content='summary')
diff --git a/packages/backend/src/server/web/views/reversi-game.tsx b/packages/backend/src/server/web/views/reversi-game.tsx
new file mode 100644
index 0000000000..22609311fd
--- /dev/null
+++ b/packages/backend/src/server/web/views/reversi-game.tsx
@@ -0,0 +1,37 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function ReversiGamePage(props: CommonProps<{
+ reversiGame: Packed<'ReversiGameDetailed'>;
+}>) {
+ const title = `${props.reversiGame.user1.username} vs ${props.reversiGame.user2.username}`;
+ const description = `⚫⚪Misskey Reversi⚪⚫`;
+
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="article" />
+ <meta property="og:title" content={title} />
+ <meta property="og:description" content={description} />
+ <meta property="og:url" content={`${props.config.url}/reversi/g/${props.reversiGame.id}`} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${title} | ${props.instanceName}`}
+ desc={description}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
deleted file mode 100644
index b9f740f5b6..0000000000
--- a/packages/backend/src/server/web/views/user.pug
+++ /dev/null
@@ -1,44 +0,0 @@
-extends ./base
-
-block vars
- - const title = user.name ? `${user.name} (@${user.username}${user.host ? `@${user.host}` : ''})` : `@${user.username}${user.host ? `@${user.host}` : ''}`;
- - const url = `${config.url}/@${(user.host ? `${user.username}@${user.host}` : user.username)}`;
-
-block title
- = `${title} | ${instanceName}`
-
-block desc
- meta(name='description' content= profile.description)
-
-block og
- meta(property='og:type' content='blog')
- meta(property='og:title' content= title)
- meta(property='og:description' content= profile.description)
- meta(property='og:url' content= url)
- meta(property='og:image' content= avatarUrl)
- meta(property='twitter:card' content='summary')
-
-block meta
- if user.host || profile.noCrawle
- meta(name='robots' content='noindex')
- if profile.preventAiLearning
- meta(name='robots' content='noimageai')
- meta(name='robots' content='noai')
-
- meta(name='misskey:user-username' content=user.username)
- meta(name='misskey:user-id' content=user.id)
-
- if profile.twitter
- meta(name='twitter:creator' content=`@${profile.twitter.screenName}`)
-
- if !sub
- if federationEnabled
- if !user.host
- link(rel='alternate' href=`${config.url}/users/${user.id}` type='application/activity+json')
- if user.uri
- link(rel='alternate' href=user.uri type='application/activity+json')
- if profile.url
- link(rel='alternate' href=profile.url type='text/html')
-
- each m in me
- link(rel='me' href=`${m}`)
diff --git a/packages/backend/src/server/web/views/user.tsx b/packages/backend/src/server/web/views/user.tsx
new file mode 100644
index 0000000000..76c2633ab9
--- /dev/null
+++ b/packages/backend/src/server/web/views/user.tsx
@@ -0,0 +1,74 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import type { Packed } from '@/misc/json-schema.js';
+import type { MiUserProfile } from '@/models/UserProfile.js';
+import type { CommonProps } from '@/server/web/views/_.js';
+import { Layout } from '@/server/web/views/base.js';
+
+export function UserPage(props: CommonProps<{
+ user: Packed<'UserDetailed'>;
+ profile: MiUserProfile;
+ sub?: string;
+}>) {
+ const title = props.user.name ? `${props.user.name} (@${props.user.username}${props.user.host ? `@${props.user.host}` : ''})` : `@${props.user.username}${props.user.host ? `@${props.user.host}` : ''}`;
+ const me = props.profile.fields
+ ? props.profile.fields
+ .filter(field => field.value != null && field.value.match(/^https?:/))
+ .map(field => field.value)
+ : [];
+
+ function ogBlock() {
+ return (
+ <>
+ <meta property="og:type" content="blog" />
+ <meta property="og:title" content={title} />
+ {props.user.description != null ? <meta property="og:description" content={props.user.description} /> : null}
+ <meta property="og:url" content={`${props.config.url}/@${props.user.username}`} />
+ <meta property="og:image" content={props.user.avatarUrl} />
+ <meta property="twitter:card" content="summary" />
+ </>
+ );
+ }
+
+ function metaBlock() {
+ return (
+ <>
+ {props.user.host != null || props.profile.noCrawle ? <meta name="robots" content="noindex" /> : null}
+ {props.profile.preventAiLearning ? (
+ <>
+ <meta name="robots" content="noimageai" />
+ <meta name="robots" content="noai" />
+ </>
+ ) : null}
+ <meta name="misskey:user-username" content={props.user.username} />
+ <meta name="misskey:user-id" content={props.user.id} />
+
+ {props.sub == null && props.federationEnabled ? (
+ <>
+ {props.user.host == null ? <link rel="alternate" type="application/activity+json" href={`${props.config.url}/users/${props.user.id}`} /> : null}
+ {props.user.uri != null ? <link rel="alternate" type="application/activity+json" href={props.user.uri} /> : null}
+ {props.profile.url != null ? <link rel="alternate" type="text/html" href={props.profile.url} /> : null}
+ </>
+ ) : null}
+
+ {me.map((url) => (
+ <link rel="me" href={url} />
+ ))}
+ </>
+ );
+ }
+
+ return (
+ <Layout
+ {...props}
+ title={`${props.user.name || props.user.username} (@${props.user.username}) | ${props.instanceName}`}
+ desc={props.user.description ?? ''}
+ metaSlot={metaBlock()}
+ ogSlot={ogBlock()}
+ >
+ </Layout>
+ );
+}