-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into fix/fix-slowed-build-scripts
- Loading branch information
Showing
35 changed files
with
485 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
## Unreleased | ||
|
||
### Note | ||
- コントロールパネル内にあるサマリープロキシの設定個所がセキュリティから全般へ変更となります。 | ||
|
||
### General | ||
- Enhance: URLプレビューの有効化・無効化を設定できるように #13569 | ||
- Enhance: アンテナでBotによるノートを除外できるように | ||
(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/545) | ||
- Fix: Play作成時に設定した公開範囲が機能していない問題を修正 | ||
|
||
### Client | ||
|
@@ -23,6 +29,7 @@ | |
|
||
### Server | ||
- Enhance: エンドポイント`antennas/update`の必須項目を`antennaId`のみに | ||
- Enhance: misskey-dev/[email protected]の取り込み(プレビュー生成処理の効率化) | ||
- Fix: フォローリクエストを作成する際に既存のものは削除するように | ||
(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
packages/backend/migration/1710512074000-url-preview-meta.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* SPDX-FileCopyrightText: syuilo and misskey-project | ||
* SPDX-License-Identifier: AGPL-3.0-only | ||
*/ | ||
|
||
export class UrlPreviewMeta1710512074000 { | ||
name = 'UrlPreviewMeta1710512074000' | ||
|
||
async up(queryRunner) { | ||
await queryRunner.query(` | ||
alter table meta | ||
rename column "summalyProxy" to "urlPreviewSummaryProxyUrl"; | ||
alter table meta | ||
add "urlPreviewEnabled" boolean default true not null; | ||
alter table meta | ||
add "urlPreviewTimeout" integer default 10000 not null; | ||
alter table meta | ||
add "urlPreviewMaximumContentLength" bigint default 10485760 not null; | ||
alter table meta | ||
add "urlPreviewRequireContentLength" boolean default false not null; | ||
alter table meta | ||
add "urlPreviewUserAgent" varchar(1024) default null; | ||
`); | ||
} | ||
|
||
async down(queryRunner) { | ||
await queryRunner.query(` | ||
alter table meta | ||
rename column "urlPreviewSummaryProxyUrl" to "summalyProxy"; | ||
alter table meta | ||
drop column "urlPreviewEnabled"; | ||
alter table meta | ||
drop column "urlPreviewTimeout"; | ||
alter table meta | ||
drop column "urlPreviewMaximumContentLength"; | ||
alter table meta | ||
drop column "urlPreviewRequireContentLength"; | ||
alter table meta | ||
drop column "urlPreviewUserAgent"; | ||
`); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
packages/backend/migration/1710919614510-antenna-exclude-bots.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
/* | ||
* SPDX-FileCopyrightText: syuilo and misskey-project | ||
* SPDX-License-Identifier: AGPL-3.0-only | ||
*/ | ||
|
||
export class AntennaExcludeBots1710919614510 { | ||
name = 'AntennaExcludeBots1710919614510' | ||
|
||
async up(queryRunner) { | ||
await queryRunner.query(`ALTER TABLE "antenna" ADD "excludeBots" boolean NOT NULL DEFAULT false`); | ||
} | ||
|
||
async down(queryRunner) { | ||
await queryRunner.query(`ALTER TABLE "antenna" DROP COLUMN "excludeBots"`); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.