From 5c3e782d29a16b4f13d2b372224f7a650b98be81 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Tue, 28 Jun 2022 13:05:20 +0900 Subject: [PATCH] improve instance doughnut charts --- .../server/api/endpoints/federation/stats.ts | 21 ++++++++++++++++--- packages/client/src/pages/admin/overview.vue | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index 5769996706..d3c2659088 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -1,5 +1,5 @@ -import { MoreThan } from 'typeorm'; -import { Instances } from '@/models/index.js'; +import { IsNull, MoreThan, Not } from 'typeorm'; +import { Followings, Instances } from '@/models/index.js'; import { awaitAll } from '@/prelude/await-all.js'; import define from '../../define.js'; @@ -21,7 +21,7 @@ export const paramDef = { // eslint-disable-next-line import/no-default-export export default define(meta, paramDef, async (ps) => { - const [topSubInstances, topPubInstances] = await Promise.all([ + const [topSubInstances, topPubInstances, allSubCount, allPubCount] = await Promise.all([ Instances.find({ where: { followersCount: MoreThan(0), @@ -40,10 +40,25 @@ export default define(meta, paramDef, async (ps) => { }, take: 10, }), + Followings.count({ + where: { + followeeHost: Not(IsNull()), + }, + }), + Followings.count({ + where: { + followerHost: Not(IsNull()), + }, + }), ]); + const gotSubCount = topSubInstances.map(x => x.followersCount).reduce((a, b) => a + b, 0); + const gotPubCount = topSubInstances.map(x => x.followingCount).reduce((a, b) => a + b, 0); + return await awaitAll({ topSubInstances: Instances.packMany(topSubInstances), + otherFollowersCount: Math.max(0, allSubCount - gotSubCount), topPubInstances: Instances.packMany(topPubInstances), + otherFollowingCount: Math.max(0, allPubCount - gotPubCount), }); }); diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue index 7e297890cc..190f756f78 100644 --- a/packages/client/src/pages/admin/overview.vue +++ b/packages/client/src/pages/admin/overview.vue @@ -112,12 +112,12 @@ <div class="body"> <div class="chart deliver"> <div class="title">Sub</div> - <XPie :data="fedStats.topSubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followersCount }))"/> + <XPie :data="fedStats.topSubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followersCount })).concat([{ name: '(other)', color: '#808080', value: fedStats.otherFollowersCount }])"/> <div class="subTitle">Top 10</div> </div> <div class="chart inbox"> <div class="title">Pub</div> - <XPie :data="fedStats.topPubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followingCount }))"/> + <XPie :data="fedStats.topPubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followingCount })).concat([{ name: '(other)', color: '#808080', value: fedStats.otherFollowingCount }])"/> <div class="subTitle">Top 10</div> </div> </div>