From b4ed4dec47acef39b25690d548c910c665d2cb92 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 19 Jul 2023 15:20:22 -0700 Subject: [PATCH] v1.0.1 --- CODE_OF_CONDUCT.md | 2 +- FIREFISH.md | 4 ++-- README.md | 10 +++++----- RELEASE_NOTES.md | 6 +++--- SECURITY.md | 2 +- docs/migrate.md | 14 +++++++------- issue_template/bug.yaml | 8 ++++---- issue_template/feature.yaml | 8 ++++---- package.json | 4 ++-- .../backend/migration/1658203170545firefish.js | 6 ------ .../migration/1689739513827-firefish-repo.js | 4 ++-- packages/backend/src/boot/master.ts | 2 +- packages/backend/src/models/entities/meta.ts | 4 ++-- .../src/server/api/endpoints/latest-version.ts | 2 +- packages/backend/src/server/api/endpoints/meta.ts | 4 ++-- .../backend/src/server/api/endpoints/patrons.ts | 2 +- .../backend/src/server/api/endpoints/release.ts | 2 +- .../backend/src/server/api/openapi/gen-spec.ts | 4 ++-- packages/backend/src/server/web/views/base.pug | 2 +- packages/client/src/components/mfm.ts | 2 +- packages/client/src/pages/about-firefish.vue | 6 +++--- packages/client/src/pages/admin/index.vue | 2 +- packages/firefish-js/package.json | 2 +- pull_request_template.yml | 2 +- 24 files changed, 49 insertions(+), 55 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 464eb0fc6..4f215e829 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,7 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -@t1c on Prometheus Gitlab, +@thatonecalculator on Codeberg, `@kainoa@firefish.social` on the Fediverse, or kainoa@t1c.dev via email. All complaints will be reviewed and investigated promptly and fairly. diff --git a/FIREFISH.md b/FIREFISH.md index cd5f85ecb..f1a4863cb 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://gitlab.prometheus.systems/firefish/firefish/releases) and [Changelog](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CHANGELOG.md) for a more complete list of changes. There have been [>4000 commits (laggy link)](https://gitlab.prometheus.systems/firefish/firefish/compare/700a7110f7e34f314b070987aa761c451ec34efc...develop) since we forked Misskey! +> 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! ## Planned @@ -85,7 +85,7 @@ - Undo renote button inside original note - Custom locales - Obliteration of Ai-chan -- Switch to [Firefish.js](https://gitlab.prometheus.systems/firefish/firefish.js) +- Switch to [Firefish.js](https://codeberg.org/firefish/firefish.js) - Woozy mode 🥴 - Improve blocking servers - Release notes diff --git a/README.md b/README.md index 1b9608297..1bf96520b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ️:warning: Repo has moved! -https://gitlab.prometheus.systems/firefish/firefish/ +https://codeberg.org/firefish/firefish/
@@ -95,8 +95,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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/docker.md) -- [🛞 How to run Firefish with Kubernetes/Helm](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/kubernetes.md) +- [🐳 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) ## 🧑‍💻 Dependencies @@ -132,7 +132,7 @@ If you have access to a server that supports one of the sources below, I recomme ## 👀 Get folder ready ```sh -git clone https://gitlab.prometheus.systems/firefish/firefish.git +git clone https://codeberg.org/firefish/firefish.git cd firefish/ ``` @@ -223,7 +223,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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/migrate.md). +For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://codeberg.org/firefish/firefish/src/branch/develop/docs/migrate.md). ## 🌐 Web proxy diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 311dce5df..840bf0ac7 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://gitlab.prometheus.systems/firefish/firefish)! +- Firefish branding and [new repo](https://codeberg.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://gitlab.prometheus.systems/firefish/firefish.git +git remote set-url origin https://codeberg.org/firefish/firefish.git git pull --ff ``` diff --git a/SECURITY.md b/SECURITY.md index fae9536b8..2f26af6b6 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -11,6 +11,6 @@ If you discover a security issue, which is so high risk, that too much is affect This will allow us to assess the risk, and make a fix available before we add a -bug report to the Gitlab repository. +bug report to the Codeberg repository. Thanks for helping make Firefish safe for everyone. diff --git a/docs/migrate.md b/docs/migrate.md index 005c91121..4420a74e7 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://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/mkv13.patch -wget -O mkv13_restore.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/mkv13_restore.patch +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 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://gitlab.prometheus.systems/firefish/firefish.git +git remote set-url origin https://codeberg.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://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/renote_muting.patch +wget -O renote_muting.patch https://codeberg.org/firefish/firefish/raw/branch/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://gitlab.prometheus.systems/firefish/firefish.git +git remote set-url origin https://codeberg.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://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/fk.patch +wget -O fk.patch https://codeberg.org/firefish/firefish/raw/branch/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://gitlab.prometheus.systems/firefish/firefish.git +git remote set-url origin https://codeberg.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 0b6f5859c..5d7e5e806 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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md + url: https://codeberg.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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md) - 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + 🔒 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) - 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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.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 0be916fb3..703e633ec 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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md + url: https://codeberg.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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md) - 🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + 🔒 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) - 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://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md) + description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.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 6c1e5c674..e6677073a 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "firefish", - "version": "1.0.0", + "version": "1.0.1", "codename": "aqua", "repository": { "type": "git", - "url": "https://gitlab.prometheus.systems/firefish/firefish.git" + "url": "https://codeberg.org/firefish/firefish.git" }, "packageManager": "pnpm@8.6.9", "private": true, diff --git a/packages/backend/migration/1658203170545firefish.js b/packages/backend/migration/1658203170545firefish.js index b2f67f56d..c66996d08 100644 --- a/packages/backend/migration/1658203170545firefish.js +++ b/packages/backend/migration/1658203170545firefish.js @@ -2,9 +2,6 @@ export class calckey1658203170545 { name = "calckey1658203170545"; async up(queryRunner) { - await queryRunner.query( - `UPDATE meta SET "useStarForReactionFallback" = TRUE;`, - ); await queryRunner.query( `UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`, ); @@ -14,9 +11,6 @@ export class calckey1658203170545 { } async down(queryRunner) { - await queryRunner.query( - `UPDATE meta SET "useStarForReactionFallback" = FALSE;`, - ); await queryRunner.query( `UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`, ); diff --git a/packages/backend/migration/1689739513827-firefish-repo.js b/packages/backend/migration/1689739513827-firefish-repo.js index a2185fbc6..d2491f213 100644 --- a/packages/backend/migration/1689739513827-firefish-repo.js +++ b/packages/backend/migration/1689739513827-firefish-repo.js @@ -3,10 +3,10 @@ export class FirefishRepo1689739513827 { async up(queryRunner) { await queryRunner.query( - `UPDATE meta SET "repositoryUrl" = 'https://gitlab.prometheus.systems/firefish/firefish'`, + `UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`, ); await queryRunner.query( - `UPDATE meta SET "feedbackUrl" = 'https://gitlab.prometheus.systems/firefish/firefish/issues'`, + `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 3f779b3b9..f670c6b11 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://gitlab.prometheus.systems/firefish/firefish", + " If you like Firefish, please consider starring or contributing to the repo. https://codeberg.org/firefish/firefish", ), ); diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts index 1a1111e6e..817d4c30b 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://gitlab.prometheus.systems/firefish/firefish", + default: "https://codeberg.org/firefish/firefish", nullable: false, }) public repositoryUrl: string; @Column("varchar", { length: 512, - default: "https://gitlab.prometheus.systems/firefish/firefish/issues/new", + default: "https://codeberg.org/firefish/firefish/issues/new", nullable: true, }) public feedbackUrl: string | null; diff --git a/packages/backend/src/server/api/endpoints/latest-version.ts b/packages/backend/src/server/api/endpoints/latest-version.ts index 72e84ae04..1cf259c88 100644 --- a/packages/backend/src/server/api/endpoints/latest-version.ts +++ b/packages/backend/src/server/api/endpoints/latest-version.ts @@ -16,7 +16,7 @@ export const paramDef = { export default define(meta, paramDef, async () => { let tag_name; await fetch( - "https://codeberg.org/api/v1/repos/calckey/calckey/releases?draft=false&pre-release=false&page=1&limit=1", + "https://codeberg.org/api/v1/repos/firefish/firefish/releases?draft=false&pre-release=false&page=1&limit=1", ) .then((response) => response.json()) .then((data) => { diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts index 00adbc6bf..84a698801 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://gitlab.prometheus.systems/firefish/firefish", + default: "https://codeberg.org/firefish/firefish", }, feedbackUrl: { type: "string", optional: false, nullable: false, - default: "https://gitlab.prometheus.systems/firefish/firefish/issues", + default: "https://codeberg.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 b5feea20e..cd93b5e3d 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://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/patrons.json", + "https://codeberg.org/firefish/firefish/raw/branch/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 620bb23d6..a208d87c9 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://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/release.json", + "https://codeberg.org/firefish/firefish/raw/branch/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 7c9e9de8c..2ab1689c0 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://gitlab.prometheus.systems/firefish/firefish", + url: "https://codeberg.org/firefish/firefish", }, servers: [ @@ -106,7 +106,7 @@ export function genOpenapiSpec() { description: desc, externalDocs: { description: "Source code", - url: `https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, + url: `https://codeberg.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 7fda4f8a7..14e660cb3 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://gitlab.prometheus.systems/firefish/firefish + https://codeberg.org/firefish/firefish html diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index deafaae86..cb0942a33 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -495,7 +495,7 @@ export default defineComponent({ case "search": { // Disable "search" keyword - // (see the issue #9816 on Gitlab) + // (see the issue #9816 on Codeberg) if (token.props.content.slice(-6).toLowerCase() === "search") { const sentinel = "#"; let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)( diff --git a/packages/client/src/pages/about-firefish.vue b/packages/client/src/pages/about-firefish.vue index 82bc1b817..0b001ff03 100644 --- a/packages/client/src/pages/about-firefish.vue +++ b/packages/client/src/pages/about-firefish.vue @@ -57,14 +57,14 @@
{{ i18n.ts._aboutFirefish.source }} - +