なんかもうめっちゃ変えた

1 files changed, 49 insertions, 36 deletions

diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index 3a8211374b..3d05ec2e1d 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -1,7 +1,9 @@
-import { Users } from '@/models/index.js';
-import define from '../define.js';
-import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query.js';
-import { generateBlockQueryForUsers } from '../common/generate-block-query.js';
+import { Inject, Injectable } from '@nestjs/common';
+import { UsersRepository } from '@/models/index.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { QueryService } from '@/core/QueryService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { DI } from '@/di-symbols.js';
 
 export const meta = {
 	tags: ['users'],
@@ -38,43 +40,54 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
-	const query = Users.createQueryBuilder('user');
-	query.where('user.isExplorable = TRUE');
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
 
-	switch (ps.state) {
-		case 'admin': query.andWhere('user.isAdmin = TRUE'); break;
-		case 'moderator': query.andWhere('user.isModerator = TRUE'); break;
-		case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR user.isModerator = TRUE'); break;
-		case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
-	}
+		private userEntityService: UserEntityService,
+		private queryService: QueryService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const query = this.usersRepository.createQueryBuilder('user');
+			query.where('user.isExplorable = TRUE');
 
-	switch (ps.origin) {
-		case 'local': query.andWhere('user.host IS NULL'); break;
-		case 'remote': query.andWhere('user.host IS NOT NULL'); break;
-	}
+			switch (ps.state) {
+				case 'admin': query.andWhere('user.isAdmin = TRUE'); break;
+				case 'moderator': query.andWhere('user.isModerator = TRUE'); break;
+				case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR user.isModerator = TRUE'); break;
+				case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break;
+			}
 
-	if (ps.hostname) {
-		query.andWhere('user.host = :hostname', { hostname: ps.hostname.toLowerCase() });
-	}
+			switch (ps.origin) {
+				case 'local': query.andWhere('user.host IS NULL'); break;
+				case 'remote': query.andWhere('user.host IS NOT NULL'); break;
+			}
 
-	switch (ps.sort) {
-		case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
-		case '-follower': query.orderBy('user.followersCount', 'ASC'); break;
-		case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break;
-		case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break;
-		case '+updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'DESC'); break;
-		case '-updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'ASC'); break;
-		default: query.orderBy('user.id', 'ASC'); break;
-	}
+			if (ps.hostname) {
+				query.andWhere('user.host = :hostname', { hostname: ps.hostname.toLowerCase() });
+			}
+
+			switch (ps.sort) {
+				case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
+				case '-follower': query.orderBy('user.followersCount', 'ASC'); break;
+				case '+createdAt': query.orderBy('user.createdAt', 'DESC'); break;
+				case '-createdAt': query.orderBy('user.createdAt', 'ASC'); break;
+				case '+updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'DESC'); break;
+				case '-updatedAt': query.andWhere('user.updatedAt IS NOT NULL').orderBy('user.updatedAt', 'ASC'); break;
+				default: query.orderBy('user.id', 'ASC'); break;
+			}
 
-	if (me) generateMutedUserQueryForUsers(query, me);
-	if (me) generateBlockQueryForUsers(query, me);
+			if (me) this.queryService.generateMutedUserQueryForUsers(query, me);
+			if (me) this.queryService.generateBlockQueryForUsers(query, me);
 
-	query.take(ps.limit);
-	query.skip(ps.offset);
+			query.take(ps.limit);
+			query.skip(ps.offset);
 
-	const users = await query.getMany();
+			const users = await query.getMany();
 
-	return await Users.packMany(users, me, { detail: true });
-});
+			return await this.userEntityService.packMany(users, me, { detail: true });
+		});
+	}
+}