From a12815eabed735fe8fa4f38aac4895625939b55a Mon Sep 17 00:00:00 2001 From: dakkar Date: Fri, 11 Oct 2024 09:59:21 +0100 Subject: [PATCH] fix some (all?) Misskey references --- packages/backend/src/server/web/ClientServerService.ts | 10 +++++----- packages/backend/src/server/web/boot.embed.js | 4 ++-- packages/backend/src/server/web/views/base-embed.pug | 6 +++--- packages/frontend-embed/src/boot.ts | 4 ++-- packages/frontend-embed/src/index.html | 4 ++-- packages/frontend-embed/src/style.scss | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index c61ead3de0..24ab8b23df 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -491,7 +491,7 @@ export class ClientServerService { return await reply.view('base', { img: this.meta.bannerUrl, url: this.config.url, - title: this.meta.name ?? 'Misskey', + title: this.meta.name ?? 'Sharkey', desc: this.meta.description, ...await this.generateCommonPugData(this.meta), ...data, @@ -817,7 +817,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Misskey', + title: this.meta.name ?? 'Sharkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ user: _user, @@ -840,7 +840,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Misskey', + title: this.meta.name ?? 'Sharkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ note: _note, @@ -861,7 +861,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Misskey', + title: this.meta.name ?? 'Sharkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ clip: _clip, @@ -874,7 +874,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Misskey', + title: this.meta.name ?? 'Sharkey', ...await this.generateCommonPugData(this.meta), }); }); diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js index 48d1cd262b..dfa23d3afd 100644 --- a/packages/backend/src/server/web/boot.embed.js +++ b/packages/backend/src/server/web/boot.embed.js @@ -116,14 +116,14 @@ } document.body.innerHTML = `
読み込みに失敗しました
-
Failed to initialize Misskey
+
Failed to initialize Sharkey
Error Code: ${code}
`; addStyle(` - #misskey_app, + #sharkey_app, #splash { display: none !important; } diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug index 543fb9c04c..6ef9281b8f 100644 --- a/packages/backend/src/server/web/views/base-embed.pug +++ b/packages/backend/src/server/web/views/base-embed.pug @@ -9,11 +9,11 @@ html(class='embed') head meta(charset='utf-8') - meta(name='application-name' content='Misskey') + meta(name='application-name' content='Sharkey') 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='og:site_name' content= instanceName || 'Sharkey') 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') @@ -32,7 +32,7 @@ html(class='embed') title block title - = title || 'Misskey' + = title || 'Sharkey' block meta meta(name='robots' content='noindex') diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts index 3388fcc603..7a16efe4ab 100644 --- a/packages/frontend-embed/src/boot.ts +++ b/packages/frontend-embed/src/boot.ts @@ -22,7 +22,7 @@ import { serverContext } from '@/server-context.js'; import type { Theme } from '@/theme.js'; -console.log('Misskey Embed'); +console.log('Sharkey Embed'); //#region Embedパラメータの取得・パース const params = new URLSearchParams(location.search); @@ -100,7 +100,7 @@ app.provide(DI.embedParams, embedParams); // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210 // なぜか2回実行されることがあるため、mountするdivを1つに制限する const rootEl = ((): HTMLElement => { - const MISSKEY_MOUNT_DIV_ID = 'misskey_app'; + const MISSKEY_MOUNT_DIV_ID = 'sharkey_app'; const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID); diff --git a/packages/frontend-embed/src/index.html b/packages/frontend-embed/src/index.html index 47b0b0e84e..2dbfcc5ddf 100644 --- a/packages/frontend-embed/src/index.html +++ b/packages/frontend-embed/src/index.html @@ -25,12 +25,12 @@ connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com; frame-src *;" /> - + -
+
diff --git a/packages/frontend-embed/src/style.scss b/packages/frontend-embed/src/style.scss index 5381ca6c67..f949d36a31 100644 --- a/packages/frontend-embed/src/style.scss +++ b/packages/frontend-embed/src/style.scss @@ -63,7 +63,7 @@ html, body { scroll-behavior: smooth; } -#misskey_app { +#sharkey_app { height: 100%; }