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

1 files changed, 91 insertions, 75 deletions

diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 01729de667..9879b1b68b 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -1,7 +1,10 @@
 import { Brackets } from 'typeorm';
-import { UserProfiles, Users } from '@/models/index.js';
-import { User } from '@/models/entities/user.js';
-import define from '../../define.js';
+import { Inject, Injectable } from '@nestjs/common';
+import { UsersRepository, UserProfilesRepository } from '@/models/index.js';
+import type { User } from '@/models/entities/User.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { DI } from '@/di-symbols.js';
 
 export const meta = {
 	tags: ['users'],
@@ -34,89 +37,102 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
-	const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
 
-	const isUsername = ps.query.startsWith('@');
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
 
-	let users: User[] = [];
+		private userEntityService: UserEntityService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
 
-	if (isUsername) {
-		const usernameQuery = Users.createQueryBuilder('user')
-			.where('user.usernameLower LIKE :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
-			.andWhere(new Brackets(qb => { qb
-				.where('user.updatedAt IS NULL')
-				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-			}))
-			.andWhere('user.isSuspended = FALSE');
+			const isUsername = ps.query.startsWith('@');
 
-		if (ps.origin === 'local') {
-			usernameQuery.andWhere('user.host IS NULL');
-		} else if (ps.origin === 'remote') {
-			usernameQuery.andWhere('user.host IS NOT NULL');
-		}
+			let users: User[] = [];
 
-		users = await usernameQuery
-			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-			.take(ps.limit)
-			.skip(ps.offset)
-			.getMany();
-	} else {
-		const nameQuery = Users.createQueryBuilder('user')
-			.where(new Brackets(qb => { 
-				qb.where('user.name ILIKE :query', { query: '%' + ps.query + '%' });
+			if (isUsername) {
+				const usernameQuery = this.usersRepository.createQueryBuilder('user')
+					.where('user.usernameLower LIKE :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+					.andWhere(new Brackets(qb => { qb
+						.where('user.updatedAt IS NULL')
+						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+					}))
+					.andWhere('user.isSuspended = FALSE');
 
-				// Also search username if it qualifies as username
-				if (Users.validateLocalUsername(ps.query)) {
-					qb.orWhere('user.usernameLower LIKE :username', { username: '%' + ps.query.toLowerCase() + '%' });
+				if (ps.origin === 'local') {
+					usernameQuery.andWhere('user.host IS NULL');
+				} else if (ps.origin === 'remote') {
+					usernameQuery.andWhere('user.host IS NOT NULL');
 				}
-			}))
-			.andWhere(new Brackets(qb => { qb
-				.where('user.updatedAt IS NULL')
-				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-			}))
-			.andWhere('user.isSuspended = FALSE');
 
-		if (ps.origin === 'local') {
-			nameQuery.andWhere('user.host IS NULL');
-		} else if (ps.origin === 'remote') {
-			nameQuery.andWhere('user.host IS NOT NULL');
-		}
+				users = await usernameQuery
+					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
+					.take(ps.limit)
+					.skip(ps.offset)
+					.getMany();
+			} else {
+				const nameQuery = this.usersRepository.createQueryBuilder('user')
+					.where(new Brackets(qb => { 
+						qb.where('user.name ILIKE :query', { query: '%' + ps.query + '%' });
 
-		users = await nameQuery
-			.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-			.take(ps.limit)
-			.skip(ps.offset)
-			.getMany();
+						// Also search username if it qualifies as username
+						if (this.userEntityService.validateLocalUsername(ps.query)) {
+							qb.orWhere('user.usernameLower LIKE :username', { username: '%' + ps.query.toLowerCase() + '%' });
+						}
+					}))
+					.andWhere(new Brackets(qb => { qb
+						.where('user.updatedAt IS NULL')
+						.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+					}))
+					.andWhere('user.isSuspended = FALSE');
 
-		if (users.length < ps.limit) {
-			const profQuery = UserProfiles.createQueryBuilder('prof')
-				.select('prof.userId')
-				.where('prof.description ILIKE :query', { query: '%' + ps.query + '%' });
+				if (ps.origin === 'local') {
+					nameQuery.andWhere('user.host IS NULL');
+				} else if (ps.origin === 'remote') {
+					nameQuery.andWhere('user.host IS NOT NULL');
+				}
 
-			if (ps.origin === 'local') {
-				profQuery.andWhere('prof.userHost IS NULL');
-			} else if (ps.origin === 'remote') {
-				profQuery.andWhere('prof.userHost IS NOT NULL');
-			}
+				users = await nameQuery
+					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
+					.take(ps.limit)
+					.skip(ps.offset)
+					.getMany();
 
-			const query = Users.createQueryBuilder('user')
-				.where(`user.id IN (${ profQuery.getQuery() })`)
-				.andWhere(new Brackets(qb => { qb
-					.where('user.updatedAt IS NULL')
-					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
-				}))
-				.andWhere('user.isSuspended = FALSE')
-				.setParameters(profQuery.getParameters());
+				if (users.length < ps.limit) {
+					const profQuery = this.userProfilesRepository.createQueryBuilder('prof')
+						.select('prof.userId')
+						.where('prof.description ILIKE :query', { query: '%' + ps.query + '%' });
 
-			users = users.concat(await query
-				.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-				.take(ps.limit)
-				.skip(ps.offset)
-				.getMany(),
-			);
-		}
-	}
+					if (ps.origin === 'local') {
+						profQuery.andWhere('prof.userHost IS NULL');
+					} else if (ps.origin === 'remote') {
+						profQuery.andWhere('prof.userHost IS NOT NULL');
+					}
+
+					const query = this.usersRepository.createQueryBuilder('user')
+						.where(`user.id IN (${ profQuery.getQuery() })`)
+						.andWhere(new Brackets(qb => { qb
+							.where('user.updatedAt IS NULL')
+							.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+						}))
+						.andWhere('user.isSuspended = FALSE')
+						.setParameters(profQuery.getParameters());
 
-	return await Users.packMany(users, me, { detail: ps.detail });
-});
+					users = users.concat(await query
+						.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
+						.take(ps.limit)
+						.skip(ps.offset)
+						.getMany(),
+					);
+				}
+			}
+
+			return await this.userEntityService.packMany(users, me, { detail: ps.detail });
+		});
+	}
+}