e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

fix: NodeInfo のユーザー数と投稿数の内容を見直す (#8255)

Browse source 
* NodeInfoのアクティブユーザーの取得方法を変更する

* NodeInfoの投稿数の出力内容を見直す
This commit is contained in:
xianon 2022-02-06 04:29:36 +09:00 committed by GitHub
parent be15c8f437
commit 08d0a45ee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/server/nodeinfo.ts
View file

@ -2,7 +2,7 @@ import * as Router from '@koa/router';
import config from '@/config/index'; import config from '@/config/index';
import { fetchMeta } from '@/misc/fetch-meta'; import { fetchMeta } from '@/misc/fetch-meta';
import { Users, Notes } from '@/models/index'; import { Users, Notes } from '@/models/index';
import { Not, IsNull, MoreThan } from 'typeorm'; import { MoreThan } from 'typeorm';
const router = new Router(); const router = new Router();
@ -25,14 +25,12 @@ const nodeinfo2 = async () => {
activeHalfyear, activeHalfyear,
activeMonth, activeMonth,
localPosts, localPosts,
localComments,
] = await Promise.all([ ] = await Promise.all([
fetchMeta(true), fetchMeta(true),
Users.count({ where: { host: null } }), Users.count({ where: { host: null } }),
Users.count({ where: { host: null, updatedAt: MoreThan(new Date(now - 15552000000)) } }), Users.count({ where: { host: null, lastActiveDate: MoreThan(new Date(now - 15552000000)) } }),
Users.count({ where: { host: null, updatedAt: MoreThan(new Date(now - 2592000000)) } }), Users.count({ where: { host: null, lastActiveDate: MoreThan(new Date(now - 2592000000)) } }),
Notes.count({ where: { userHost: null, replyId: null } }), Notes.count({ where: { userHost: null } }),
Notes.count({ where: { userHost: null, replyId: Not(IsNull()) } }),
]); ]);
const proxyAccount = meta.proxyAccountId ? await Users.pack(meta.proxyAccountId).catch(() => null) : null; const proxyAccount = meta.proxyAccountId ? await Users.pack(meta.proxyAccountId).catch(() => null) : null;
@ -52,7 +50,7 @@ const nodeinfo2 = async () => {
usage: { usage: {
users: { total, activeHalfyear, activeMonth }, users: { total, activeHalfyear, activeMonth },
localPosts, localPosts,
localComments, localComments: 0,
}, },
metadata: { metadata: {
nodeName: meta.name, nodeName: meta.name,