Merge branch 'develop'

This commit is contained in:
ThatOneCalculator 2023-07-19 15:21:57 -07:00
commit cbc4403cd0
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
24 changed files with 49 additions and 59 deletions

View File

@ -61,7 +61,7 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at reported to the community leaders responsible for enforcement at
@t1c on Prometheus Gitlab, @thatonecalculator on Codeberg,
`@kainoa@firefish.social` on the Fediverse, `@kainoa@firefish.social` on the Fediverse,
or kainoa@t1c.dev via email. or kainoa@t1c.dev via email.
All complaints will be reviewed and investigated promptly and fairly. All complaints will be reviewed and investigated promptly and fairly.

View File

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

View File

@ -1,7 +1,3 @@
# :warning: Repo has moved!
https://gitlab.prometheus.systems/firefish/firefish/
<div align="center"> <div align="center">
<a href="https://joinfirefish.org/"> <a href="https://joinfirefish.org/">
<img src="./title.svg" alt="Firefish logo" style="border-radius:50%" width="400"/> <img src="./title.svg" alt="Firefish logo" style="border-radius:50%" width="400"/>
@ -95,8 +91,8 @@ If you have access to a server that supports one of the sources below, I recomme
## 🛳️ Containerization ## 🛳️ Containerization
- [🐳 How to run Firefish with Docker](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/docker.md) - [🐳 How to run Firefish with Docker](https://codeberg.org/firefish/firefish/src/branch/develop/docs/docker.md)
- [🛞 How to run Firefish with Kubernetes/Helm](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/kubernetes.md) - [🛞 How to run Firefish with Kubernetes/Helm](https://codeberg.org/firefish/firefish/src/branch/develop/docs/kubernetes.md)
## 🧑‍💻 Dependencies ## 🧑‍💻 Dependencies
@ -132,7 +128,7 @@ If you have access to a server that supports one of the sources below, I recomme
## 👀 Get folder ready ## 👀 Get folder ready
```sh ```sh
git clone https://gitlab.prometheus.systems/firefish/firefish.git git clone https://codeberg.org/firefish/firefish.git
cd firefish/ cd firefish/
``` ```
@ -223,7 +219,7 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an
## 🚚 Migrating from Misskey/FoundKey to Firefish ## 🚚 Migrating from Misskey/FoundKey to Firefish
For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://gitlab.prometheus.systems/firefish/firefish/src/branch/develop/docs/migrate.md). For migrating from Misskey v13, Misskey v12, and FoundKey, read [this document](https://codeberg.org/firefish/firefish/src/branch/develop/docs/migrate.md).
## 🌐 Web proxy ## 🌐 Web proxy

View File

@ -2,13 +2,13 @@
Welcome to the new era of FIREFISH! Welcome to the new era of FIREFISH!
<img src="https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/animated.svg" height="320px"/> <img src="https://codeberg.org/firefish/firefish/raw/branch/develop/animated.svg" height="320px"/>
# Changelog # Changelog
## Major changes from last release candidate ## Major changes from last release candidate
- Firefish branding and [new repo](https://gitlab.prometheus.systems/firefish/firefish)! - Firefish branding and [new repo](https://codeberg.org/firefish/firefish)!
- Far better Mastodon API support - Far better Mastodon API support
- Edits are now non-experimental - Edits are now non-experimental
- Support for secondary cache server - Support for secondary cache server
@ -64,7 +64,7 @@ All of the above, plus:
## Set new repo and pull ## Set new repo and pull
```sh ```sh
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git git remote set-url origin https://codeberg.org/firefish/firefish.git
git pull --ff git pull --ff
``` ```

View File

@ -11,6 +11,6 @@ If you discover a security issue, which is so high risk, that too much is affect
This will allow us to assess the risk, and make a fix available before we add a This will allow us to assess the risk, and make a fix available before we add a
bug report to the Gitlab repository. bug report to the Codeberg repository.
Thanks for helping make Firefish safe for everyone. Thanks for helping make Firefish safe for everyone.

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. If your Misskey v13 is older, we recommend updating your Misskey to v13.11.3.
```sh ```sh
wget -O mkv13.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/mkv13.patch wget -O mkv13.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13.patch
wget -O mkv13_restore.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/mkv13_restore.patch wget -O mkv13_restore.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/mkv13_restore.patch
git apply mkv13.patch mkv13_restore.patch git apply mkv13.patch mkv13_restore.patch
cd packages/backend cd packages/backend
@ -27,13 +27,13 @@ for i in $(seq 1 $NUM_MIGRATIONS); do pnpm typeorm migration:revert -d ormconfig
cd ../../ cd ../../
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git git remote set-url origin https://codeberg.org/firefish/firefish.git
git fetch origin git fetch origin
git stash push git stash push
rm -rf fluent-emojis misskey-assets rm -rf fluent-emojis misskey-assets
git switch main # or beta or develop git switch main # or beta or develop
git pull --ff git pull --ff
wget -O renote_muting.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/renote_muting.patch wget -O renote_muting.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/renote_muting.patch
git apply renote_muting.patch git apply renote_muting.patch
pnpm install pnpm install
@ -69,7 +69,7 @@ If no other errors happened, your Firefish is ready to launch!
## Misskey v12.119 and before ## Misskey v12.119 and before
```sh ```sh
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git git remote set-url origin https://codeberg.org/firefish/firefish.git
git fetch git fetch
git checkout main # or beta or develop git checkout main # or beta or develop
git pull --ff git pull --ff
@ -81,7 +81,7 @@ NODE_ENV=production pnpm run migrate
## FoundKey ## FoundKey
```sh ```sh
wget -O fk.patch https://gitlab.prometheus.systems/firefish/firefish/-/raw/develop/docs/fk.patch wget -O fk.patch https://codeberg.org/firefish/firefish/raw/branch/develop/docs/fk.patch
git apply fk.patch git apply fk.patch
cd packages/backend cd packages/backend
@ -92,7 +92,7 @@ for i in $(seq 1 $NUM_MIGRATIONS); do
npx typeorm migration:revert -d ormconfig.js npx typeorm migration:revert -d ormconfig.js
done done
git remote set-url origin https://gitlab.prometheus.systems/firefish/firefish.git git remote set-url origin https://codeberg.org/firefish/firefish.git
git fetch git fetch
git checkout main # or beta or develop git checkout main # or beta or develop
git pull --ff git pull --ff

View File

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

View File

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

View File

@ -1,10 +1,10 @@
{ {
"name": "firefish", "name": "firefish",
"version": "1.0.0", "version": "1.0.1",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://gitlab.prometheus.systems/firefish/firefish.git" "url": "https://codeberg.org/firefish/firefish.git"
}, },
"packageManager": "pnpm@8.6.9", "packageManager": "pnpm@8.6.9",
"private": true, "private": true,

View File

@ -2,9 +2,6 @@ export class calckey1658203170545 {
name = "calckey1658203170545"; name = "calckey1658203170545";
async up(queryRunner) { async up(queryRunner) {
await queryRunner.query(
`UPDATE meta SET "useStarForReactionFallback" = TRUE;`,
);
await queryRunner.query( await queryRunner.query(
`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`, `UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,
); );
@ -14,9 +11,6 @@ export class calckey1658203170545 {
} }
async down(queryRunner) { async down(queryRunner) {
await queryRunner.query(
`UPDATE meta SET "useStarForReactionFallback" = FALSE;`,
);
await queryRunner.query( await queryRunner.query(
`UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`, `UPDATE meta SET "repositoryUrl" = 'https://codeberg/firefish/firefish'`,
); );

View File

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

View File

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

View File

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

View File

@ -16,7 +16,7 @@ export const paramDef = {
export default define(meta, paramDef, async () => { export default define(meta, paramDef, async () => {
let tag_name; let tag_name;
await fetch( await fetch(
"https://codeberg.org/api/v1/repos/calckey/calckey/releases?draft=false&pre-release=false&page=1&limit=1", "https://codeberg.org/api/v1/repos/firefish/firefish/releases?draft=false&pre-release=false&page=1&limit=1",
) )
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {

View File

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

View File

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

View File

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

View File

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

View File

@ -17,7 +17,7 @@ doctype html
Thank you for using Firefish! Thank you for using Firefish!
If you are reading this message... how about joining the development? If you are reading this message... how about joining the development?
https://gitlab.prometheus.systems/firefish/firefish https://codeberg.org/firefish/firefish
html html

View File

@ -495,7 +495,7 @@ export default defineComponent({
case "search": { case "search": {
// Disable "search" keyword // Disable "search" keyword
// (see the issue #9816 on Gitlab) // (see the issue #9816 on Codeberg)
if (token.props.content.slice(-6).toLowerCase() === "search") { if (token.props.content.slice(-6).toLowerCase() === "search") {
const sentinel = "#"; const sentinel = "#";
let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)( let ast2 = (isPlain ? mfm.parseSimple : mfm.parse)(

View File

@ -57,14 +57,14 @@
<FormSection> <FormSection>
<div class="_formLinks"> <div class="_formLinks">
<FormLink <FormLink
to="https://gitlab.prometheus.systems/firefish/firefish" to="https://codeberg.org/firefish/firefish"
external external
> >
<template #icon <template #icon
><i class="ph-code ph-bold ph-lg"></i ><i class="ph-code ph-bold ph-lg"></i
></template> ></template>
{{ i18n.ts._aboutFirefish.source }} {{ i18n.ts._aboutFirefish.source }}
<template #suffix>Prometheus Gitlab</template> <template #suffix>Codeberg</template>
</FormLink> </FormLink>
<FormLink <FormLink
to="https://opencollective.com/firefish" to="https://opencollective.com/firefish"
@ -120,7 +120,7 @@
</div> </div>
<template #caption <template #caption
><MkLink ><MkLink
url="https://gitlab.prometheus.systems/firefish/firefish/activity" url="https://codeberg.org/firefish/firefish/activity"
>{{ >{{
i18n.ts._aboutFirefish.allContributors i18n.ts._aboutFirefish.allContributors
}}</MkLink }}</MkLink
@ -275,7 +275,7 @@ definePageMetadata({
display: block; display: block;
width: 100px; width: 100px;
margin: 0 auto; margin: 0 auto;
border-radius: 16px; border-radius: 3px;
} }
> .misskey { > .misskey {

View File

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

View File

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

View File

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