@@ -47,7 +47,7 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
47
47
48
48
const suspendedInstancesQuery = this . instancesRepository . createQueryBuilder ( 'instance' )
49
49
. select ( 'instance.host' )
50
- . where ( 'instance.isSuspended = true ' ) ;
50
+ . where ( 'instance.suspensionState != \'none\' ' ) ;
51
51
52
52
const pubsubSubQuery = this . followingsRepository . createQueryBuilder ( 'f' )
53
53
. select ( 'f.followerHost' )
@@ -89,15 +89,15 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
89
89
. select ( 'COUNT(instance.id)' )
90
90
. where ( `instance.host IN (${ subInstancesQuery . getQuery ( ) } )` )
91
91
. andWhere ( meta . blockedHosts . length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])' , { blocked : meta . blockedHosts . flatMap ( x => [ x , `%.${ x } ` ] ) } )
92
- . andWhere ( 'instance.isSuspended = false ' )
92
+ . andWhere ( 'instance.suspensionState = \'none\' ' )
93
93
. andWhere ( 'instance.isNotResponding = false' )
94
94
. getRawOne ( )
95
95
. then ( x => parseInt ( x . count , 10 ) ) ,
96
96
this . instancesRepository . createQueryBuilder ( 'instance' )
97
97
. select ( 'COUNT(instance.id)' )
98
98
. where ( `instance.host IN (${ pubInstancesQuery . getQuery ( ) } )` )
99
99
. andWhere ( meta . blockedHosts . length === 0 ? '1=1' : 'instance.host NOT ILIKE ANY(ARRAY[:...blocked])' , { blocked : meta . blockedHosts . flatMap ( x => [ x , `%.${ x } ` ] ) } )
100
- . andWhere ( 'instance.isSuspended = false ' )
100
+ . andWhere ( 'instance.suspensionState = \'none\' ' )
101
101
. andWhere ( 'instance.isNotResponding = false' )
102
102
. getRawOne ( )
103
103
. then ( x => parseInt ( x . count , 10 ) ) ,
0 commit comments