diff options
| author | taichan <40626578+tai-cha@users.noreply.github.com> | 2024-06-07 09:00:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 09:00:01 +0900 |
| commit | 00157864e95f4fae0c8aacff16ddac7f322ad68c (patch) | |
| tree | 2c05e7a8b51d4a1987371f61a1cefe66a16781e2 /packages/backend/src/core | |
| parent | enhance(backend): improve sentry integration (diff) | |
| download | sharkey-00157864e95f4fae0c8aacff16ddac7f322ad68c.tar.gz sharkey-00157864e95f4fae0c8aacff16ddac7f322ad68c.tar.bz2 sharkey-00157864e95f4fae0c8aacff16ddac7f322ad68c.zip | |
fix(backend): チャート生成時にinstance.isSuspendedが読まれてしまう問題の修正 (#13951)
* fix(backend): use sustensionState instead of isSuspended
* Update CHANGELOG.md
Diffstat (limited to 'packages/backend/src/core')
| -rw-r--r-- | packages/backend/src/core/chart/charts/federation.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/core/chart/charts/federation.ts b/packages/backend/src/core/chart/charts/federation.ts index 5e4555ee96..c2329a2f73 100644 --- a/packages/backend/src/core/chart/charts/federation.ts +++ b/packages/backend/src/core/chart/charts/federation.ts @@ -47,7 +47,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di const suspendedInstancesQuery = this.instancesRepository.createQueryBuilder('instance') .select('instance.host') - .where('instance.isSuspended = true'); + .where('instance.suspensionState != \'none\''); const pubsubSubQuery = this.followingsRepository.createQueryBuilder('f') .select('f.followerHost') @@ -89,7 +89,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di .select('COUNT(instance.id)') .where(`instance.host IN (${ subInstancesQuery.getQuery() })`) .andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) }) - .andWhere('instance.isSuspended = false') + .andWhere('instance.suspensionState = \'none\'') .andWhere('instance.isNotResponding = false') .getRawOne() .then(x => parseInt(x.count, 10)), @@ -97,7 +97,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di .select('COUNT(instance.id)') .where(`instance.host IN (${ pubInstancesQuery.getQuery() })`) .andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])', { blocked: meta.blockedHosts.flatMap(x => [x, `%.${x}`]) }) - .andWhere('instance.isSuspended = false') + .andWhere('instance.suspensionState = \'none\'') .andWhere('instance.isNotResponding = false') .getRawOne() .then(x => parseInt(x.count, 10)), |