yume/yumechi-no-kuni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request 'restore activeHalfYear and activeMonth' (#10) from develop into master
All checks were successful
Lint / pnpm_install (push) Successful in 1m47s
Details
Publish Docker image / Build (push) Successful in 4m54s
Details
Test (production install and build) / production (20.16.0) (push) Successful in 1m11s
Details
Test (backend) / unit (20.16.0) (push) Successful in 7m17s
Details
Lint / lint (backend) (push) Successful in 2m23s
Details
Lint / lint (frontend) (push) Successful in 2m22s
Details
Lint / lint (frontend-embed) (push) Successful in 2m16s
Details
Lint / lint (frontend-shared) (push) Successful in 2m22s
Details
Test (backend) / e2e (20.16.0) (push) Successful in 10m49s
Details
Lint / lint (misskey-bubble-game) (push) Successful in 2m26s
Details
Lint / lint (misskey-js) (push) Successful in 2m19s
Details
Lint / lint (misskey-reversi) (push) Successful in 2m21s
Details
Lint / lint (sw) (push) Successful in 2m37s
Details
Lint / typecheck (misskey-js) (push) Successful in 1m28s
Details
Lint / typecheck (backend) (push) Successful in 2m13s
Details
Lint / typecheck (sw) (push) Successful in 1m26s
Details

Browse source 
Reviewed-on: #10
This commit is contained in:
ゆめ 2024-11-10 03:34:35 -06:00
commit 24b6849ad1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/src/server/NodeinfoServerService.ts
View file

@ -15,6 +15,8 @@ import NotesChart from '@/core/chart/charts/notes.js';
import UsersChart from '@/core/chart/charts/users.js'; import UsersChart from '@/core/chart/charts/users.js';
import { DEFAULT_POLICIES } from '@/core/RoleService.js'; import { DEFAULT_POLICIES } from '@/core/RoleService.js';
import type { FastifyInstance, FastifyPluginOptions } from 'fastify'; import type { FastifyInstance, FastifyPluginOptions } from 'fastify';
import { IsNull, MoreThan } from 'typeorm';
import type { UsersRepository } from '@/models/_.js';
const nodeinfo2_1path = '/nodeinfo/2.1'; const nodeinfo2_1path = '/nodeinfo/2.1';
const nodeinfo2_0path = '/nodeinfo/2.0'; const nodeinfo2_0path = '/nodeinfo/2.0';
@ -25,6 +27,8 @@ export class NodeinfoServerService {
constructor( constructor(
@Inject(DI.config) @Inject(DI.config)
private config: Config, private config: Config,
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private userEntityService: UserEntityService, private userEntityService: UserEntityService,
private metaService: MetaService, private metaService: MetaService,
@ -58,18 +62,14 @@ export class NodeinfoServerService {
const [ const [
meta, meta,
//activeHalfyear, activeHalfyear,
//activeMonth, activeMonth,
] = await Promise.all([ ] = await Promise.all([
this.metaService.fetch(true), 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 - 15552000000)) } }), this.usersRepository.count({ where: { host: IsNull(), lastActiveDate: MoreThan(new Date(now - 2592000000)) } }),
//this.usersRepository.count({ where: { host: IsNull(), lastActiveDate: MoreThan(new Date(now - 2592000000)) } }),
]); ]);
const activeHalfyear = null;
const activeMonth = null;
const proxyAccount = meta.proxyAccountId ? await this.userEntityService.pack(meta.proxyAccountId).catch(() => null) : null; const proxyAccount = meta.proxyAccountId ? await this.userEntityService.pack(meta.proxyAccountId).catch(() => null) : null;
const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies }; const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies };