summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPorlam Nicla <84321396+GrapeApple0@users.noreply.github.com>2024-06-07 14:46:46 +0900
committerdakkar <dakkar@thenautilus.net>2024-06-07 22:11:13 +0100
commitc39de769ca91c638d847cc2e43b1ffe335e1ffe2 (patch)
treed18ec47537ff3df50027f8af83fdfa66b591990c
parentMerge tag '2024.5.0' into future-2024-05-31 (diff)
downloadsharkey-c39de769ca91c638d847cc2e43b1ffe335e1ffe2.tar.gz
sharkey-c39de769ca91c638d847cc2e43b1ffe335e1ffe2.tar.bz2
sharkey-c39de769ca91c638d847cc2e43b1ffe335e1ffe2.zip
配信停止したインスタンス一覧が見れなくなる問題を修正 (#13945)
* 配信停止したインスタンス一覧が見れなくなる問題を修正 * Update CHANGELOG.md
-rw-r--r--CHANGELOG.md12
-rw-r--r--packages/backend/src/server/api/endpoints/federation/instances.ts4
2 files changed, 14 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f78ba677d..f93811c606 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+- Fix: 配信停止したインスタンス一覧が見れなくなる問題を修正
+
+### Client
+-
+
+### Server
+- チャート生成時にinstance.suspentionStateに置き換えられたinstance.isSuspendedが参照されてしまう問題を修正
+
+
## 2024.5.0
### Note
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 4064a415a4..c3f2247b69 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -125,9 +125,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
if (typeof ps.suspended === 'boolean') {
if (ps.suspended) {
- query.andWhere('instance.isSuspended = TRUE');
+ query.andWhere('instance.suspensionState != \'none\'');
} else {
- query.andWhere('instance.isSuspended = FALSE');
+ query.andWhere('instance.suspensionState = \'none\'');
}
}