From c04d3d22af2ba58cf199f24723f6109b12589e0f Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 28 Jun 2022 10:41:22 +0900 Subject: feat(api): add federation/stats endpoint --- .../src/server/api/endpoints/federation/stats.ts | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/backend/src/server/api/endpoints/federation/stats.ts (limited to 'packages/backend/src/server/api/endpoints/federation') diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts new file mode 100644 index 0000000000..5769996706 --- /dev/null +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -0,0 +1,49 @@ +import { MoreThan } from 'typeorm'; +import { Instances } from '@/models/index.js'; +import { awaitAll } from '@/prelude/await-all.js'; +import define from '../../define.js'; + +export const meta = { + tags: ['federation'], + + requireCredential: false, + + allowGet: true, + cacheSec: 60 * 60, +} as const; + +export const paramDef = { + type: 'object', + properties: { + }, + required: [], +} as const; + +// eslint-disable-next-line import/no-default-export +export default define(meta, paramDef, async (ps) => { + const [topSubInstances, topPubInstances] = await Promise.all([ + Instances.find({ + where: { + followersCount: MoreThan(0), + }, + order: { + followersCount: 'DESC', + }, + take: 10, + }), + Instances.find({ + where: { + followingCount: MoreThan(0), + }, + order: { + followingCount: 'DESC', + }, + take: 10, + }), + ]); + + return await awaitAll({ + topSubInstances: Instances.packMany(topSubInstances), + topPubInstances: Instances.packMany(topPubInstances), + }); +}); -- cgit v1.2.3-freya From 5c3e782d29a16b4f13d2b372224f7a650b98be81 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 28 Jun 2022 13:05:20 +0900 Subject: improve instance doughnut charts --- .../src/server/api/endpoints/federation/stats.ts | 21 ++++++++++++++++++--- packages/client/src/pages/admin/overview.vue | 4 ++-- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/federation') 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 @@
Sub
- +
Top 10
Pub
- +
Top 10
-- cgit v1.2.3-freya From ed41d542bb8894f2eaca42cd7cc08246089e0490 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 30 Jun 2022 20:15:14 +0900 Subject: chore(client): tweak ui --- .../src/server/api/endpoints/federation/stats.ts | 5 +++-- packages/client/src/components/instance-stats.vue | 20 ++++++++++---------- packages/client/src/pages/admin/overview.pie.vue | 14 +++++++------- packages/client/src/pages/admin/overview.vue | 6 +++--- 4 files changed, 23 insertions(+), 22 deletions(-) (limited to 'packages/backend/src/server/api/endpoints/federation') diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index d3c2659088..cbe47dc7cb 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -15,6 +15,7 @@ export const meta = { export const paramDef = { type: 'object', properties: { + limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, }, required: [], } as const; @@ -29,7 +30,7 @@ export default define(meta, paramDef, async (ps) => { order: { followersCount: 'DESC', }, - take: 10, + take: ps.limit, }), Instances.find({ where: { @@ -38,7 +39,7 @@ export default define(meta, paramDef, async (ps) => { order: { followingCount: 'DESC', }, - take: 10, + take: ps.limit, }), Followings.count({ where: { diff --git a/packages/client/src/components/instance-stats.vue b/packages/client/src/components/instance-stats.vue index 9a1769a3a1..1646a7e93e 100644 --- a/packages/client/src/components/instance-stats.vue +++ b/packages/client/src/components/instance-stats.vue @@ -112,21 +112,21 @@ function createDoughnut(chartEl, tooltip, data) { labels: data.map(x => x.name), datasets: [{ backgroundColor: data.map(x => x.color), + borderWidth: 0, + spacing: 4, + hoverOffset: 4, data: data.map(x => x.value), }], }, options: { layout: { padding: { - left: 8, - right: 8, - top: 8, - bottom: 8, + left: 16, + right: 16, + top: 16, + bottom: 16, }, }, - interaction: { - intersect: false, - }, plugins: { legend: { display: false, @@ -145,9 +145,9 @@ function createDoughnut(chartEl, tooltip, data) { } onMounted(() => { - os.apiGet('federation/stats').then(fedStats => { - createDoughnut(subDoughnutEl, externalTooltipHandler1, fedStats.topSubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followersCount })).concat([{ name: '(other)', color: '#808080', value: fedStats.otherFollowersCount }])); - createDoughnut(pubDoughnutEl, externalTooltipHandler1, fedStats.topPubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followingCount })).concat([{ name: '(other)', color: '#808080', value: fedStats.otherFollowingCount }])); + os.apiGet('federation/stats', { limit: 15 }).then(fedStats => { + createDoughnut(subDoughnutEl, externalTooltipHandler1, fedStats.topSubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followersCount })).concat([{ name: '(other)', color: '#80808080', value: fedStats.otherFollowersCount }])); + createDoughnut(pubDoughnutEl, externalTooltipHandler1, fedStats.topPubInstances.map(x => ({ name: x.host, color: x.themeColor, value: x.followingCount })).concat([{ name: '(other)', color: '#80808080', value: fedStats.otherFollowingCount }])); }); }); diff --git a/packages/client/src/pages/admin/overview.pie.vue b/packages/client/src/pages/admin/overview.pie.vue index d14b3cc6db..41a5e53ae3 100644 --- a/packages/client/src/pages/admin/overview.pie.vue +++ b/packages/client/src/pages/admin/overview.pie.vue @@ -64,21 +64,21 @@ onMounted(() => { labels: props.data.map(x => x.name), datasets: [{ backgroundColor: props.data.map(x => x.color), + borderWidth: 0, + spacing: 4, + hoverOffset: 4, data: props.data.map(x => x.value), }], }, options: { layout: { padding: { - left: 8, - right: 8, - top: 8, - bottom: 8, + left: 16, + right: 16, + top: 16, + bottom: 16, }, }, - interaction: { - intersect: false, - }, plugins: { legend: { display: false, diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue index 6ccee8aea2..393ee66452 100644 --- a/packages/client/src/pages/admin/overview.vue +++ b/packages/client/src/pages/admin/overview.vue @@ -123,12 +123,12 @@
Sub
- +
Top 10
Pub
- +
Top 10
@@ -411,7 +411,7 @@ onMounted(async () => { federationSubActiveDiff = chart.subActive[0] - chart.subActive[1]; }); - os.apiGet('federation/stats').then(res => { + os.apiGet('federation/stats', { limit: 10 }).then(res => { fedStats = res; }); -- cgit v1.2.3-freya From 26c89e053d241a2dcb26cb6c48a2b6b1f4abb0d1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 3 Jul 2022 19:01:08 +0900 Subject: fix typo --- packages/backend/src/server/api/endpoints/federation/stats.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/backend/src/server/api/endpoints/federation') diff --git a/packages/backend/src/server/api/endpoints/federation/stats.ts b/packages/backend/src/server/api/endpoints/federation/stats.ts index cbe47dc7cb..e02c7b97e0 100644 --- a/packages/backend/src/server/api/endpoints/federation/stats.ts +++ b/packages/backend/src/server/api/endpoints/federation/stats.ts @@ -54,7 +54,7 @@ export default define(meta, paramDef, async (ps) => { ]); 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); + const gotPubCount = topPubInstances.map(x => x.followingCount).reduce((a, b) => a + b, 0); return await awaitAll({ topSubInstances: Instances.packMany(topSubInstances), -- cgit v1.2.3-freya