profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: add active to federation chart

Browse source
This commit is contained in:
syuilo 2022-03-07 15:10:16 +09:00
parent 8ca8d77c1e
commit ec64b5ea0b
5 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packages/backend/migration/1646633030285-chart-federation-active.js Normal file
View file

@ -0,0 +1,13 @@
export class chartFederationActive1646633030285 {
name = 'chartFederationActive1646633030285'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "__chart__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE "__chart_day__federation" ADD "___active" smallint NOT NULL DEFAULT '0'`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "__chart_day__federation" DROP COLUMN "___active"`);
await queryRunner.query(`ALTER TABLE "__chart__federation" DROP COLUMN "___active"`);
}
}

1
packages/backend/src/services/chart/charts/entities/federation.ts
View file

@ -9,6 +9,7 @@ export const schema = {
'sub': { accumulate: true, range: 'small' },
'pub': { accumulate: true, range: 'small' },
'pubsub': { accumulate: true, range: 'small' },
'active': { accumulate: true, range: 'small' },
} as const;
export const entity = Chart.schemaToEntity(name, schema);

9
packages/backend/src/services/chart/charts/federation.ts
View file

@ -2,6 +2,7 @@ import Chart, { KVs } from '../core.js';
import { Followings, Instances } from '@/models/index.js';
import { name, schema } from './entities/federation.js';
import { fetchMeta } from '@/misc/fetch-meta.js';
import { In, MoreThan, Not } from 'typeorm';
/**
* フェデレーションに関するチャート
@ -28,7 +29,7 @@ export default class FederationChart extends Chart<typeof schema> {
.select('f.followerHost')
.where('f.followerHost IS NOT NULL');
const [sub, pub, pubsub] = await Promise.all([
const [sub, pub, pubsub, active] = await Promise.all([
Followings.createQueryBuilder('following')
.select('COUNT(DISTINCT following.followeeHost)')
.where('following.followeeHost IS NOT NULL')
@ -52,12 +53,18 @@ export default class FederationChart extends Chart<typeof schema> {
.setParameters(pubsubSubQuery.getParameters())
.getRawOne()
.then(x => parseInt(x.count, 10)),
Instances.count({
host: Not(In(meta.blockedHosts)),
isSuspended: false,
lastCommunicatedAt: MoreThan(new Date(Date.now() - (1000 * 60 * 60 * 24 * 30))),
}),
]);
return {
'sub': sub,
'pub': pub,
'pubsub': pubsub,
'active': active,
};
}