From aa24a3c172bfdc32bf1d6c8a5ba64ab911663a7e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 19 Jul 2023 08:58:59 -0700 Subject: [PATCH] links --- CHANGELOG.md | 2 +- FIREFISH.md | 2 +- docs/migrate.md | 8 ++++---- .../backend/src/server/api/endpoints/patrons.ts | 2 +- .../backend/src/server/api/endpoints/release.ts | 2 +- release.json | 4 ++-- rename.sh | 13 ------------- 7 files changed, 10 insertions(+), 23 deletions(-) delete mode 100755 rename.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index b9a998f627..c75d1f2479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -All changes from v13.0.0 onwards, for a full list of differences read CALCKEY.md +All changes from v13.0.0 onwards, for a list of differences read FIREFISH.md ## [14.0.0-rc3] - 2023-06-24 diff --git a/FIREFISH.md b/FIREFISH.md index 92611af6b0..cd5f85ecbb 100644 --- a/FIREFISH.md +++ b/FIREFISH.md @@ -118,7 +118,7 @@ - Skin tone selection support - [DragonflyDB](https://dragonflydb.io/) support as a Redis alternative - Link verification -- Importing posts from other Calckey/Misskey/Mastodon/Akkoma/Pleroma instances +- Importing posts from other Firefish/Misskey/Mastodon/Akkoma/Pleroma instances ## Implemented (remote) diff --git a/docs/migrate.md b/docs/migrate.md index 329368fae0..005c911215 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/branch/develop/docs/mkv13.patch -wget -O mkv13_restore.patch https://gitlab.prometheus.systems/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patch +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 git apply mkv13.patch mkv13_restore.patch cd packages/backend @@ -33,7 +33,7 @@ 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/branch/develop/docs/renote_muting.patch +wget -O renote_muting.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/renote_muting.patch git apply renote_muting.patch pnpm install @@ -81,7 +81,7 @@ NODE_ENV=production pnpm run migrate ## FoundKey ```sh -wget -O fk.patch https://codeberg.org/calckey/calckey/raw/branch/develop/docs/fk.patch +wget -O fk.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/fk.patch git apply fk.patch cd packages/backend diff --git a/packages/backend/src/server/api/endpoints/patrons.ts b/packages/backend/src/server/api/endpoints/patrons.ts index 510fedcaef..b5feea20e8 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/branch/develop/patrons.json", + "https://gitlab.prometheus.systems/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 9175110702..620bb23d69 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/branch/develop/release.json", + "https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/release.json", ) .then((response) => response.json()) .then((data) => { diff --git a/release.json b/release.json index 89f9752ffe..112dcc5769 100644 --- a/release.json +++ b/release.json @@ -1,5 +1,5 @@ { - "version": "13.1.3", - "notes": "This release candidate has the following changes:\n• Better blocking/muting\n• Better user refreshing\n• New help menu with app list (More! > Help)\n• New headerbar style\n• Bug + security fixes and performance improvements", + "version": "1.0.0", + "notes": "Welcome to Firefish!", "screenshots": [] } diff --git a/rename.sh b/rename.sh deleted file mode 100755 index 5057bf1aa6..0000000000 --- a/rename.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# Change directories -find . -type d -name '*calckey*' | while read dir; do - newdir=$(echo "$dir" | perl -pe 's/calckey/firefish/g') - mv "$dir" "$newdir" -done - -# Change files -find . -type f -name '*calckey*' | while read file; do - newfile=$(echo "$file" | perl -pe 's/calckey/firefish/g') - mv "$file" "$newfile" -done