From e35b38302d4394bb8e821e9590bcad641847c1e7 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 21 Jul 2023 09:44:29 -0700 Subject: [PATCH] refactor: :recycle: new git repo for real this time --- FIREFISH.md | 4 ++-- README.md | 8 +++---- RELEASE_NOTES.md | 6 +++--- docs/migrate.md | 14 ++++++------- issue_template/bug.yaml | 8 +++---- issue_template/feature.yaml | 8 +++---- package.json | 4 ++-- .../migration/1689957674000-firefish-repo.js | 21 +++++++++++++++++++ packages/backend/src/boot/master.ts | 2 +- packages/backend/src/models/entities/meta.ts | 4 ++-- .../backend/src/server/api/endpoints/meta.ts | 4 ++-- .../src/server/api/endpoints/patrons.ts | 2 +- .../src/server/api/endpoints/release.ts | 2 +- .../src/server/api/openapi/gen-spec.ts | 4 ++-- .../backend/src/server/web/views/base.pug | 2 +- packages/client/src/pages/about-firefish.vue | 4 ++-- packages/client/src/pages/admin/index.vue | 2 +- packages/firefish-js/package.json | 2 +- pull_request_template.yml | 2 +- 19 files changed, 62 insertions(+), 41 deletions(-) create mode 100644 packages/backend/migration/1689957674000-firefish-repo.js diff --git a/FIREFISH.md b/FIREFISH.md index f1a4863cb8..322bee6a1d 100644 --- a/FIREFISH.md +++ b/FIREFISH.md @@ -1,7 +1,7 @@ # All the changes to Firefish from stock Misskey > **Warning** -> This list is incomplete. Please check the [Releases](https://codeberg.org/firefish/firefish/releases) and [Changelog](https://codeberg.org/firefish/firefish/src/branch/develop/CHANGELOG.md) for a more complete list of changes. There have been [>4000 commits (laggy link)](https://codeberg.org/firefish/firefish/compare/700a7110f7e34f314b070987aa761c451ec34efc...develop) since we forked Misskey! +> This list is incomplete. Please check the [Releases](https://git.joinfirefish.org/firefish/firefish/releases) and [Changelog](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/CHANGELOG.md) for a more complete list of changes. There have been [>4000 commits (laggy link)](https://git.joinfirefish.org/firefish/firefish/compare/700a7110f7e34f314b070987aa761c451ec34efc...develop) since we forked Misskey! ## Planned @@ -85,7 +85,7 @@ - Undo renote button inside original note - Custom locales - Obliteration of Ai-chan -- Switch to [Firefish.js](https://codeberg.org/firefish/firefish.js) +- Switch to [Firefish.js](https://git.joinfirefish.org/firefish/firefish.js) - Woozy mode 🥴 - Improve blocking servers - Release notes diff --git a/README.md b/README.md index 7143b76194..99369ad801 100644 --- a/README.md +++ b/README.md @@ -91,8 +91,8 @@ If you have access to a server that supports one of the sources below, I recomme ## 🛳️ Containerization -- [🐳 How to run Firefish with Docker](https://codeberg.org/firefish/firefish/src/branch/develop/docs/docker.md) -- [🛞 How to run Firefish with Kubernetes/Helm](https://codeberg.org/firefish/firefish/src/branch/develop/docs/kubernetes.md) +- [🐳 How to run Firefish with Docker](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/docs/docker.md) +- [🛞 How to run Firefish with Kubernetes/Helm](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/docs/kubernetes.md) ## 🧑‍💻 Dependencies @@ -128,7 +128,7 @@ If you have access to a server that supports one of the sources below, I recomme ## 👀 Get folder ready ```sh -git clone https://codeberg.org/firefish/firefish.git +git clone https://git.joinfirefish.org/firefish/firefish.git cd firefish/ ``` @@ -219,7 +219,7 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an ## 🚚 Migrating from Misskey/FoundKey to Firefish -For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://codeberg.org/firefish/firefish/src/branch/develop/docs/migrate.md). +For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://git.joinfirefish.org/firefish/firefish/-/blob/develop/docs/migrate.md). ## 🌐 Web proxy diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 840bf0ac74..6dfe9de20f 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -2,13 +2,13 @@ Welcome to the new era of FIREFISH! - + # Changelog ## Major changes from last release candidate -- Firefish branding and [new repo](https://codeberg.org/firefish/firefish)! +- Firefish branding and [new repo](https://git.joinfirefish.org/firefish/firefish)! - Far better Mastodon API support - Edits are now non-experimental - Support for secondary cache server @@ -64,7 +64,7 @@ All of the above, plus: ## Set new repo and pull ```sh -git remote set-url origin https://codeberg.org/firefish/firefish.git +git remote set-url origin https://git.joinfirefish.org/firefish/firefish.git git pull --ff ``` diff --git a/docs/migrate.md b/docs/migrate.md index 4420a74e7d..3ead14027d 100644 --- a/docs/migrate.md +++ b/docs/migrate.md @@ -14,8 +14,8 @@ Tested with Misskey v13.11.3. If your Misskey v13 is older, we recommend updating your Misskey to v13.11.3. ```sh -wget -O mkv13.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13.patch -wget -O mkv13_restore.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patch +wget -O mkv13.patch https://git.joinfirefish.org/firefish/firefish/-/raw/develop/docs/mkv13.patch +wget -O mkv13_restore.patch https://git.joinfirefish.org/firefish/firefish/-/raw/develop/docs/mkv13_restore.patch git apply mkv13.patch mkv13_restore.patch cd packages/backend @@ -27,13 +27,13 @@ for i in $(seq 1 $NUM_MIGRATIONS); do pnpm typeorm migration:revert -d ormconfig cd ../../ -git remote set-url origin https://codeberg.org/firefish/firefish.git +git remote set-url origin https://git.joinfirefish.org/firefish/firefish.git git fetch origin git stash push rm -rf fluent-emojis misskey-assets git switch main # or beta or develop git pull --ff -wget -O renote_muting.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/renote_muting.patch +wget -O renote_muting.patch https://git.joinfirefish.org/firefish/firefish/-/raw/develop/docs/renote_muting.patch git apply renote_muting.patch pnpm install @@ -69,7 +69,7 @@ If no other errors happened, your Firefish is ready to launch! ## Misskey v12.119 and before ```sh -git remote set-url origin https://codeberg.org/firefish/firefish.git +git remote set-url origin https://git.joinfirefish.org/firefish/firefish.git git fetch git checkout main # or beta or develop git pull --ff @@ -81,7 +81,7 @@ NODE_ENV=production pnpm run migrate ## FoundKey ```sh -wget -O fk.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/fk.patch +wget -O fk.patch https://git.joinfirefish.org/firefish/firefish/-/raw/develop/docs/fk.patch git apply fk.patch cd packages/backend @@ -92,7 +92,7 @@ for i in $(seq 1 $NUM_MIGRATIONS); do npx typeorm migration:revert -d ormconfig.js done -git remote set-url origin https://codeberg.org/firefish/firefish.git +git remote set-url origin https://git.joinfirefish.org/firefish/firefish.git git fetch git checkout main # or beta or develop git pull --ff diff --git a/issue_template/bug.yaml b/issue_template/bug.yaml index 5d7e5e8060..ec0fc11cbb 100644 --- a/issue_template/bug.yaml +++ b/issue_template/bug.yaml @@ -7,7 +7,7 @@ contact_links: url: https://matrix.to/#/%23firefish:matrix.fedibird.com about: Having trouble with deployment? Ask the support chat. - name: 🔒 Resposible Disclosure - url: https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md + url: https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md about: Found a security vulnerability? Please disclose it responsibly. body: - type: markdown @@ -15,8 +15,8 @@ body: value: | 💖 Thanks for taking the time to fill out this bug report! 💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com) - 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md) - 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md) + 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) - type: textarea id: what-happened attributes: @@ -128,7 +128,7 @@ body: id: terms attributes: label: Contribution Guidelines - description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) options: - label: I agree to follow this project's Contribution Guidelines required: true diff --git a/issue_template/feature.yaml b/issue_template/feature.yaml index 703e633ece..aee9b2cade 100644 --- a/issue_template/feature.yaml +++ b/issue_template/feature.yaml @@ -7,7 +7,7 @@ contact_links: url: https://matrix.to/#/%23firefish:matrix.fedibird.com about: Having trouble with deployment? Ask the support chat. - name: 🔒 Resposible Disclosure - url: https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md + url: https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md about: Found a security vulnerability? Please disclose it responsibly. body: - type: markdown @@ -15,8 +15,8 @@ body: value: | 💖 Thanks for taking the time to fill out this feature request! 💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com) - 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md) - 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + 🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/SECURITY.md) + 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) - type: textarea id: what-feature attributes: @@ -53,7 +53,7 @@ body: id: terms attributes: label: Contribution Guidelines - description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://git.joinfirefish.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md) options: - label: I agree to follow this project's Contribution Guidelines required: true diff --git a/package.json b/package.json index 108b8c89c8..797e97ed43 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "firefish", - "version": "1.0.2", + "version": "1.0.3", "codename": "aqua", "repository": { "type": "git", - "url": "https://codeberg.org/firefish/firefish.git" + "url": "https://git.joinfirefish.org/firefish/firefish.git" }, "packageManager": "pnpm@8.6.9", "private": true, diff --git a/packages/backend/migration/1689957674000-firefish-repo.js b/packages/backend/migration/1689957674000-firefish-repo.js new file mode 100644 index 0000000000..fb45538ddf --- /dev/null +++ b/packages/backend/migration/1689957674000-firefish-repo.js @@ -0,0 +1,21 @@ +export class FirefishRepo1689957674000 { + name = "FirefishRepo1689957674000"; + + async up(queryRunner) { + await queryRunner.query( + `UPDATE meta SET "repositoryUrl" = 'https://git.joinfirefish.org/firefish/firefish'`, + ); + await queryRunner.query( + `UPDATE meta SET "feedbackUrl" = 'https://git.joinfirefish.org/firefish/firefish/issues'`, + ); + } + + async down(queryRunner) { + await queryRunner.query( + `UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`, + ); + await queryRunner.query( + `UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/firefish/firefish/issues'`, + ); + } +} diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index f670c6b111..25731b7e2b 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -49,7 +49,7 @@ function greet() { 136, 0, )( - " If you like Firefish, please consider starring or contributing to the repo. https://codeberg.org/firefish/firefish", + " If you like Firefish, please consider starring or contributing to the repo. https://git.joinfirefish.org/firefish/firefish", ), ); diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index 817d4c30bf..9fbe30449b 100644 --- a/packages/backend/src/models/entities/meta.ts +++ b/packages/backend/src/models/entities/meta.ts @@ -436,14 +436,14 @@ export class Meta { @Column("varchar", { length: 512, - default: "https://codeberg.org/firefish/firefish", + default: "https://git.joinfirefish.org/firefish/firefish", nullable: false, }) public repositoryUrl: string; @Column("varchar", { length: 512, - default: "https://codeberg.org/firefish/firefish/issues/new", + default: "https://git.joinfirefish.org/firefish/firefish/issues/new", nullable: true, }) public feedbackUrl: string | null; diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 84a6988012..15a4d4d487 100644 --- a/packages/backend/src/server/api/endpoints/meta.ts +++ b/packages/backend/src/server/api/endpoints/meta.ts @@ -68,13 +68,13 @@ export const meta = { type: "string", optional: false, nullable: false, - default: "https://codeberg.org/firefish/firefish", + default: "https://git.joinfirefish.org/firefish/firefish", }, feedbackUrl: { type: "string", optional: false, nullable: false, - default: "https://codeberg.org/firefish/firefish/issues", + default: "https://git.joinfirefish.org/firefish/firefish/issues", }, defaultDarkTheme: { type: "string", diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index cd93b5e3d0..d4793e1b94 100644 --- a/packages/backend/src/server/api/endpoints/patrons.ts +++ b/packages/backend/src/server/api/endpoints/patrons.ts @@ -36,7 +36,7 @@ export default define(meta, paramDef, async (ps) => { }; patrons = await fetch( - "https://codeberg.org/firefish/firefish/raw/branch/develop/patrons.json", + "https://git.joinfirefish.org/firefish/firefish/-/raw/develop/patrons.json", { signal: AbortSignal.timeout(2000) }, ) .then((response) => response.json()) diff --git a/packages/backend/src/server/api/endpoints/release.ts b/packages/backend/src/server/api/endpoints/release.ts index a208d87c9d..bce1bc082c 100644 --- a/packages/backend/src/server/api/endpoints/release.ts +++ b/packages/backend/src/server/api/endpoints/release.ts @@ -18,7 +18,7 @@ export default define(meta, paramDef, async () => { let release; await fetch( - "https://codeberg.org/firefish/firefish/raw/branch/develop/release.json", + "https://git.joinfirefish.org/firefish/firefish/-/raw/develop/release.json", ) .then((response) => response.json()) .then((data) => { diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index 2ab1689c0a..ee14f249f0 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -15,7 +15,7 @@ export function genOpenapiSpec() { externalDocs: { description: "Repository", - url: "https://codeberg.org/firefish/firefish", + url: "https://git.joinfirefish.org/firefish/firefish", }, servers: [ @@ -106,7 +106,7 @@ export function genOpenapiSpec() { description: desc, externalDocs: { description: "Source code", - url: `https://codeberg.org/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, + url: `https://git.joinfirefish.org/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, }, tags: endpoint.meta.tags || undefined, security, diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index 14e660cb3c..ee8bdc790a 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -17,7 +17,7 @@ doctype html Thank you for using Firefish! If you are reading this message... how about joining the development? - https://codeberg.org/firefish/firefish + https://git.joinfirefish.org/firefish/firefish html diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue index 0b001ff035..079f6f0d84 100644 --- a/packages/client/src/pages/about-firefish.vue +++ b/packages/client/src/pages/about-firefish.vue @@ -57,7 +57,7 @@