defry the fish #125

Merged
zotan merged 2 commits from :defried into dev 2023-08-21 16:14:53 +02:00
Member

everything except locale's work need help with that

everything except locale's work need help with that
Member

Did you intentionally include .yarn/sdks in this?

Did you intentionally include .yarn/sdks in this?
Author
Member

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

> 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
Member

Might want to squash those commits.

Might want to squash those commits.
nullrequest force-pushed defried from bf677b4829 to 571e2173c0 2023-08-16 19:13:18 +02:00 Compare
Member

In addition to Firefish, there are references to "kainoa", "thatonecalculator" and "codeberg.org"

I wonder what other keyword there is?

In addition to Firefish, there are references to "kainoa", "thatonecalculator" and "codeberg.org" I wonder what other keyword there is?
aylamz reviewed 2023-08-17 17:39:23 +02:00
.config/LICENSE Outdated
@ -1,4 +1,4 @@
Copyright 2023 Firefish
Copyright 2023 iceshrimp
Member

This shouldn't be replaced, should be added instead so: "Copyright 2023 Firefish, Iceshrimp"

This shouldn't be replaced, should be added instead so: "Copyright 2023 Firefish, Iceshrimp"
nullrequest marked this conversation as resolved
aylamz reviewed 2023-08-17 17:40:55 +02:00
.weblate Outdated
@ -1,3 +1,3 @@
[weblate]
url = https://hosted.weblate.org/api/
translation = firefish/locales
translation = iceshrimp/locales
Member

Does this file even do anything? If not we should remove it.

Does this file even do anything? If not we should remove it.
Author
Member

no idea zotan needs to weigh in

no idea zotan needs to weigh in
nullrequest marked this conversation as resolved
aylamz reviewed 2023-08-17 17:43:52 +02:00
CONTRIBUTING.md Outdated
@ -14,3 +14,3 @@
## Roadmap
See [FIREFISH.md](./FIREFISH.md)
See [iceshrimp.md](./iceshrimp.md)
Member

This file doesn't exist.

This file doesn't exist.
nullrequest marked this conversation as resolved
AntoineD approved these changes 2023-08-17 17:44:33 +02:00
@ -3,3 +3,3 @@
image: plugins/kaniko
settings:
repo: thatonecalculator/firefish
repo: thatonecalculator/iceshrimp
Member

the repo path needs to be modified

the repo path needs to be modified
nullrequest marked this conversation as resolved
@ -3,3 +3,3 @@
image: plugins/kaniko
settings:
repo: thatonecalculator/firefish
repo: thatonecalculator/iceshrimp
Member

the repo path needs to be modified

the repo path needs to be modified
nullrequest marked this conversation as resolved
@ -3,3 +3,3 @@
image: plugins/kaniko
settings:
repo: thatonecalculator/firefish
repo: thatonecalculator/iceshrimp
Member

the repo path needs to be modified

the repo path needs to be modified
nullrequest marked this conversation as resolved
@ -3,3 +3,3 @@
image: plugins/kaniko
settings:
repo: thatonecalculator/firefish
repo: thatonecalculator/iceshrimp
Member

the repo path needs to be modified

the repo path needs to be modified
nullrequest marked this conversation as resolved
@ -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)
Member
https://iceshrimp.dev/iceshrimp/iceshrimp/
nullrequest marked this conversation as resolved
@ -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,
Member

I don't think there's an official Iceshrimp account.

I don't think there's an official Iceshrimp account.
nullrequest marked this conversation as resolved
@ -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.
Member

remove it

remove it
nullrequest marked this conversation as resolved
CONTRIBUTING.md Outdated
@ -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.
Member
https://translate.iceshrimp.dev/
nullrequest marked this conversation as resolved
CONTRIBUTING.md Outdated
@ -9,3 +9,3 @@
You can contribute without knowing how to code by helping translate here:
[![Translation status](https://hosted.weblate.org/widgets/firefish/-/287x66-grey.png)](https://hosted.weblate.org/engage/firefish/)
[![Translation status](https://hosted.weblate.org/widgets/iceshrimp/-/287x66-grey.png)](https://hosted.weblate.org/engage/iceshrimp/)
Member
to be adapted with https://translate.iceshrimp.dev/
nullrequest marked this conversation as resolved
CONTRIBUTING.md Outdated
@ -12,2 +11,3 @@
[![Translation status](https://hosted.weblate.org/widgets/iceshrimp/-/287x66-grey.png)](https://hosted.weblate.org/engage/iceshrimp/)
[![Translation bars](https://hosted.weblate.org/widgets/firefish/-/multi-auto.svg)](https://hosted.weblate.org/engage/firefish/)
[![Translation bars](https://hosted.weblate.org/widgets/iceshrimp/-/multi-auto.svg)](https://hosted.weblate.org/engage/iceshrimp/)
Member
to be adapted with https://translate.iceshrimp.dev/
nullrequest marked this conversation as resolved
CONTRIBUTING.md Outdated
@ -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).
Member
https://matrix.to/#/%23iceshrimp-dev:161.rocks
nullrequest marked this conversation as resolved
@ -4,3 +4,3 @@
If you discover a minor security issue in Firefish, please report it by sending an
If you discover a minor security issue in Iceshrimp, please report it by sending an
email to [kainoa@t1c.dev](mailto:kainoa@t1c.dev).
Member

remove it

remove it
nullrequest marked this conversation as resolved
chart/Chart.yaml Outdated
@ -2,2 +2,2 @@
name: firefish
description: A fun, new, open way to experience social media https://joinfirefish.org
name: iceshrimp
description: A fun, new, open way to experience social media https://joiniceshrimp.org
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
chart/README.md Outdated
@ -3,3 +3,3 @@
![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: rc](https://img.shields.io/badge/AppVersion-rc-informational?style=flat-square)
A fun, new, open way to experience social media https://joinfirefish.org
A fun, new, open way to experience social media https://joiniceshrimp.org
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
chart/README.md Outdated
@ -54,3 +54,3 @@
| fullnameOverride | string | `""` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"docker.io/thatonecalculator/firefish"` | |
| image.repository | string | `"docker.io/thatonecalculator/iceshrimp"` | |
Member

wrong path

wrong path
nullrequest marked this conversation as resolved
@ -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))
Member
https://matrix.to/#/%23iceshrimp-dev:161.rocks
nullrequest marked this conversation as resolved
docs/docker.md Outdated
@ -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)
Member

wrong path

wrong path
nullrequest marked this conversation as resolved
docs/docker.md Outdated
@ -30,3 +30,3 @@
## Running docker-compose
The [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.
Member

wrong path

wrong path
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -16,3 +16,2 @@
```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://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13.patch
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -17,2 +17,2 @@
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://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13.patch
wget -O mkv13_restore.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/mkv13_restore.patch
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -28,3 +28,3 @@
cd ../../
git remote set-url origin https://codeberg.org/firefish/firefish.git
git remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.git
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -34,3 +34,3 @@
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://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/renote_muting.patch
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -70,3 +70,3 @@
```sh
git remote set-url origin https://codeberg.org/firefish/firefish.git
git remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.git
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -82,3 +82,3 @@
```sh
wget -O fk.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/fk.patch
wget -O fk.patch https://codeberg.org/iceshrimp/iceshrimp/raw/branch/develop/docs/fk.patch
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -93,3 +93,3 @@
done
git remote set-url origin https://codeberg.org/firefish/firefish.git
git remote set-url origin https://codeberg.org/iceshrimp/iceshrimp.git
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -7,3 +7,3 @@
);
await queryRunner.query(
`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,
`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -19,3 +19,3 @@
);
await queryRunner.query(
`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,
`UPDATE "meta" SET "repositoryUrl" = 'https://codeberg/iceshrimp/iceshrimp'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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'`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -437,3 +437,3 @@
@Column("varchar", {
length: 512,
default: "https://codeberg.org/firefish/firefish",
default: "https://codeberg.org/iceshrimp/iceshrimp",
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -444,3 +444,3 @@
@Column("varchar", {
length: 512,
default: "https://codeberg.org/firefish/firefish/issues/new",
default: "https://codeberg.org/iceshrimp/iceshrimp/issues/new",
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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",
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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",
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -16,3 +16,3 @@
externalDocs: {
description: "Repository",
url: "https://codeberg.org/firefish/firefish",
url: "https://codeberg.org/iceshrimp/iceshrimp",
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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`,
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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>'),
Member

https://iceshrimp.dev (several times in this file)

https://iceshrimp.dev (several times in this file)
nullrequest marked this conversation as resolved
@ -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">
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -42,3 +42,3 @@
>{{ i18n.ts.updateAvailable }}
<a
href="https://codeberg.org/firefish/firefish/releases"
href="https://codeberg.org/iceshrimp/iceshrimp/releases"
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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)`);
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -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");
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
@ -19,3 +19,3 @@
"repository": {
"type": "git",
"url": "https://codeberg.org/firefish/firefish.git"
"url": "https://codeberg.org/iceshrimp/iceshrimp.git"
Member
https://iceshrimp.dev
nullrequest marked this conversation as resolved
Member

(Oops, I clicked on validated instead of comment 😬 I'm sorry.)

(Oops, I clicked on validated instead of comment 😬 I'm sorry.)
nullrequest force-pushed defried from 1f0f55dea9 to d6393af049 2023-08-17 18:48:11 +02:00 Compare
jeder requested changes 2023-08-17 19:27:38 +02:00
jeder left a comment
Member

Lots of lower case "i" in places where it shouldn't be, also, there's no FIREFISH.md/iceshrimp.md file, and I am not sure if we should touch exisiting migrations?

Lots of lower case "i" in places where it shouldn't be, also, there's no `FIREFISH.md/iceshrimp.md` file, and I am not sure if we should touch exisiting migrations?
CONTRIBUTING.md Outdated
@ -12,2 +11,3 @@
[![Translation status](https://hosted.weblate.org/widgets/iceshrimp/-/287x66-grey.png)](https://translate.iceshrimp.dev/)
[![Translation bars](https://hosted.weblate.org/widgets/firefish/-/multi-auto.svg)](https://hosted.weblate.org/engage/firefish/)
[![Translation bars](https://hosted.weblate.org/widgets/iceshrimp/-/multi-auto.svg)](https://translate.iceshrimp.dev/)
Member

This needs changing from hosted.weblate.org to translate.iceshrimp.dev.

This needs changing from `hosted.weblate.org` to `translate.iceshrimp.dev`.
nullrequest marked this conversation as resolved
COPYING Outdated
@ -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.
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -1,4 +1,4 @@
Copyright 2023 Firefish
Copyright 2023 iceshrimp
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -3,3 +3,3 @@
services:
web:
image: docker.io/thatonecalculator/firefish
image: docker.io/thatonecalculator/iceshrimp
Member

replace with iceshrimp.dev/iceshrimp/iceshrimp:dev

replace with `iceshrimp.dev/iceshrimp/iceshrimp:dev`
nullrequest marked this conversation as resolved
docs/api-doc.md Outdated
@ -1,5 +1,5 @@
# API Documentation
You can find interactive API documentation at any Firefish instance. https://firefish.social/api-doc
You can find interactive API documentation at any iceshrimp instance. https://iceshrimp.social/api-doc
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -1,7 +1,7 @@
# 🌎 Firefish Developer Docs
# 🌎 iceshrimp Developer Docs
Member

Lower case i instead of capital in lines 1, 4, 13, 17, 18, 100

Lower case i instead of capital in lines 1, 4, 13, 17, 18, 100
nullrequest marked this conversation as resolved
docs/docker.md Outdated
@ -1,14 +1,14 @@
# 🐳 Running a Firefish server with Docker
# 🐳 Running a iceshrimp server with Docker
Member

Lower case i instead of capital in lines 1, 11?

Lower case i instead of capital in lines 1, 11?
nullrequest marked this conversation as resolved
docs/docker.md Outdated
@ -2,3 +2,3 @@
## Pre-built docker container
[thatonecalculator/firefish](https://hub.docker.com/r/thatonecalculator/firefish)
[iceshrimp/iceshrimp](iceshrimp.dev/iceshrimp/iceshrimp)
Member

https:// needed, currently 404s

`https://` needed, currently 404s
Member

scratch that, should be
[iceshrimp.dev/iceshrimp/iceshrimp](https://iceshrimp.dev/iceshrimp/-/packages/container/iceshrimp/versions)

scratch that, should be `[iceshrimp.dev/iceshrimp/iceshrimp](https://iceshrimp.dev/iceshrimp/-/packages/container/iceshrimp/versions)`
nullrequest marked this conversation as resolved
docs/install.md Outdated
@ -1,6 +1,6 @@
# Installing Iceshrimp
This 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.
Member

Nonsense

Nonsense
nullrequest marked this conversation as resolved
@ -1,7 +1,7 @@
# Running a Firefish server with Kubernetes and Helm
# Running a iceshrimp server with Kubernetes and Helm
Member

Lower case i instead of capital in lines 1, 4, 20, 30

Lower case i instead of capital in lines 1, 4, 20, 30
nullrequest marked this conversation as resolved
docs/migrate.md Outdated
@ -1,4 +1,4 @@
# 🚚 Migrating from Misskey/FoundKey to Firefish
# 🚚 Migrating from Misskey/FoundKey to iceshrimp
Member

Lower case i instead of capital in lines 1, 63, 106

Lower case i instead of capital in lines 1, 63, 106
nullrequest marked this conversation as resolved
@ -1,6 +1,6 @@
# 📦 Packages
This directory contains all of the packages Firefish uses.
This directory contains all of the packages iceshrimp uses.
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -1,4 +1,4 @@
Copyright 2023 Firefish
Copyright 2023 iceshrimp
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -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'`,
Member

Do we meddle with migrations?

Do we meddle with migrations?
Author
Member

I'm going to revert all the migration stuff, it seems risky changing them

I'm going to revert all the migration stuff, it seems risky changing them
nullrequest marked this conversation as resolved
@ -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})`;
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -20,3 +20,2 @@
img: meta.bannerUrl,
title: meta.name || "Firefish",
instanceName: meta.name || "Firefish",
title: meta.name || "iceshrimp",
Member

Lower case i instead of capital in lines 21, 22

Lower case i instead of capital in lines 21, 22
nullrequest marked this conversation as resolved
@ -444,3 +444,3 @@
@Column("varchar", {
length: 512,
default: "https://codeberg.org/firefish/firefish/issues/new",
default: "https://iceshrimp.dev/iceshrimp/iceshrimp/issues/new",
Member

no idea but probably migration required for all changed files in models/ folder?

no idea but probably migration required for all changed files in `models/` folder?
nullrequest marked this conversation as resolved
@ -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",
Member

Lower case i instead of capital in lines 19 to 22

Lower case i instead of capital in lines 19 to 22
nullrequest marked this conversation as resolved
@ -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, otherwise
Member

Lower case i instead of capital in lines 71, 72

Lower case i instead of capital in lines 71, 72
nullrequest marked this conversation as resolved
@ -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.
Member

Lower case i instead of capital in lines 95, 400, 401

Lower case i instead of capital in lines 95, 400, 401
nullrequest marked this conversation as resolved
@ -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.
Member

Lower case i instead of capital in lines 130, 381, 567, 568

Lower case i instead of capital in lines 130, 381, 567, 568
nullrequest marked this conversation as resolved
@ -338,3 +338,3 @@
import * as ep___admin_driveCapOverride from "./endpoints/admin/drive-capacity-override.js";
//Firefish Move
//iceshrimp Move
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -69,3 +69,3 @@
optional: false,
nullable: false,
default: "https://codeberg.org/firefish/firefish",
default: "https://codeberg.org/iceshrimp/iceshrimp",
Member

should be https://iceshrimp.dev/iceshrimp/iceshrimp

should be `https://iceshrimp.dev/iceshrimp/iceshrimp`
nullrequest marked this conversation as resolved
@ -75,3 +75,3 @@
optional: false,
nullable: false,
default: "https://codeberg.org/firefish/firefish/issues",
default: "https://codeberg.org/iceshrimp/iceshrimp/issues",
Member

should be https://iceshrimp.dev/iceshrimp/iceshrimp

should be `https://iceshrimp.dev/iceshrimp/iceshrimp`
nullrequest marked this conversation as resolved
@ -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",
Member

should be https://iceshrimp.dev/iceshrimp/iceshrimp

should be `https://iceshrimp.dev/iceshrimp/iceshrimp`
nullrequest marked this conversation as resolved
@ -10,3 +10,3 @@
info: {
version: "v1",
title: "Firefish API",
title: "iceshrimp API",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -44,3 +44,3 @@
title: `${author.name} (@${user.username}@${config.host})`,
updated: notes[0].createdAt,
generator: "Firefish",
generator: "iceshrimp",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -2,2 +2,2 @@
"short_name": "Firefish",
"name": "Firefish",
"short_name": "iceshrimp",
"name": "iceshrimp",
Member

Lower case i instead of capital in lines 2, 3

Lower case i instead of capital in lines 2, 3
nullrequest marked this conversation as resolved
@ -11,3 +11,2 @@
res.short_name = instance.name || "Firefish";
res.name = instance.name || "Firefish";
res.short_name = instance.name || "iceshrimp";
Member

Lower case i instead of capital in lines 12, 13

Lower case i instead of capital in lines 12, 13
nullrequest marked this conversation as resolved
@ -30,3 +30,3 @@
if (config.syslog) {
this.syslogClient = new SyslogPro.RFC5424({
applacationName: "Firefish",
applacationName: "iceshrimp",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -36,3 +36,3 @@
) as HTMLMetaElement
)?.content,
softwareName: Instance.softwareName || "Firefish",
softwareName: Instance.softwareName || "iceshrimp",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -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>
Member

Lower case i instead of capital in lines 11, 85

Lower case i instead of capital in lines 11, 85
nullrequest marked this conversation as resolved
@ -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.`,
Member

misskey?

misskey?
Author
Member

holdover from firefish

holdover from firefish
nullrequest marked this conversation as resolved
@ -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">
Member

iceshrimp.dev or joiniceshrimp.org?

iceshrimp.dev or joiniceshrimp.org?
Author
Member

for now i'd say iceshrimp.dev since joiniceshrimp doesn't exist afaik

for now i'd say iceshrimp.dev since joiniceshrimp doesn't exist afaik
nullrequest marked this conversation as resolved
@ -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;
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -1,6 +1,6 @@
<template>
<form class="mk-setup" @submit.prevent="submit()">
<h1>Welcome to Firefish!</h1>
<h1>Welcome to iceshrimp!</h1>
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -7,3 +7,3 @@
name: 'Dark',
author: 'Firefish Contributors',
author: 'iceshrimp Contributors',
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -7,3 +7,3 @@
name: 'Light',
author: 'Firefish Contributors',
author: 'iceshrimp Contributors',
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
@ -1,6 +1,6 @@
# Firefish.js
# iceshrimp.js
Member

Lower case i instead of capital in lines 1, 3

Lower case i instead of capital in lines 1, 3
Member

Still lower case i instead of capital in first line

Still lower case i instead of capital in first line
nullrequest marked this conversation as resolved
@ -2,3 +2,3 @@
"name": "iceshrimp-js",
"version": "0.0.24",
"description": "Firefish SDK for JavaScript",
"description": "iceshrimp SDK for JavaScript",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
release.json Outdated
@ -1,5 +1,5 @@
{
"version": "1.0.0",
"notes": "Welcome to Firefish!",
"notes": "Welcome to iceshrimp!",
Member

Lower case i instead of capital

Lower case i instead of capital
nullrequest marked this conversation as resolved
nullrequest requested review from jeder 2023-08-18 18:20:39 +02:00
nullrequest requested review from AntoineD 2023-08-18 18:20:43 +02:00
jeder requested changes 2023-08-18 19:15:07 +02:00
jeder left a comment
Member

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 🥴

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 🥴
CONTRIBUTING.md Outdated
@ -1,26 +1,24 @@
# Contribution guide
We'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.
Member

Still lower case i instead of capital, and also should be "contributing to Iceshrimp"

Still lower case i instead of capital, and also should be "contributing to Iceshrimp"
CONTRIBUTING.md Outdated
@ -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.
Member

Still lower case i instead of capital

Still lower case i instead of capital
@ -2,3 +2,3 @@
## Nix Dev Environment
The 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!
Member

Still lower case i instead of capital

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:
Member

Still lower case i instead of capital

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.
Member

Still lower case i instead of capital

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.
Member

Still lower case i instead of capital

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 -
Member

Still lower case i instead of capital

Still lower case i instead of capital