From 8802c36c6220a77f20246845c3345c65301a5203 Mon Sep 17 00:00:00 2001 From: naskya Date: Thu, 9 Nov 2023 21:25:55 +0900 Subject: [PATCH] dev: move repository url --- README.md | 2 +- neko/revert.sql | 3 +++ .../migration-neko/1699302371683-vervis.js | 15 +++++++++++++++ .../migration/1689957674000-firefish-repo.js | 2 +- .../src/server/api/endpoints/latest-version.ts | 14 +++++++------- .../backend/src/server/api/openapi/gen-spec.ts | 2 +- packages/client/src/pages/about-firefish.vue | 2 +- packages/client/src/pages/admin/index.vue | 2 +- packages/firefish-js/package.json | 2 +- 9 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 packages/backend/migration-neko/1699302371683-vervis.js diff --git a/README.md b/README.md index cb344210d..8797677cd 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ ## インストール -[ToDo](https://code.naskya.net/decks/Zm1Am/tickets/Nm7zK) +[ToDo](https://code.naskya.net/decks/4wJQ3/tickets/a3WPw) - インストールスクリプトかインストール方法の説明を提供することを考えています - 遠回りな方法ですが、公式のインストールスクリプトを使いたい場合にはそれを用いて本家の Firefish をインストールしてから下記の手順でこのフォークに移行できます。 diff --git a/neko/revert.sql b/neko/revert.sql index 8350f37d3..fffd6f441 100644 --- a/neko/revert.sql +++ b/neko/revert.sql @@ -1,3 +1,6 @@ +-- vervis +UPDATE meta SET "repositoryUrl" = 'https://git.joinfirefish.org/firefish/firefish'; + -- more-urls ALTER TABLE "meta" DROP COLUMN "moreUrls"; diff --git a/packages/backend/migration-neko/1699302371683-vervis.js b/packages/backend/migration-neko/1699302371683-vervis.js new file mode 100644 index 000000000..041e28156 --- /dev/null +++ b/packages/backend/migration-neko/1699302371683-vervis.js @@ -0,0 +1,15 @@ +export class Vervis1699302371683 { + name = "Vervis1699302371683"; + + async up(queryRunner) { + await queryRunner.query( + `UPDATE meta SET "repositoryUrl" = 'https://code.naskya.net/naskya/firefish'`, + ); + } + + async down(queryRunner) { + await queryRunner.query( + `UPDATE meta SET "repositoryUrl" = 'https://git.joinfirefish.org/firefish/firefish'`, + ); + } +} diff --git a/packages/backend/migration/1689957674000-firefish-repo.js b/packages/backend/migration/1689957674000-firefish-repo.js index 1b3765116..3a0bb5569 100644 --- a/packages/backend/migration/1689957674000-firefish-repo.js +++ b/packages/backend/migration/1689957674000-firefish-repo.js @@ -3,7 +3,7 @@ export class FirefishRepo1689957674000 { async up(queryRunner) { await queryRunner.query( - `UPDATE meta SET "repositoryUrl" = 'https://code.naskya.net/naskya/firefish'`, + `UPDATE meta SET "repositoryUrl" = 'https://git.joinfirefish.org/firefish/firefish'`, ); await queryRunner.query( `UPDATE meta SET "feedbackUrl" = 'https://git.joinfirefish.org/firefish/firefish/issues'`, diff --git a/packages/backend/src/server/api/endpoints/latest-version.ts b/packages/backend/src/server/api/endpoints/latest-version.ts index 6291eb9e0..9a600526d 100644 --- a/packages/backend/src/server/api/endpoints/latest-version.ts +++ b/packages/backend/src/server/api/endpoints/latest-version.ts @@ -14,13 +14,13 @@ export const paramDef = { } as const; export default define(meta, paramDef, async () => { - let tag_name; - await fetch( - "https://code.naskya.net/api/v1/repos/naskya/firefish/tags?page=1&limit=1", - ) - .then((response) => response.json()) - .then((data) => { - tag_name = data[0].name.slice(1); + let tag_name: string; + const pattern = /"version": "(.*)",$/m; + + await fetch("https://code.naskya.net/naskya/firefish/source-by/main/package.json") + .then((response) => response.text()) + .then((text) => { + tag_name = pattern.exec(text)[1]; }); return { diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index c40c4303e..ea5bcd442 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -106,7 +106,7 @@ export function genOpenapiSpec() { description: desc, externalDocs: { description: "Source code", - url: `https://code.naskya.net/naskya/firefish/src/branch/main/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, + url: `https://code.naskya.net/naskya/firefish/source-by/main/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, }, tags: endpoint.meta.tags || undefined, security, diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue index 3179bdce1..6dc931a4c 100644 --- a/packages/client/src/pages/about-firefish.vue +++ b/packages/client/src/pages/about-firefish.vue @@ -64,7 +64,7 @@ > {{ i18n.ts._aboutFirefish.source }} - + {{ i18n.ts.updateAvailable }} {{ i18n.ts.check }}