From e42d546550a3c20ce738e364186ea5cf1d1c9296 Mon Sep 17 00:00:00 2001 From: kozakura913 <98575220+kozakura913@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:36:26 +0900 Subject: [PATCH 01/24] basedCherrypickVersion --- package.json | 7 ++--- packages/backend/src/boot/master.ts | 9 ++++--- packages/backend/src/config.ts | 3 +++ .../src/core/FetchInstanceMetadataService.ts | 1 + .../src/core/entities/MetaEntityService.ts | 1 + .../backend/src/models/json-schema/meta.ts | 4 +++ .../src/server/NodeinfoServerService.ts | 3 ++- .../src/server/api/endpoints/admin/meta.ts | 1 + .../src/server/api/openapi/gen-spec.ts | 6 ++--- .../src/server/web/ClientServerService.ts | 4 +++ packages/backend/src/server/web/boot.embed.js | 5 ++++ packages/backend/src/server/web/boot.js | 5 ++++ .../src/server/web/views/base-embed.pug | 1 + .../backend/src/server/web/views/base.pug | 1 + packages/cherrypick-js/package.json | 7 ++--- packages/cherrypick-js/src/autogen/types.ts | 1 + packages/frontend-embed/@types/global.d.ts | 1 + packages/frontend-embed/eslint.config.js | 3 +++ packages/frontend-embed/vite.config.ts | 1 + packages/frontend-shared/@types/global.d.ts | 1 + packages/frontend-shared/js/config.ts | 1 + packages/frontend/@types/global.d.ts | 1 + packages/frontend/eslint.config.js | 3 +++ packages/frontend/src/boot/common.ts | 11 +++++--- .../frontend/src/components/MkMigrated.vue | 17 +++++++----- .../frontend/src/components/MkUpdated.vue | 9 ++++--- packages/frontend/src/local-storage.ts | 2 ++ packages/frontend/src/pages/about-misskey.vue | 26 +++++++++++++++---- .../pages/settings/preferences-backups.vue | 8 ++++-- packages/frontend/vite.config.ts | 1 + packages/meta.json | 3 ++- packages/sw/build.js | 1 + packages/sw/eslint.config.js | 1 + packages/sw/src/@types/global.d.ts | 1 + packages/sw/src/sw.ts | 2 +- scripts/build-pre.js | 2 +- 36 files changed, 116 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index 6a3c50e4d5..593bfaba83 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { - "name": "cherrypick", - "version": "4.13.0-yojo1.2.0", + "name": "yojo-art", + "version": "1.2.0", "basedMisskeyVersion": "2024.10.1", + "basedCherrypickVersion": "4.13.0", "codename": "nasubi", "repository": { "type": "git", - "url": "https://github.com/kokonect-link/cherrypick.git" + "url": "https://github.com/yojo-art/cherrypick.git" }, "packageManager": "pnpm@9.6.0", "workspaces": [ diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 73c91c4623..e4b27912e7 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -41,17 +41,18 @@ function greet() { console.log(chalk.hex('#ffa9c3').bold(' \\/ \\/ \\/ \\/ ') + chalk.hex('#95e3e8').bold(' \\/ \\/')); //#endregion - console.log(chalk.hex('#ffa9c3').bold(' Cherry') + chalk.hex('#95e3e8').bold('Pick') + (' is an open-source decentralized microblogging platform based from') + (chalk.hex('#9ec23f').bold(' Misskey') + ('.'))); - console.log(chalk.hex('#ffbb00')(' If you like ') + chalk.hex('#ffa9c3').bold('Cherry') + chalk.hex('#95e3e8').bold('Pick') + chalk.hex('#ffbb00')(', please donate to support development. https://www.patreon.com/noridev & https://www.paypal.me/noridev & https://toss.me/noridev')); + console.log(chalk.hex('#ffa9c3').bold(' yojo') + chalk.hex('#98e2cf').bold('-') + chalk.hex('#95e3e8').bold('art') + (' is an open-source decentralized microblogging platform based from') + (chalk.hex('#9ec23f').bold(' Misskey') + (' and ') + chalk.hex('#ffa9c3').bold(' Cherry') + chalk.hex('#95e3e8').bold('Pick') + '.')); + console.log(chalk.hex('#ffbb00')(' If you like ') + chalk.hex('#ffa9c3').bold(' yojo') + chalk.hex('#98e2cf').bold('-') + chalk.hex('#95e3e8').bold('art') + chalk.hex('#ffbb00')(', please donate to support development. https://github.com/yojo-art & https://幼女.art/')); // console.log(chalk.hex('#ffa9c3').bold(' KOKO') + chalk.hex('#95e3e8').bold('NECT') + chalk.hex('#ffa9c3')(' with') + chalk.hex('#95e3e8').bold(' NoriDev.')); console.log(''); console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`); } - bootLogger.info('Welcome to CherryPick!'); - bootLogger.info(`CherryPick v${meta.version}`, null, true); + bootLogger.info('Welcome to yojo-art!'); + bootLogger.info(`yojo-art v${meta.version}`, null, true); bootLogger.info(`Based on Misskey v${meta.basedMisskeyVersion}`, null, true); + bootLogger.info(`Based on Cherrypick v${meta.basedCherrypickVersion}`, null, true); } /** diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index ecfd3582f1..999d1d32c2 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -194,6 +194,7 @@ export type Config = { version: string; basedMisskeyVersion: string; + basedCherrypickVersion: string; publishTarballInsteadOfProvideRepositoryUrl: boolean; setupPassword: string | undefined; host: string; @@ -261,6 +262,7 @@ export function loadConfig(): Config { const url = tryCreateUrl(config.url ?? process.env.CHERRYPICK_URL ?? ''); const version = meta.version; const basedMisskeyVersion = meta.basedMisskeyVersion; + const basedCherrypickVersion = meta.basedCherrypickVersion; const host = url.host; const hostname = url.hostname; const scheme = url.protocol.replace(/:$/, ''); @@ -284,6 +286,7 @@ export function loadConfig(): Config { return { version, basedMisskeyVersion, + basedCherrypickVersion, publishTarballInsteadOfProvideRepositoryUrl: !!config.publishTarballInsteadOfProvideRepositoryUrl, setupPassword: config.setupPassword, url: url.origin, diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts index 530b37e7a0..53175138f0 100644 --- a/packages/backend/src/core/FetchInstanceMetadataService.ts +++ b/packages/backend/src/core/FetchInstanceMetadataService.ts @@ -23,6 +23,7 @@ type NodeInfo = { name?: unknown; version?: unknown; basedMisskeyVersion?: unknown; + basedCherrypickVersion?: unknown; }; metadata?: { name?: unknown; diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts index e535dbd851..c94a58a4e5 100644 --- a/packages/backend/src/core/entities/MetaEntityService.ts +++ b/packages/backend/src/core/entities/MetaEntityService.ts @@ -74,6 +74,7 @@ export class MetaEntityService { version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, providesTarball: this.config.publishTarballInsteadOfProvideRepositoryUrl, name: instance.name, diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts index 98b7ce3643..4f1a301e86 100644 --- a/packages/backend/src/models/json-schema/meta.ts +++ b/packages/backend/src/models/json-schema/meta.ts @@ -23,6 +23,10 @@ export const packedMetaLiteSchema = { type: 'string', optional: false, nullable: false, }, + basedCherrypickVersion: { + type: 'string', + optional: false, nullable: false, + }, providesTarball: { type: 'boolean', optional: false, nullable: false, diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts index 7b66962f08..be4d371bfc 100644 --- a/packages/backend/src/server/NodeinfoServerService.ts +++ b/packages/backend/src/server/NodeinfoServerService.ts @@ -83,9 +83,10 @@ export class NodeinfoServerService { * ソフトウェアの名前を変更すると、一部の独自機能が使用できなくなったり、CherryPickとして認識されないなどの不利益が発生する場合があります。 * フォーク開発者はこの点に注意して修正を行ってください。 */ - name: 'cherrypick', + name: 'yojo-art', version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, homepage: nodeinfo_homepage, repository: meta.repositoryUrl, }, diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts index ac51050c42..c5da3c6c0b 100644 --- a/packages/backend/src/server/api/endpoints/admin/meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/meta.ts @@ -660,6 +660,7 @@ export default class extends Endpoint { // eslint- maintainerEmail: instance.maintainerEmail, version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, name: instance.name, shortName: instance.shortName, uri: this.config.url, diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index 40131ca4db..1c137c2143 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -13,13 +13,13 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) { openapi: '3.1.0', info: { - version: `${config.version} (${config.basedMisskeyVersion})`, - title: 'CherryPick API', + version: `${config.version} (${config.basedCherrypickVersion}) (${config.basedMisskeyVersion})`, + title: 'yojo-art API', }, externalDocs: { description: 'Repository', - url: 'https://github.com/kokonect-link/cherrypick', + url: 'https://github.com/yojo-art/cherrypick', }, servers: [{ diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index fdbb2c0169..695df07fcb 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -275,6 +275,7 @@ export class ClientServerService { defaultContext: { version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, config: this.config, }, }); @@ -876,6 +877,7 @@ export class ClientServerService { return await reply.view('info-card', { version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, host: this.config.host, meta: this.meta, originalUsersCount: await this.usersRepository.countBy({ host: IsNull() }), @@ -888,6 +890,7 @@ export class ClientServerService { return await reply.view('bios', { version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, }); }); @@ -895,6 +898,7 @@ export class ClientServerService { return await reply.view('cli', { version: this.config.version, basedMisskeyVersion: this.config.basedMisskeyVersion, + basedCherrypickVersion: this.config.basedCherrypickVersion, }); }); diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js index c5bc2c0020..ced1a802f4 100644 --- a/packages/backend/src/server/web/boot.embed.js +++ b/packages/backend/src/server/web/boot.embed.js @@ -62,6 +62,7 @@ const meta = await metaRes.json(); const v = meta.version; const basedMisskeyVersion = meta.basedMisskeyVersion; + const basedCherrypickVersion = meta.basedCherrypickVersion; if (v == null) { renderError('META_FETCH_V'); return; @@ -71,6 +72,10 @@ renderError('META_FETCH_BASEDMISSKEY_V'); return; } + if (basedCherrypickVersion == null) { + renderError('META_FETCH_BASEDCHERRYPICK_V'); + return; + } // for https://github.com/misskey-dev/misskey/issues/10202 if (lang == null || lang.toString == null || lang.toString() === 'null') { diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index 07ac89ced8..efda54eb5f 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -53,6 +53,7 @@ const meta = await metaRes.json(); const v = meta.version; const basedMisskeyVersion = meta.basedMisskeyVersion; + const basedCherrypickVersion = meta.basedCherrypickVersion; if (v == null) { renderError('META_FETCH_V'); return; @@ -61,6 +62,10 @@ renderError('META_FETCH_BASEDMISSKEY_V'); return; } + if (basedCherrypickVersion == null) { + renderError('META_FETCH_BASEDCHERRYPICK_V'); + return; + } // for https://github.com/misskey-dev/misskey/issues/10202 if (lang == null || lang.toString == null || lang.toString() === 'null') { diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug index 9dae58dfbf..b80c3f34b5 100644 --- a/packages/backend/src/server/web/views/base-embed.pug +++ b/packages/backend/src/server/web/views/base-embed.pug @@ -41,6 +41,7 @@ html(class='embed') script. var VERSION = "#{version}"; var BASED_MISSKEY_VERSION = "#{basedMisskeyVersion}"; + var BASED_CHERRYPICK_VERSION = "#{basedCherrypickVersion}"; var CLIENT_ENTRY = "#{entry.file}"; script(type='application/json' id='cherrypick_meta' data-generated-at=now) diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 2a3d9c09e4..c51b2726a8 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -69,6 +69,7 @@ html script. var VERSION = "#{version}"; var BASED_MISSKEY_VERSION = "#{basedMisskeyVersion}"; + var BASED_CHERRYPICK_VERSION = "#{basedCherrypickVersion}"; var CLIENT_ENTRY = "#{entry.file}"; script(type='application/json' id='cherrypick_meta' data-generated-at=now) diff --git a/packages/cherrypick-js/package.json b/packages/cherrypick-js/package.json index c222ece482..01db288fdf 100644 --- a/packages/cherrypick-js/package.json +++ b/packages/cherrypick-js/package.json @@ -1,9 +1,10 @@ { "type": "module", "name": "cherrypick-js", - "version": "4.13.0-yojo1.2.0", + "version": "1.2.0", "basedMisskeyVersion": "2024.10.1", - "description": "CherryPick SDK for JavaScript", + "basedCherrypickVersion": "4.13.0", + "description": "yojo-art SDK for JavaScript", "license": "MIT", "main": "./built/index.js", "types": "./built/index.d.ts", @@ -35,7 +36,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/kokonect-link/cherrypick.git", + "url": "https://github.com/yojo-art/cherrypick.git", "directory": "packages/cherrypick-js" }, "devDependencies": { diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts index d708581b6b..f587a59889 100644 --- a/packages/cherrypick-js/src/autogen/types.ts +++ b/packages/cherrypick-js/src/autogen/types.ts @@ -5355,6 +5355,7 @@ export type components = { maintainerEmail: string | null; version: string; basedMisskeyVersion: string; + basedCherrypickVersion: string; providesTarball: boolean; name: string | null; shortName: string | null; diff --git a/packages/frontend-embed/@types/global.d.ts b/packages/frontend-embed/@types/global.d.ts index 2f6fc9e729..6ca7f3c52c 100644 --- a/packages/frontend-embed/@types/global.d.ts +++ b/packages/frontend-embed/@types/global.d.ts @@ -8,6 +8,7 @@ type FIXME = any; declare const _LANGS_: string[][]; declare const _VERSION_: string; declare const _BASEDMISSKEYVERSION_: string; +declare const _BASEDCHERRYPICKVERSION_: string; declare const _ENV_: string; declare const _DEV_: boolean; declare const _PERF_PREFIX_: string; diff --git a/packages/frontend-embed/eslint.config.js b/packages/frontend-embed/eslint.config.js index 917bd3a82a..33b539a3d5 100644 --- a/packages/frontend-embed/eslint.config.js +++ b/packages/frontend-embed/eslint.config.js @@ -34,6 +34,9 @@ export default [ _DATA_TRANSFER_DRIVE_FILE_: false, _DATA_TRANSFER_DRIVE_FOLDER_: false, _DATA_TRANSFER_DECK_COLUMN_: false, + + // yojo-art + _BASEDCHERRYPICKVERSION_: false, }, parser, parserOptions: { diff --git a/packages/frontend-embed/vite.config.ts b/packages/frontend-embed/vite.config.ts index f78f0a1a3e..6d7616290d 100644 --- a/packages/frontend-embed/vite.config.ts +++ b/packages/frontend-embed/vite.config.ts @@ -110,6 +110,7 @@ export function getConfig(): UserConfig { define: { _VERSION_: JSON.stringify(meta.version), _BASEDMISSKEYVERSION_: JSON.stringify(meta.basedMisskeyVersion), + _BASEDCHERRYPICKVERSION_: JSON.stringify(meta.basedCherrypickVersion), _LANGS_: JSON.stringify(Object.entries(locales).map(([k, v]) => [k, v._lang_])), _ENV_: JSON.stringify(process.env.NODE_ENV), _DEV_: process.env.NODE_ENV !== 'production', diff --git a/packages/frontend-shared/@types/global.d.ts b/packages/frontend-shared/@types/global.d.ts index 232c12f3bf..9be4882ada 100644 --- a/packages/frontend-shared/@types/global.d.ts +++ b/packages/frontend-shared/@types/global.d.ts @@ -9,6 +9,7 @@ type FIXME = any; declare const _LANGS_: string[][]; declare const _VERSION_: string; declare const _BASEDMISSKEYVERSION_: string; +declare const _BASEDCHERRYPICKVERSION_: string; declare const _ENV_: string; declare const _DEV_: boolean; declare const _PERF_PREFIX_: string; diff --git a/packages/frontend-shared/js/config.ts b/packages/frontend-shared/js/config.ts index 57095e9ff2..ca76e075d0 100644 --- a/packages/frontend-shared/js/config.ts +++ b/packages/frontend-shared/js/config.ts @@ -20,6 +20,7 @@ const preParseLocale = localStorage.getItem('locale'); export let locale: Locale = preParseLocale ? JSON.parse(preParseLocale) : null; export const version = _VERSION_; export const basedMisskeyVersion = _BASEDMISSKEYVERSION_; +export const basedCherrypickVersion = _BASEDCHERRYPICKVERSION_; export const instanceName = (siteName === 'CherryPick' || siteName == null) ? host : siteName; export const ui = localStorage.getItem('ui'); export const debug = localStorage.getItem('debug') === 'true'; diff --git a/packages/frontend/@types/global.d.ts b/packages/frontend/@types/global.d.ts index 2f6fc9e729..6ca7f3c52c 100644 --- a/packages/frontend/@types/global.d.ts +++ b/packages/frontend/@types/global.d.ts @@ -8,6 +8,7 @@ type FIXME = any; declare const _LANGS_: string[][]; declare const _VERSION_: string; declare const _BASEDMISSKEYVERSION_: string; +declare const _BASEDCHERRYPICKVERSION_: string; declare const _ENV_: string; declare const _DEV_: boolean; declare const _PERF_PREFIX_: string; diff --git a/packages/frontend/eslint.config.js b/packages/frontend/eslint.config.js index 917bd3a82a..33b539a3d5 100644 --- a/packages/frontend/eslint.config.js +++ b/packages/frontend/eslint.config.js @@ -34,6 +34,9 @@ export default [ _DATA_TRANSFER_DRIVE_FILE_: false, _DATA_TRANSFER_DRIVE_FOLDER_: false, _DATA_TRANSFER_DECK_COLUMN_: false, + + // yojo-art + _BASEDCHERRYPICKVERSION_: false, }, parser, parserOptions: { diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index 77985e1851..432cb1080a 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -5,7 +5,7 @@ import { computed, watch, version as vueVersion, App, defineAsyncComponent } from 'vue'; import { compareVersions } from 'compare-versions'; -import { version, basedMisskeyVersion, lang, updateLocale, locale } from '@@/js/config.js'; +import { version, basedMisskeyVersion, basedCherrypickVersion, lang, updateLocale, locale } from '@@/js/config.js'; import widgets from '@/widgets/index.js'; import directives from '@/directives/index.js'; import components from '@/components/index.js'; @@ -75,16 +75,18 @@ export async function common(createVue: () => App) { //#region クライアントが更新されたかチェック const lastVersion = miLocalStorage.getItem('lastVersion'); const lastBasedMisskeyVersion = miLocalStorage.getItem('lastBasedMisskeyVersion'); - if (lastVersion !== version || lastBasedMisskeyVersion !== basedMisskeyVersion) { + const lastBasedCherrypickVersion = miLocalStorage.getItem('lastBasedCherrypickVersion'); + if (lastVersion !== version || lastBasedMisskeyVersion !== basedMisskeyVersion || lastBasedCherrypickVersion !== basedCherrypickVersion) { if (lastVersion == null) miLocalStorage.setItem('lastVersion', version); else if (compareVersions(version, lastVersion) === 0 || compareVersions(version, lastVersion) === 1) miLocalStorage.setItem('lastVersion', version); miLocalStorage.setItem('lastBasedMisskeyVersion', basedMisskeyVersion); + miLocalStorage.setItem('lastBasedCherrypickVersion', basedCherrypickVersion); // テーマリビルドするため miLocalStorage.removeItem('theme'); try { // 変なバージョン文字列来るとcompareVersionsでエラーになるため - if ((lastVersion != null && compareVersions(version, lastVersion) === 1) || (lastBasedMisskeyVersion != null && compareVersions(basedMisskeyVersion, lastBasedMisskeyVersion) === 1)) { + if ((lastVersion != null && compareVersions(version, lastVersion) === 1) || (lastBasedMisskeyVersion != null && compareVersions(basedMisskeyVersion, lastBasedMisskeyVersion) === 1) || (lastBasedCherrypickVersion != null && compareVersions(basedCherrypickVersion, lastBasedCherrypickVersion) === 1)) { isClientUpdated = true; } else if (lastVersion != null && compareVersions(version, lastVersion) === -1) isClientMigrated = true; } catch (err) { /* empty */ } @@ -93,7 +95,7 @@ export async function common(createVue: () => App) { //#region Detect language & fetch translations const localeVersion = miLocalStorage.getItem('localeVersion'); - const localeOutdated = (localeVersion == null || localeVersion !== version || lastBasedMisskeyVersion !== basedMisskeyVersion || locale == null); + const localeOutdated = (localeVersion == null || localeVersion !== version || lastBasedMisskeyVersion !== basedMisskeyVersion || lastBasedCherrypickVersion !== basedCherrypickVersion || locale == null); if (localeOutdated) { const res = await window.fetch(`/assets/locales/${lang}.${version}.json`); if (res.status === 200) { @@ -136,6 +138,7 @@ export async function common(createVue: () => App) { fetchInstanceMetaPromise.then(() => { miLocalStorage.setItem('v', instance.version); miLocalStorage.setItem('basedMisskeyVersion', instance.basedMisskeyVersion); + miLocalStorage.setItem('basedCherrypickVersion', instance.basedCherrypickVersion); }); //#region loginId diff --git a/packages/frontend/src/components/MkMigrated.vue b/packages/frontend/src/components/MkMigrated.vue index 0fa4cd2a06..a4702d676f 100644 --- a/packages/frontend/src/components/MkMigrated.vue +++ b/packages/frontend/src/components/MkMigrated.vue @@ -16,8 +16,9 @@ SPDX-License-Identifier: AGPL-3.0-only
✨{{ version }}🚀
{{ basedMisskeyVersion }}
+
{{ basedCherrypickVersion }}
- {{ i18n.ts.whatIsNew }} + {{ i18n.ts.whatIsNew }} {{ i18n.ts.gotIt }} @@ -35,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only