defry the fish #125
AntoineD
jeder
zotan
Labels
No labels
accessibility
documentation
backend
bug
discussion
duplicate
enhancement
frontend
has-dependencies
help wanted
invalid
meta
more info needed
needs-rebase
performance
wontfix
No milestone
No project
No assignees
6 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: iceshrimp/iceshrimp#125
Loading…
Reference in a new issue
No description provided.
Delete branch ":defried"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
everything except locale's work need help with that
Did you intentionally include .yarn/sdks in this?
my bad, but it might not be a bad idea to include it in the repos so vscode automatically finds the right stuff
Might want to squash those commits.
bf677b4829to571e2173c0In addition to Firefish, there are references to "kainoa", "thatonecalculator" and "codeberg.org"
I wonder what other keyword there is?
@ -1,4 +1,4 @@Copyright 2023 FirefishCopyright 2023 iceshrimpThis shouldn't be replaced, should be added instead so: "Copyright 2023 Firefish, Iceshrimp"
@ -1,3 +1,3 @@[weblate]url = https://hosted.weblate.org/api/translation = firefish/localestranslation = iceshrimp/localesDoes this file even do anything? If not we should remove it.
no idea zotan needs to weigh in
@ -14,3 +14,3 @@## RoadmapSee [FIREFISH.md](./FIREFISH.md)See [iceshrimp.md](./iceshrimp.md)This file doesn't exist.
@ -3,3 +3,3 @@image: plugins/kanikosettings:repo: thatonecalculator/firefishrepo: thatonecalculator/iceshrimpthe repo path needs to be modified
@ -3,3 +3,3 @@image: plugins/kanikosettings:repo: thatonecalculator/firefishrepo: thatonecalculator/iceshrimpthe repo path needs to be modified
@ -3,3 +3,3 @@image: plugins/kanikosettings:repo: thatonecalculator/firefishrepo: thatonecalculator/iceshrimpthe repo path needs to be modified
@ -3,3 +3,3 @@image: plugins/kanikosettings:repo: thatonecalculator/firefishrepo: thatonecalculator/iceshrimpthe repo path needs to be modified
@ -86,3 +86,3 @@- Custom locales- Obliteration of Ai-chan- Switch to [Firefish.js](https://codeberg.org/firefish/firefish.js)- Switch to [iceshrimp.js](https://codeberg.org/iceshrimp/iceshrimp.js)https://iceshrimp.dev/iceshrimp/iceshrimp/
@ -63,3 +63,3 @@reported to the community leaders responsible for enforcement at@thatonecalculator on Codeberg,`@kainoa@firefish.social` on the Fediverse,`@kainoa@iceshrimp.social` on the Fediverse,I don't think there's an official Iceshrimp account.
@ -64,3 +64,3 @@@thatonecalculator on Codeberg,`@kainoa@firefish.social` on the Fediverse,`@kainoa@iceshrimp.social` on the Fediverse,or kainoa@t1c.dev via email.remove it
@ -3,3 +3,3 @@## Translation (i18n)Firefish uses [Weblate](hhttps://hosted.weblate.org/engage/firefish/) for translation and internationalization management.iceshrimp uses [Weblate](hhttps://hosted.weblate.org/engage/iceshrimp/) for translation and internationalization management.https://translate.iceshrimp.dev/
@ -9,3 +9,3 @@You can contribute without knowing how to code by helping translate here:[](https://hosted.weblate.org/engage/firefish/)[](https://hosted.weblate.org/engage/iceshrimp/)to be adapted with https://translate.iceshrimp.dev/
@ -12,2 +11,3 @@[](https://hosted.weblate.org/engage/iceshrimp/)[](https://hosted.weblate.org/engage/firefish/)[](https://hosted.weblate.org/engage/iceshrimp/)to be adapted with https://translate.iceshrimp.dev/
@ -21,3 +21,3 @@- Do not use Issues to ask questions or troubleshooting.- Issues should only be used to feature requests, suggestions, and bug tracking.- Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#firefish:matrix.fedibird.com).- Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#iceshrimp:matrix.fedibird.com).https://matrix.to/#/%23iceshrimp-dev:161.rocks
@ -4,3 +4,3 @@If you discover a minor security issue in Firefish, please report it by sending anIf you discover a minor security issue in Iceshrimp, please report it by sending anemail to [kainoa@t1c.dev](mailto:kainoa@t1c.dev).remove it
@ -2,2 +2,2 @@name: firefishdescription: A fun, new, open way to experience social media https://joinfirefish.orgname: iceshrimpdescription: A fun, new, open way to experience social media https://joiniceshrimp.orghttps://iceshrimp.dev
@ -3,3 +3,3 @@  A fun, new, open way to experience social media https://joinfirefish.orgA fun, new, open way to experience social media https://joiniceshrimp.orghttps://iceshrimp.dev
@ -54,3 +54,3 @@| fullnameOverride | string | `""` | || image.pullPolicy | string | `"IfNotPresent"` | || image.repository | string | `"docker.io/thatonecalculator/firefish"` | || image.repository | string | `"docker.io/thatonecalculator/iceshrimp"` | |wrong path
@ -41,3 +41,3 @@if there are any errors, you might have to change `flake.nix`(because the available options can change between versions - consider getting support in [the matrix channel](https://matrix.to/#/#firefish:matrix.fedibird.com))(because the available options can change between versions - consider getting support in [the matrix channel](https://matrix.to/#/#iceshrimp:matrix.fedibird.com))https://matrix.to/#/%23iceshrimp-dev:161.rocks
@ -2,3 +2,3 @@## Pre-built docker container[thatonecalculator/firefish](https://hub.docker.com/r/thatonecalculator/firefish)[thatonecalculator/iceshrimp](https://hub.docker.com/r/thatonecalculator/iceshrimp)wrong path
@ -30,3 +30,3 @@## Running docker-composeThe [prebuilt container for firefish](https://hub.docker.com/r/thatonecalculator/firefish) is fairly large, and may take a few minutes to download and extract using docker.The [prebuilt container for iceshrimp](https://hub.docker.com/r/thatonecalculator/iceshrimp) is fairly large, and may take a few minutes to download and extract using docker.wrong path
@ -16,3 +16,2 @@```shwget -O mkv13.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13.patchwget -O mkv13_restore.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patchwget -O mkv13.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13.patchhttps://iceshrimp.dev
@ -17,2 +17,2 @@wget -O mkv13.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13.patchwget -O mkv13_restore.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patchwget -O mkv13.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13.patchwget -O mkv13_restore.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13_restore.patchhttps://iceshrimp.dev
@ -28,3 +28,3 @@cd ../../git remote set-url origin https://codeberg.org/firefish/firefish.gitgit remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.githttps://iceshrimp.dev
@ -34,3 +34,3 @@git switch main # or beta or developgit pull --ffwget -O renote_muting.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/renote_muting.patchwget -O renote_muting.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/renote_muting.patchhttps://iceshrimp.dev
@ -70,3 +70,3 @@```shgit remote set-url origin https://codeberg.org/firefish/firefish.gitgit remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.githttps://iceshrimp.dev
@ -82,3 +82,3 @@```shwget -O fk.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/fk.patchwget -O fk.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/fk.patchhttps://iceshrimp.dev
@ -93,3 +93,3 @@donegit remote set-url origin https://codeberg.org/firefish/firefish.gitgit remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.githttps://iceshrimp.dev
@ -5,3 +5,3 @@);await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://codeberg.org/firefish/firefish'`,`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://codeberg.org/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -8,3 +8,3 @@);await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://codeberg.org/firefish/firefish/issues'`,`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://codeberg.org/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -4,3 +4,3 @@async up(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -7,3 +7,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -13,3 +13,3 @@async down(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -16,3 +16,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -7,3 +7,3 @@);await queryRunner.query(`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -10,3 +10,3 @@);await queryRunner.query(`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -19,3 +19,3 @@);await queryRunner.query(`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -22,3 +22,3 @@);await queryRunner.query(`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE "meta" SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -6,3 +6,3 @@async up(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -9,3 +9,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -15,3 +15,3 @@async down(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -18,3 +18,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -4,3 +4,3 @@async up(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -7,3 +7,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -13,3 +13,3 @@async down(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -16,3 +16,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -4,3 +4,3 @@async up(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -7,3 +7,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -16,3 +16,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -13,3 +13,3 @@async down(queryRunner) {await queryRunner.query(`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/firefish/firefish'`,`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/iceshrimp/iceshrimp'`,https://iceshrimp.dev
@ -16,3 +16,3 @@);await queryRunner.query(`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/firefish/firefish/issues'`,`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/iceshrimp/iceshrimp/issues'`,https://iceshrimp.dev
@ -437,3 +437,3 @@@Column("varchar", {length: 512,default: "https://codeberg.org/firefish/firefish",default: "https://codeberg.org/iceshrimp/iceshrimp",https://iceshrimp.dev
@ -444,3 +444,3 @@@Column("varchar", {length: 512,default: "https://codeberg.org/firefish/firefish/issues/new",default: "https://codeberg.org/iceshrimp/iceshrimp/issues/new",https://iceshrimp.dev
@ -17,3 +17,3 @@let tag_name;await fetch("https://codeberg.org/api/v1/repos/firefish/firefish/releases?draft=false&pre-release=false&page=1&limit=1","https://codeberg.org/api/v1/repos/iceshrimp/iceshrimp/releases?draft=false&pre-release=false&page=1&limit=1",https://iceshrimp.dev
@ -19,3 +19,3 @@await fetch("https://codeberg.org/firefish/firefish/raw/branch/develop/release.json","https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/release.json",https://iceshrimp.dev
@ -16,3 +16,3 @@externalDocs: {description: "Repository",url: "https://codeberg.org/firefish/firefish",url: "https://codeberg.org/iceshrimp/iceshrimp",https://iceshrimp.dev
@ -107,3 +107,3 @@externalDocs: {description: "Source code",url: `https://codeberg.org/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,url: `https://codeberg.org/iceshrimp/iceshrimp/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,https://iceshrimp.dev
@ -57,3 +57,2 @@assert.deepStrictEqual(fromHtml('<p>a <a href="https://joinfirefish.org/b">c</a> d</p>'),"a [c](https://joinfirefish.org/b) d",fromHtml('<p>a <a href="https://joiniceshrimp.org/b">c</a> d</p>'),https://iceshrimp.dev (several times in this file)
@ -2,3 +2,3 @@<div v-if="instance.disableRegistration" style="margin-bottom: 1rem"><p>{{ i18n.ts.signupsDisabled }}</p><a href="https://joinfirefish.org/join"><a href="https://joiniceshrimp.org/join">https://iceshrimp.dev
@ -42,3 +42,3 @@>{{ i18n.ts.updateAvailable }}<ahref="https://codeberg.org/firefish/firefish/releases"href="https://codeberg.org/iceshrimp/iceshrimp/releases"https://iceshrimp.dev
@ -456,3 +456,3 @@let preview_mention = $ref("@example");let preview_hashtag = $ref("#test");let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://joinfirefish.org)`);let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://joiniceshrimp.org)`);https://iceshrimp.dev
@ -38,3 +38,3 @@icon: "ph-device-mobile ph-bold ph-lg",action: () => {window.open("https://joinfirefish.org/apps", "_blank");window.open("https://joiniceshrimp.org/apps", "_blank");https://iceshrimp.dev
@ -19,3 +19,3 @@"repository": {"type": "git","url": "https://codeberg.org/firefish/firefish.git""url": "https://codeberg.org/iceshrimp/iceshrimp.git"https://iceshrimp.dev
(Oops, I clicked on validated instead of comment 😬 I'm sorry.)
1f0f55dea9tod6393af049Lots of lower case "i" in places where it shouldn't be, also, there's no
FIREFISH.md/iceshrimp.mdfile, and I am not sure if we should touch exisiting migrations?@ -12,2 +11,3 @@[](https://translate.iceshrimp.dev/)[](https://hosted.weblate.org/engage/firefish/)[](https://translate.iceshrimp.dev/)This needs changing from
hosted.weblate.orgtotranslate.iceshrimp.dev.@ -19,3 +19,3 @@---Firefish includes several third-party open-source softwares and software libraries.iceshrimp includes several third-party open-source softwares and software libraries.Lower case i instead of capital
@ -1,4 +1,4 @@Copyright 2023 FirefishCopyright 2023 iceshrimpLower case i instead of capital
@ -3,3 +3,3 @@services:web:image: docker.io/thatonecalculator/firefishimage: docker.io/thatonecalculator/iceshrimpreplace with
iceshrimp.dev/iceshrimp/iceshrimp:dev@ -1,5 +1,5 @@# API DocumentationYou can find interactive API documentation at any Firefish instance. https://firefish.social/api-docYou can find interactive API documentation at any iceshrimp instance. https://iceshrimp.social/api-docLower case i instead of capital
@ -1,7 +1,7 @@# 🌎 Firefish Developer Docs# 🌎 iceshrimp Developer DocsLower case i instead of capital in lines 1, 4, 13, 17, 18, 100
@ -1,14 +1,14 @@# 🐳 Running a Firefish server with Docker# 🐳 Running a iceshrimp server with DockerLower case i instead of capital in lines 1, 11?
@ -2,3 +2,3 @@## Pre-built docker container[thatonecalculator/firefish](https://hub.docker.com/r/thatonecalculator/firefish)[iceshrimp/iceshrimp](iceshrimp.dev/iceshrimp/iceshrimp)https://needed, currently 404sscratch that, should be
[iceshrimp.dev/iceshrimp/iceshrimp](https://iceshrimp.dev/iceshrimp/-/packages/container/iceshrimp/versions)@ -1,6 +1,6 @@# Installing IceshrimpThis document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use Firefish's installation guide.This document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use iceshrimp's installation guide.Nonsense
@ -1,7 +1,7 @@# Running a Firefish server with Kubernetes and Helm# Running a iceshrimp server with Kubernetes and HelmLower case i instead of capital in lines 1, 4, 20, 30
@ -1,4 +1,4 @@# 🚚 Migrating from Misskey/FoundKey to Firefish# 🚚 Migrating from Misskey/FoundKey to iceshrimpLower case i instead of capital in lines 1, 63, 106
@ -1,6 +1,6 @@# 📦 PackagesThis directory contains all of the packages Firefish uses.This directory contains all of the packages iceshrimp uses.Lower case i instead of capital
@ -1,4 +1,4 @@Copyright 2023 FirefishCopyright 2023 iceshrimpLower case i instead of capital
@ -5,3 +5,3 @@);await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://codeberg.org/firefish/firefish'`,`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://iceshrimp.dev/iceshrimp/iceshrimp'`,Do we meddle with migrations?
I'm going to revert all the migration stuff, it seems risky changing them
@ -54,3 +54,3 @@mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;mixin.userAgent = `Firefish/${meta.version} (${config.url})`;mixin.userAgent = `iceshrimp/${meta.version} (${config.url})`;Lower case i instead of capital
@ -20,3 +20,2 @@img: meta.bannerUrl,title: meta.name || "Firefish",instanceName: meta.name || "Firefish",title: meta.name || "iceshrimp",Lower case i instead of capital in lines 21, 22
@ -444,3 +444,3 @@@Column("varchar", {length: 512,default: "https://codeberg.org/firefish/firefish/issues/new",default: "https://iceshrimp.dev/iceshrimp/iceshrimp/issues/new",no idea but probably migration required for all changed files in
models/folder?@ -20,3 +19,1 @@"X-Firefish-Host": config.host,"X-Firefish-Hook-Id": job.data.webhookId,"X-Firefish-Hook-Secret": job.data.secret,"User-Agent": "iceshrimp-Hooks",Lower case i instead of capital in lines 19 to 22
@ -70,3 +70,2 @@** If the target Image is registered in Firefish, return it, otherwise* Fetch from remote server, register with Firefish and return it.* If the target Image is registered in iceshrimp, return it, otherwiseLower case i instead of capital in lines 71, 72
@ -93,3 +93,3 @@* Fetch Notes.** If the target Note is registered in Firefish, it will be returned.* If the target Note is registered in iceshrimp, it will be returned.Lower case i instead of capital in lines 95, 400, 401
@ -128,3 +128,3 @@* Fetch a Person.** If the target Person is registered in Firefish, it will be returned.* If the target Person is registered in iceshrimp, it will be returned.Lower case i instead of capital in lines 130, 381, 567, 568
@ -338,3 +338,3 @@import * as ep___admin_driveCapOverride from "./endpoints/admin/drive-capacity-override.js";//Firefish Move//iceshrimp MoveLower case i instead of capital
@ -69,3 +69,3 @@optional: false,nullable: false,default: "https://codeberg.org/firefish/firefish",default: "https://codeberg.org/iceshrimp/iceshrimp",should be
https://iceshrimp.dev/iceshrimp/iceshrimp@ -75,3 +75,3 @@optional: false,nullable: false,default: "https://codeberg.org/firefish/firefish/issues",default: "https://codeberg.org/iceshrimp/iceshrimp/issues",should be
https://iceshrimp.dev/iceshrimp/iceshrimp@ -19,3 +19,3 @@await fetch("https://codeberg.org/firefish/firefish/raw/branch/develop/release.json","https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/release.json",should be
https://iceshrimp.dev/iceshrimp/iceshrimp@ -10,3 +10,3 @@info: {version: "v1",title: "Firefish API",title: "iceshrimp API",Lower case i instead of capital
@ -44,3 +44,3 @@title: `${author.name} (@${user.username}@${config.host})`,updated: notes[0].createdAt,generator: "Firefish",generator: "iceshrimp",Lower case i instead of capital
@ -2,2 +2,2 @@"short_name": "Firefish","name": "Firefish","short_name": "iceshrimp","name": "iceshrimp",Lower case i instead of capital in lines 2, 3
@ -11,3 +11,2 @@res.short_name = instance.name || "Firefish";res.name = instance.name || "Firefish";res.short_name = instance.name || "iceshrimp";Lower case i instead of capital in lines 12, 13
@ -30,3 +30,3 @@if (config.syslog) {this.syslogClient = new SyslogPro.RFC5424({applacationName: "Firefish",applacationName: "iceshrimp",Lower case i instead of capital
@ -36,3 +36,3 @@) as HTMLMetaElement)?.content,softwareName: Instance.softwareName || "Firefish",softwareName: Instance.softwareName || "iceshrimp",Lower case i instead of capital
@ -9,3 +9,3 @@</MkSwitch><div style="margin: 32px 0"><MkRadio v-model="radio" value="misskey">Firefish</MkRadio><MkRadio v-model="radio" value="misskey">iceshrimp</MkRadio>Lower case i instead of capital in lines 11, 85
@ -56,3 +56,3 @@}.\nAlso, here is ${config.url} and [example link](${config.url}). for more details, see https://joinfirefish.org.\nAs you know #misskey is open-source software.`,}). for more details, see https://joiniceshrimp.org.\nAs you know #misskey is open-source software.`,misskey?
holdover from firefish
@ -2,3 +2,3 @@<div v-if="instance.disableRegistration" style="margin-bottom: 1rem"><p>{{ i18n.ts.signupsDisabled }}</p><a href="https://joinfirefish.org/join"><a href="https://iceshrimp.dev/join">iceshrimp.dev or joiniceshrimp.org?
for now i'd say iceshrimp.dev since joiniceshrimp doesn't exist afaik
@ -15,3 +15,3 @@export const locale = JSON.parse(localStorage.getItem("locale"));export const version = _VERSION_;export const instanceName = siteName === "Firefish" ? host : siteName;export const instanceName = siteName === "iceshrimp" ? host : siteName;Lower case i instead of capital
@ -1,6 +1,6 @@<template><form class="mk-setup" @submit.prevent="submit()"><h1>Welcome to Firefish!</h1><h1>Welcome to iceshrimp!</h1>Lower case i instead of capital
@ -7,3 +7,3 @@name: 'Dark',author: 'Firefish Contributors',author: 'iceshrimp Contributors',Lower case i instead of capital
@ -7,3 +7,3 @@name: 'Light',author: 'Firefish Contributors',author: 'iceshrimp Contributors',Lower case i instead of capital
@ -1,6 +1,6 @@# Firefish.js# iceshrimp.jsLower case i instead of capital in lines 1, 3
Still lower case i instead of capital in first line
@ -2,3 +2,3 @@"name": "iceshrimp-js","version": "0.0.24","description": "Firefish SDK for JavaScript","description": "iceshrimp SDK for JavaScript",Lower case i instead of capital
@ -1,5 +1,5 @@{"version": "1.0.0","notes": "Welcome to Firefish!","notes": "Welcome to iceshrimp!",Lower case i instead of capital
Missed a bit of lower case i's, and some other issues that I haven't noticed yesterday, add all comments that aren't outdated from previous review, can't make them unresolved 🥴
@ -1,26 +1,24 @@# Contribution guideWe're glad you're interested in contributing Firefish! In this document you will find the information you need to contribute to the project.We're glad you're interested in contributing iceshrimp! In this document you will find the information you need to contribute to the project.Still lower case i instead of capital, and also should be "contributing to Iceshrimp"
@ -3,3 +3,3 @@## Translation (i18n)Firefish uses [Weblate](hhttps://hosted.weblate.org/engage/firefish/) for translation and internationalization management.iceshrimp uses [Weblate](https://translate.iceshrimp.dev/) for translation and internationalization management.Still lower case i instead of capital
@ -2,3 +2,3 @@## Nix Dev EnvironmentThe Firefish repo comes with a Nix-based shell environment to help make development as easy as possible!The iceshrimp repo comes with a Nix-based shell environment to help make development as easy as possible!Still lower case i instead of capital
@ -11,3 +11,3 @@- Installed [direnv](https://direnv.net/docs/installation.html) and added its hook to your shell. (package manager)Once the repo is cloned to your computer, follow these next few steps inside the Firefish folder:Once the repo is cloned to your computer, follow these next few steps inside the iceshrimp folder:Still lower case i instead of capital
@ -16,3 +16,2 @@- Run `install-deps`, then `prepare-config`, to install the node dependencies and prepare the needed config files.- In a second terminal, run `devenv up`. This will spawn a **Redis** server, a **Postgres** server, and the **Firefish** server in dev mode.- Once you see the Firefish banner printed in your second terminal, run `migrate` in the first.- In a second terminal, run `devenv up`. This will spawn a **Redis** server, a **Postgres** server, and the **iceshrimp** server in dev mode.Still lower case i instead of capital
@ -17,2 +17,2 @@- In a second terminal, run `devenv up`. This will spawn a **Redis** server, a **Postgres** server, and the **Firefish** server in dev mode.- Once you see the Firefish banner printed in your second terminal, run `migrate` in the first.- In a second terminal, run `devenv up`. This will spawn a **Redis** server, a **Postgres** server, and the **iceshrimp** server in dev mode.- Once you see the iceshrimp banner printed in your second terminal, run `migrate` in the first.Still lower case i instead of capital
@ -98,3 +98,3 @@this just means that the build isn't finished yet.at some point you should see a banner that says "Firefish" in big letters -at some point you should see a banner that says "iceshrimp" in big letters -Still lower case i instead of capital
@ -9,3 +9,3 @@- .config/docker.env (**db config settings**)- .config/default.yml (**firefish server settings**)- .config/default.yml (**iceshrimp server settings**)Still lower case i instead of capital
@ -30,3 +30,3 @@## Running docker-composeThe [prebuilt container for firefish](https://hub.docker.com/r/thatonecalculator/firefish) is fairly large, and may take a few minutes to download and extract using docker.The [prebuilt container for iceshrimp](https://iceshrimp.dev/iceshrimp/-/packages/container/iceshrimp/latest) is fairly large, and may take a few minutes to download and extract using docker.Still lower case i instead of capital
@ -35,3 +35,3 @@`docker-compose up -d`.NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the firefish tables.NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the iceshrimp tables.Still lower case i instead of capital
@ -38,2 +37,3 @@NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the iceshrimp tables.Once the server is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the firefish server on).Once the server is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the iceshrimp server on).Still lower case i instead of capital
@ -1,6 +1,6 @@# Installing IceshrimpThis document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use Firefish's installation guide.This document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use Iceshrimp's installation guide.remove this file, it should be updated once main branch gets yarn
it has been updated with yarn tho 😕
no? it's still on pnpm
@ -61,3 +61,3 @@```then quit with `\q`, and restart Firefish.then quit with `\q`, and restart iceshrimp.Still lower case i instead of capital
@ -65,3 +65,3 @@Note: Ignore errors of `column "xxx" of relation "xxx" already exists`.If no other errors happened, your Firefish is ready to launch!If no other errors happened, your iceshrimp is ready to launch!Still lower case i instead of capital
@ -104,3 +104,3 @@## ReverseYou ***cannot*** migrate back to Misskey from Firefish due to re-hashing passwords on signin with argon2. You can migrate from Calckey to FoundKey, although this is not recommended due to FoundKey being end-of-life, and may have some problems with alt-text.You ***cannot*** migrate back to Misskey from iceshrimp due to re-hashing passwords on signin with argon2. You can migrate from Calckey to FoundKey, although this is not recommended due to FoundKey being end-of-life, and may have some problems with alt-text.Still lower case i instead of capital
@ -19,3 +19,3 @@await fetch("https://codeberg.org/firefish/firefish/raw/branch/develop/release.json","https://iceshrimp.dev/iceshrimp/iceshrimp/raw/branch/develop/release.json",should have
devinstead ofdevelop@ -107,3 +107,3 @@externalDocs: {description: "Source code",url: `https://codeberg.org/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,url: `https://iceshrimp.dev/iceshrimp/iceshrimp/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,Should have
devinstead ofdevelop2edcee1cd2tod57ca5fd25@ -1,4 +1,4 @@Copyright 2023 FirefishCopyright 2023 Firefish, IceshrimpI've usually seen this as one line per fork, also neither Firefish nor Iceshrimp is a legal entity. I'd recommend changing this to
@ -3,3 +3,3 @@image: plugins/kanikosettings:repo: thatonecalculator/firefishrepo: iceshrimp/iceshrimpstypo, should be
iceshrimp/iceshrimp@ -1,6 +1,6 @@# ChangelogAll changes from v13.0.0 onwards, for a list of differences read FIREFISH.mdAll changes from v13.0.0 onwards, for a list of differences read iceshrimp.mdshould be
CHANGES_FROM_UPSTREAM.md@ -67,0 +64,4 @@---REPLACE ME---on the Fediverse,We can change the CoC at a later date, but for now you can list me as the contact person.
@ -21,3 +19,3 @@- Do not use Issues to ask questions or troubleshooting.- Issues should only be used to feature requests, suggestions, and bug tracking.- Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/#firefish:matrix.fedibird.com).- Please ask questions or troubleshooting in the [Matrix room](https://matrix.to/#/%23iceshrimp-dev:161.rocks).https://matrix.to/#/#iceshrimp-dev:161.rocks(dropping the urlencoded %23)@ -8,3 +3,3 @@## High Security IssuesIf you discover a security issue, which is so high risk, that too much is affected by it, please dont send it over unencrypted communication. You can share your PGP keys with us using kainoa@t1c.dev and after we established a secure communication, send it over E-Mail, or message us using matrix' encrypted private messages at @t1c:matrix.fedibird.com or @cleo:tchncs.deIf you discover a security issue, which is so high risk, that too much is affected by it, please dont send it over unencrypted communication. You can share your PGP keys with us using **eplace me** and after we established a secure communication, send it over E-Mail, or message us using matrix' encrypted private messages at **REPACE ME**security@iceshrimp.dev,@zotan:161.rocks@ -54,3 +54,3 @@| fullnameOverride | string | `""` | || image.pullPolicy | string | `"IfNotPresent"` | || image.repository | string | `"docker.io/thatonecalculator/firefish"` | || image.repository | string | `" iceshrimp.dev/iceshrimp/iceshrimp"` | |extra space before iceshrimp.dev
@ -5,3 +5,3 @@header = """# Changelog\nAll changes from v13.0.0 onwards, for a list of differences read FIREFISH.md\nAll changes from v13.0.0 onwards, for a list of differences read iceshrimp.md\niceshrimp.md->CHANGES_FROM_UPSTREAM.md@ -1,4 +1,4 @@Copyright 2023 FirefishCopyright 2023 IceshrimpCopyright 2023 The Iceshrimp contributors@ -1,6 +1,6 @@# Installing IceshrimpThis document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use Firefish's installation guide.This document will guide you through manual installation of Iceshrimp on dev branch, for main branch, use Iceshrimp's installation guide.This was actually correctly referencing the firefish installation guide, as they still use pnpm.
@ -31,4 +31,4 @@git fetch origingit stash pushrm -rf fluent-emojis misskey-assetsgit switch main # or beta or developremove the
# or beta or develop@ -24,3 +24,3 @@Ok(out.to_string())}FirefishId => {IceShrimpId => {I'd personally have gone with
IceshrimpIdbut that's just a cosmetic thing, if it's too much work to replace then dw about itfaec69c2dctoeb9405099bwip: defry the fishto defry the fisheb9405099btoca7751ef69None of the copyright notices should be replaced, it should be added to instead.
So anywhere there was "Copyright {year} Firefish" you should add "Copyright {year} Iceshrimp" ('Iceshrimp' could also be 'Iceshrimp contributors' or whatever), BUT ONLY IF the content that license applies to is changed (from upstream). If the content that the license applies to is not changed, then "Copyright {year} Iceshrimp" should not be added and only "Copyright {year} Firefish" should be kept instead.
Also the original copyright author text should not be changed from "Copyright {year} Firefish" to "Copyright {year} the Firefish contributors", it should be kept as is.
Disclaimer: My intent with this suggestion is to avoid any issues with the changes in this PR down the line. I do not support copyright and do not care about "copyright infringement". Neither am I a lawyer - this suggestion is purely based on what I have taught myself. (and there is a very good chance that I do not know what I am talking about)
yup I made that mistake but it was fixed
People, please don't forget the LOGOs, even iceshrimp.social still shows the Firefish logo when loading.
I am not a artist and afaik the logos are not ready yet
@ -64,3 +63,1 @@@thatonecalculator on Codeberg,`@kainoa@firefish.social` on the Fediverse,or kainoa@t1c.dev via email.reported to the community leaders responsible for enforcement at `conduct@iceshrimp.dev`. on the Fediverse,remove the
on the Fediverse,