amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some (all?) Misskey references

Browse Source
This commit is contained in:
dakkar 2024-10-11 09:59:21 +01:00
parent 2da85e1163
commit a12815eabe
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/backend/src/server/web/ClientServerService.ts
View File

@ -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),
});
});

4
packages/backend/src/server/web/boot.embed.js
View File

@ -116,14 +116,14 @@
}
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">読み込みに失敗しました</div>
<div class="submessage">Failed to initialize Misskey</div>
<div class="submessage">Failed to initialize Sharkey</div>
<div class="submessage">Error Code: ${code}</div>
<button onclick="location.reload(!0)">
<div>リロード</div>
<div><small>Reload</small></div>
</button>`;
addStyle(`
#misskey_app,
#sharkey_app,
#splash {
display: none !important;
}

6
packages/backend/src/server/web/views/base-embed.pug
View File

@ -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')

4
packages/frontend-embed/src/boot.ts
View File

@ -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);

4
packages/frontend-embed/src/index.html
View File

@ -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 *;"
/>
<meta property="og:site_name" content="[DEV BUILD] Misskey" />
<meta property="og:site_name" content="[DEV BUILD] Sharkey" />
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<div id="misskey_app"></div>
<div id="sharkey_app"></div>
<script type="module" src="./boot.ts"></script>
</body>
</html>

2
packages/frontend-embed/src/style.scss
View File

@ -63,7 +63,7 @@ html, body {
scroll-behavior: smooth;
}
#misskey_app {
#sharkey_app {
height: 100%;
}