ash/iceshrimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

repo

Browse source
This commit is contained in:
ThatOneCalculator 2023-07-18 21:21:48 -07:00
parent 2913eddbce
commit 3b287a11af
19 changed files with 67 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
FIREFISH.md
View file

@ -1,7 +1,7 @@
# All the changes to Firefish from stock Misskey
> **Warning**
> This list is incomplete. Please check the [Releases](https://codeberg.org/firefish/firefish/releases) and [Changelog](https://codeberg.org/firefish/firefish/src/branch/develop/CHANGELOG.md) for a more complete list of changes. There have been [>4000 commits (laggy link)](https://codeberg.org/firefish/firefish/compare/700a7110f7e34f314b070987aa761c451ec34efc...develop) since we forked Misskey!
> This list is incomplete. Please check the [Releases](https://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!
## Planned
@ -91,7 +91,7 @@
- Undo renote button inside original note
- Custom locales
- Obliteration of Ai-chan
- Switch to [Firefish.js](https://codeberg.org/firefish/firefish.js)
- Switch to [Firefish.js](https://gitlab.prometheus.systems/firefish/firefish.js)
- Woozy mode 🥴
- Improve blocking servers
- Release notes

10
README.md
View file

@ -12,7 +12,7 @@
[![translate-badge](https://hosted.weblate.org/widgets/firefish/-/svg-badge.svg)](https://hosted.weblate.org/engage/firefish/)
[![docker badge](https://img.shields.io/docker/pulls/thatonecalculator/firefish?logo=docker)](https://hub.docker.com/r/thatonecalculator/firefish)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](./CODE_OF_CONDUCT.md)
[![Codeberg badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-codeberg-4793CC.svg?logo=codeberg&logoColor=white)](https://codeberg.org/firefish/firefish/)
[![Codeberg badge](https://custom-icon-badges.demolab.com/badge/hosted%20on-codeberg-4793CC.svg?logo=codeberg&logoColor=white)](https://gitlab.prometheus.systems/firefish/firefish/)
</div>
@ -90,8 +90,8 @@ If you have access to a server that supports one of the sources below, I recomme
## 🛳️ Containerization
- [🐳 How to run Firefish with Docker](https://codeberg.org/firefish/firefish/src/branch/develop/docs/docker.md)
- [🛞 How to run Firefish with Kubernetes/Helm](https://codeberg.org/firefish/firefish/src/branch/develop/docs/kubernetes.md)
- [🐳 How to run Firefish with Docker](https://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)
## 🧑‍💻 Dependencies
@ -127,7 +127,7 @@ If you have access to a server that supports one of the sources below, I recomme
## 👀 Get folder ready
```sh
git clone https://codeberg.org/firefish/firefish.git
git clone https://gitlab.prometheus.systems/firefish/firefish.git
cd firefish/
```
@ -218,7 +218,7 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an
## 🚚 Migrating from Misskey/FoundKey to Firefish
For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://codeberg.org/firefish/firefish/src/branch/develop/docs/migrate.md).
For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/migrate.md).
## 🌐 Web proxy

12
docs/migrate.md
View file

@ -14,8 +14,8 @@ Tested with Misskey v13.11.3.
If your Misskey v13 is older, we recommend updating your Misskey to v13.11.3.
```sh
wget -O mkv13.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13.patch
wget -O mkv13_restore.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patch
wget -O mkv13.patch https://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
git apply mkv13.patch mkv13_restore.patch
cd packages/backend
@ -27,13 +27,13 @@ for i in $(seq 1 $NUM_MIGRATIONS); do pnpm typeorm migration:revert -d ormconfig
cd ../../
git remote set-url origin https://codeberg.org/firefish/firefish.git
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git
git fetch origin
git stash push
rm -rf fluent-emojis misskey-assets
git switch main # or beta or develop
git pull --ff
wget -O renote_muting.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/renote_muting.patch
wget -O renote_muting.patch https://gitlab.prometheus.systems/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://codeberg.org/firefish/firefish.git
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git
git fetch
git checkout main # or beta or develop
git pull --ff
@ -91,7 +91,7 @@ for i in $(seq 1 $NUM_MIGRATIONS); do
npx typeorm migration:revert -d ormconfig.js
done
git remote set-url origin https://codeberg.org/firefish/firefish.git
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git
git fetch
git checkout main # or beta or develop
git pull --ff

8
issue_template/bug.yaml
View file

@ -7,7 +7,7 @@ contact_links:
url: https://matrix.to/#/%23firefish:matrix.fedibird.com
about: Having trouble with deployment? Ask the support chat.
- name: 🔒 Resposible Disclosure
url: https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md
url: https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md
about: Found a security vulnerability? Please disclose it responsibly.
body:
- type: markdown
@ -15,8 +15,8 @@ body:
value: |
💖 Thanks for taking the time to fill out this bug report!
💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com)
🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md)
🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
🔒 Found a security vulnerability? [Please disclose it responsibly.](https://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)
- type: textarea
id: what-happened
attributes:
@ -128,7 +128,7 @@ body:
id: terms
attributes:
label: Contribution Guidelines
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
options:
- label: I agree to follow this project's Contribution Guidelines
required: true

8
issue_template/feature.yaml
View file

@ -7,7 +7,7 @@ contact_links:
url: https://matrix.to/#/%23firefish:matrix.fedibird.com
about: Having trouble with deployment? Ask the support chat.
- name: 🔒 Resposible Disclosure
url: https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md
url: https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/SECURITY.md
about: Found a security vulnerability? Please disclose it responsibly.
body:
- type: markdown
@ -15,8 +15,8 @@ body:
value: |
💖 Thanks for taking the time to fill out this feature request!
💁 Having trouble with deployment? [Ask the support chat.](https://matrix.to/#/%23firefish:matrix.fedibird.com)
🔒 Found a security vulnerability? [Please disclose it responsibly.](https://codeberg.org/firefish/firefish/src/branch/develop/SECURITY.md)
🤝 By submitting this issue, you agree to follow our [Contribution Guidelines.](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
🔒 Found a security vulnerability? [Please disclose it responsibly.](https://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)
- type: textarea
id: what-feature
attributes:
@ -53,7 +53,7 @@ body:
id: terms
attributes:
label: Contribution Guidelines
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
options:
- label: I agree to follow this project's Contribution Guidelines
required: true

2
package.json
View file

@ -4,7 +4,7 @@
"codename": "aqua",
"repository": {
"type": "git",
"url": "https://codeberg.org/firefish/firefish.git"
"url": "https://gitlab.prometheus.systems/firefish/firefish.git"
},
"packageManager": "pnpm@8.6.7",
"private": true,

21
packages/backend/migration/1689739513827-firefish-repo.js Normal file
View file

@ -0,0 +1,21 @@
export class FirefishRepo1689739513827 {
name = "FirefishRepo1689739513827";
async up(queryRunner) {
await queryRunner.query(
`UPDATE meta SET "repositoryUrl" = 'https://gitlab.prometheus.systems/firefish/firefish'`,
);
await queryRunner.query(
`UPDATE meta SET "feedbackUrl" = 'https://gitlab.prometheus.systems/firefish/firefish/issues'`,
);
}
async down(queryRunner) {
await queryRunner.query(
`UPDATE meta SET "repositoryUrl" = 'https://codeberg.org/calckey/calckey'`,
);
await queryRunner.query(
`UPDATE meta SET "feedbackUrl" = 'https://codeberg.org/calckey/calckey/firefish/firefish/issues'`,
);
}
}

2
packages/backend/src/boot/master.ts
View file

@ -49,7 +49,7 @@ function greet() {
136,
0,
)(
" If you like Firefish, please consider starring or contributing to the repo. https://codeberg.org/firefish/firefish",
" If you like Firefish, please consider starring or contributing to the repo. https://gitlab.prometheus.systems/firefish/firefish",
),
);

4
packages/backend/src/models/entities/meta.ts
View file

@ -436,14 +436,14 @@ export class Meta {
@Column("varchar", {
length: 512,
default: "https://codeberg.org/firefish/firefish",
default: "https://gitlab.prometheus.systems/firefish/firefish",
nullable: false,
})
public repositoryUrl: string;
@Column("varchar", {
length: 512,
default: "https://codeberg.org/firefish/firefish/issues/new",
default: "https://gitlab.prometheus.systems/firefish/firefish/issues/new",
nullable: true,
})
public feedbackUrl: string | null;

4
packages/backend/src/server/api/endpoints/meta.ts
View file

@ -68,13 +68,13 @@ export const meta = {
type: "string",
optional: false,
nullable: false,
default: "https://codeberg.org/firefish/firefish",
default: "https://gitlab.prometheus.systems/firefish/firefish",
},
feedbackUrl: {
type: "string",
optional: false,
nullable: false,
default: "https://codeberg.org/firefish/firefish/issues",
default: "https://gitlab.prometheus.systems/firefish/firefish/issues",
},
defaultDarkTheme: {
type: "string",

2
packages/backend/src/server/api/endpoints/patrons.ts
View file

@ -36,7 +36,7 @@ export default define(meta, paramDef, async (ps) => {
};
patrons = await fetch(
"https://codeberg.org/firefish/firefish/raw/branch/develop/patrons.json",
"https://gitlab.prometheus.systems/firefish/firefish/raw/branch/develop/patrons.json",
{ signal: AbortSignal.timeout(2000) },
)
.then((response) => response.json())

2
packages/backend/src/server/api/endpoints/release.ts
View file

@ -18,7 +18,7 @@ export default define(meta, paramDef, async () => {
let release;
await fetch(
"https://codeberg.org/firefish/firefish/raw/branch/develop/release.json",
"https://gitlab.prometheus.systems/firefish/firefish/raw/branch/develop/release.json",
)
.then((response) => response.json())
.then((data) => {

4
packages/backend/src/server/api/openapi/gen-spec.ts
View file

@ -15,7 +15,7 @@ export function genOpenapiSpec() {
externalDocs: {
description: "Repository",
url: "https://codeberg.org/firefish/firefish",
url: "https://gitlab.prometheus.systems/firefish/firefish",
},
servers: [
@ -106,7 +106,7 @@ export function genOpenapiSpec() {
description: desc,
externalDocs: {
description: "Source code",
url: `https://codeberg.org/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
url: `https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
},
tags: endpoint.meta.tags || undefined,
security,

15
packages/backend/src/server/web/views/base.pug
View file

@ -7,16 +7,17 @@ doctype html
//
-
___ _ _
/ __\__ _| | ___| | _____ _ _
/ / / _` | |/ __| |/ / _ \ | | |
/ /__| (_| | | (__| < __/ |_| |
\____/\__,_|_|\___|_|\_\___|\__, |
(___/
▄▄▄▄▄▄▄ ▄▄▄ ▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ ▄▄▄ ▄▄▄▄▄▄▄ ▄▄ ▄▄ ◯
█ █ █ ▄ █ █ █ █ █ █ █ █ █ ○ ▄ ▄
█ ▄▄▄█ █ █ █ █ █ ▄▄▄█ ▄▄▄█ █ ▄▄▄▄▄█ █▄█ █ ⚬ █▄▄ █▄▄
█ █▄▄▄█ █ █▄▄█▄█ █▄▄▄█ █▄▄▄█ █ █▄▄▄▄▄█ █ ▄▄▄▄▄▄ ▄
█ ▄▄▄█ █ ▄▄ █ ▄▄▄█ ▄▄▄█ █▄▄▄▄▄ █ ▄ █ █ █ █▄▄
█ █ █ █ █ █ █ █▄▄▄█ █ █ █▄▄▄▄▄█ █ █ █ █ █ ● ● █
█▄▄▄█ █▄▄▄█▄▄▄█ █▄█▄▄▄▄▄▄▄█▄▄▄█ █▄▄▄█▄▄▄▄▄▄▄█▄▄█ █▄▄█ ▀▄▄▄▄▄▄▀
Thank you for using Firefish!
If you are reading this message... how about joining the development?
https://codeberg.org/firefish/firefish
https://gitlab.prometheus.systems/firefish/firefish
html

4
packages/client/src/pages/about-calckey.vue
View file

@ -57,7 +57,7 @@
<FormSection>
<div class="_formLinks">
<FormLink
to="https://codeberg.org/firefish/firefish"
to="https://gitlab.prometheus.systems/firefish/firefish"
external
>
<template #icon
@ -120,7 +120,7 @@
</div>
<template #caption
><MkLink
url="https://codeberg.org/firefish/firefish/activity"
url="https://gitlab.prometheus.systems/firefish/firefish/activity"
>{{
i18n.ts._aboutFirefish.allContributors
}}</MkLink

4
packages/client/src/pages/about-firefish.vue
View file

@ -57,7 +57,7 @@
<FormSection>
<div class="_formLinks">
<FormLink
to="https://codeberg.org/firefish/firefish"
to="https://gitlab.prometheus.systems/firefish/firefish"
external
>
<template #icon
@ -120,7 +120,7 @@
</div>
<template #caption
><MkLink
url="https://codeberg.org/firefish/firefish/activity"
url="https://gitlab.prometheus.systems/firefish/firefish/activity"
>{{
i18n.ts._aboutFirefish.allContributors
}}</MkLink

2
packages/client/src/pages/admin/index.vue
View file

@ -41,7 +41,7 @@
<MkInfo v-if="updateAvailable" warn class="info"
>{{ i18n.ts.updateAvailable }}
<a
href="https://codeberg.org/firefish/firefish/releases"
href="https://gitlab.prometheus.systems/firefish/firefish/releases"
target="_bank"
class="_link"
>{{ i18n.ts.check }}</a

2
packages/firefish-js/package.json
View file

@ -18,7 +18,7 @@
},
"repository": {
"type": "git",
"url": "https://codeberg.org/firefish/firefish.git"
"url": "https://gitlab.prometheus.systems/firefish/firefish.git"
},
"devDependencies": {
"@microsoft/api-extractor": "^7.36.0",

2
pull_request_template.yml
View file

@ -18,7 +18,7 @@ body:
id: terms
attributes:
label: Contribution Guidelines
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/CONTRIBUTING.md)
options:
- label: I agree to follow this project's Contribution Guidelines
required: true