add localComments count
Some checks failed
Lint / pnpm_install (pull_request) Successful in 1m53s
Publish Docker image / Build (pull_request) Successful in 5m5s
Test (production install and build) / production (20.16.0) (pull_request) Successful in 1m9s
Test (backend) / unit (20.16.0) (pull_request) Successful in 7m47s
Lint / pnpm_install (push) Successful in 1m15s
Publish Docker image / Build (push) Successful in 4m45s
Test (backend) / e2e (20.16.0) (pull_request) Failing after 10m58s
Test (production install and build) / production (20.16.0) (push) Successful in 1m12s
Lint / lint (backend) (pull_request) Successful in 2m12s
Test (backend) / unit (20.16.0) (push) Successful in 7m24s
Lint / lint (frontend) (pull_request) Successful in 2m17s
Lint / lint (frontend-embed) (pull_request) Successful in 2m21s
Lint / lint (frontend-shared) (pull_request) Successful in 2m26s
Test (backend) / e2e (20.16.0) (push) Successful in 10m51s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m43s
Lint / lint (misskey-js) (pull_request) Successful in 2m24s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m28s
Lint / lint (sw) (pull_request) Successful in 2m29s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m29s
Lint / typecheck (backend) (pull_request) Successful in 2m19s
Lint / typecheck (sw) (pull_request) Successful in 1m34s
Lint / lint (backend) (push) Successful in 2m41s
Lint / lint (frontend) (push) Successful in 2m37s
Lint / lint (frontend-embed) (push) Successful in 2m24s
Lint / lint (frontend-shared) (push) Successful in 2m29s
Lint / lint (misskey-js) (push) Successful in 2m26s
Lint / lint (misskey-bubble-game) (push) Successful in 2m54s
Lint / lint (misskey-reversi) (push) Successful in 2m17s
Lint / typecheck (backend) (push) Successful in 2m13s
Lint / lint (sw) (push) Successful in 2m41s
Lint / typecheck (misskey-js) (push) Successful in 1m28s
Lint / typecheck (sw) (push) Successful in 1m32s

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
This commit is contained in:
ゆめ 2024-11-10 14:41:40 -06:00
parent 24b6849ad1
commit 7a106a390d
No known key found for this signature in database

View file

@ -15,8 +15,8 @@ import NotesChart from '@/core/chart/charts/notes.js';
import UsersChart from '@/core/chart/charts/users.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js';
import type { FastifyInstance, FastifyPluginOptions } from 'fastify';
import { IsNull, MoreThan } from 'typeorm';
import type { UsersRepository } from '@/models/_.js';
import { IsNull, MoreThan, Not } from 'typeorm';
import type { NotesRepository, UsersRepository } from '@/models/_.js';
const nodeinfo2_1path = '/nodeinfo/2.1';
const nodeinfo2_0path = '/nodeinfo/2.0';
@ -29,6 +29,8 @@ export class NodeinfoServerService {
private config: Config,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
@Inject(DI.notesRepository)
private notesRepository: NotesRepository,
private userEntityService: UserEntityService,
private metaService: MetaService,
@ -64,10 +66,12 @@ export class NodeinfoServerService {
meta,
activeHalfyear,
activeMonth,
localComments,
] = await Promise.all([
this.metaService.fetch(true),
this.usersRepository.count({ where: { host: IsNull(), lastActiveDate: MoreThan(new Date(now - 15552000000)) } }),
this.usersRepository.count({ where: { host: IsNull(), lastActiveDate: MoreThan(new Date(now - 2592000000)) } }),
this.notesRepository.count({ where: { userHost: IsNull(), replyId: Not(IsNull()) } }),
]);
const proxyAccount = meta.proxyAccountId ? await this.userEntityService.pack(meta.proxyAccountId).catch(() => null) : null;
@ -91,7 +95,7 @@ export class NodeinfoServerService {
usage: {
users: { total, activeHalfyear, activeMonth },
localPosts,
localComments: 0,
localComments,
},
metadata: {
nodeName: meta.name,