Merge remote-tracking branch 'misskey-dev/master' into develop

This commit is contained in:
2022-02-12 17:39:23 +09:00
15 changed files with 81 additions and 17 deletions

View File

@ -1,6 +1,6 @@
import define from '../define';
import { NoteReactions, Notes, Users } from '@/models/index';
import { federationChart, driveChart } from '@/services/chart/index';
import { Instances, NoteReactions, Notes, Users } from '@/models/index';
import { } from '@/services/chart/index';
export const meta = {
requireCredential: false,
@ -63,7 +63,7 @@ export default define(meta, async () => {
Users.count({ where: { host: null }, cache: 3600000 }),
NoteReactions.count({ cache: 3600000 }), // 1 hour
//NoteReactions.count({ where: { userHost: null }, cache: 3600000 }),
federationChart.getChart('hour', 1, null).then(chart => chart.instance.total[0]),
Instances.count({ cache: 3600000 }),
]);
return {