1 files changed, 85 insertions, 72 deletions
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 07e5c07c6a..e7f8cefff5 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -1,7 +1,9 @@
-import config from '@/config/index.js';
-import define from '../../define.js';
-import { Instances } from '@/models/index.js';
-import { fetchMeta } from '@/misc/fetch-meta.js';
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { InstancesRepository } from '@/models/index.js';
+import { InstanceEntityService } from '@/core/entities/InstanceEntityService.js';
+import { MetaService } from '@/core/MetaService.js';
+import { DI } from '@/di-symbols.js';
 
 export const meta = {
 	tags: ['federation'],
@@ -37,82 +39,93 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
-	const query = Instances.createQueryBuilder('instance');
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.instancesRepository)
+		private instancesRepository: InstancesRepository,
 
-	switch (ps.sort) {
-		case '+pubSub': query.orderBy('instance.followingCount', 'DESC').orderBy('instance.followersCount', 'DESC'); break;
-		case '-pubSub': query.orderBy('instance.followingCount', 'ASC').orderBy('instance.followersCount', 'ASC'); break;
-		case '+notes': query.orderBy('instance.notesCount', 'DESC'); break;
-		case '-notes': query.orderBy('instance.notesCount', 'ASC'); break;
-		case '+users': query.orderBy('instance.usersCount', 'DESC'); break;
-		case '-users': query.orderBy('instance.usersCount', 'ASC'); break;
-		case '+following': query.orderBy('instance.followingCount', 'DESC'); break;
-		case '-following': query.orderBy('instance.followingCount', 'ASC'); break;
-		case '+followers': query.orderBy('instance.followersCount', 'DESC'); break;
-		case '-followers': query.orderBy('instance.followersCount', 'ASC'); break;
-		case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break;
-		case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break;
-		case '+lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'DESC'); break;
-		case '-lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'ASC'); break;
+		private instanceEntityService: InstanceEntityService,
+		private metaService: MetaService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			const query = this.instancesRepository.createQueryBuilder('instance');
 
-		default: query.orderBy('instance.id', 'DESC'); break;
-	}
+			switch (ps.sort) {
+				case '+pubSub': query.orderBy('instance.followingCount', 'DESC').orderBy('instance.followersCount', 'DESC'); break;
+				case '-pubSub': query.orderBy('instance.followingCount', 'ASC').orderBy('instance.followersCount', 'ASC'); break;
+				case '+notes': query.orderBy('instance.notesCount', 'DESC'); break;
+				case '-notes': query.orderBy('instance.notesCount', 'ASC'); break;
+				case '+users': query.orderBy('instance.usersCount', 'DESC'); break;
+				case '-users': query.orderBy('instance.usersCount', 'ASC'); break;
+				case '+following': query.orderBy('instance.followingCount', 'DESC'); break;
+				case '-following': query.orderBy('instance.followingCount', 'ASC'); break;
+				case '+followers': query.orderBy('instance.followersCount', 'DESC'); break;
+				case '-followers': query.orderBy('instance.followersCount', 'ASC'); break;
+				case '+caughtAt': query.orderBy('instance.caughtAt', 'DESC'); break;
+				case '-caughtAt': query.orderBy('instance.caughtAt', 'ASC'); break;
+				case '+lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'DESC'); break;
+				case '-lastCommunicatedAt': query.orderBy('instance.lastCommunicatedAt', 'ASC'); break;
 
-	if (typeof ps.blocked === 'boolean') {
-		const meta = await fetchMeta(true);
-		if (ps.blocked) {
-			query.andWhere('instance.host IN (:...blocks)', { blocks: meta.blockedHosts });
-		} else {
-			query.andWhere('instance.host NOT IN (:...blocks)', { blocks: meta.blockedHosts });
-		}
-	}
+				default: query.orderBy('instance.id', 'DESC'); break;
+			}
 
-	if (typeof ps.notResponding === 'boolean') {
-		if (ps.notResponding) {
-			query.andWhere('instance.isNotResponding = TRUE');
-		} else {
-			query.andWhere('instance.isNotResponding = FALSE');
-		}
-	}
+			if (typeof ps.blocked === 'boolean') {
+				const meta = await this.metaService.fetch(true);
+				if (ps.blocked) {
+					query.andWhere('instance.host IN (:...blocks)', { blocks: meta.blockedHosts });
+				} else {
+					query.andWhere('instance.host NOT IN (:...blocks)', { blocks: meta.blockedHosts });
+				}
+			}
 
-	if (typeof ps.suspended === 'boolean') {
-		if (ps.suspended) {
-			query.andWhere('instance.isSuspended = TRUE');
-		} else {
-			query.andWhere('instance.isSuspended = FALSE');
-		}
-	}
+			if (typeof ps.notResponding === 'boolean') {
+				if (ps.notResponding) {
+					query.andWhere('instance.isNotResponding = TRUE');
+				} else {
+					query.andWhere('instance.isNotResponding = FALSE');
+				}
+			}
 
-	if (typeof ps.federating === 'boolean') {
-		if (ps.federating) {
-			query.andWhere('((instance.followingCount > 0) OR (instance.followersCount > 0))');
-		} else {
-			query.andWhere('((instance.followingCount = 0) AND (instance.followersCount = 0))');
-		}
-	}
+			if (typeof ps.suspended === 'boolean') {
+				if (ps.suspended) {
+					query.andWhere('instance.isSuspended = TRUE');
+				} else {
+					query.andWhere('instance.isSuspended = FALSE');
+				}
+			}
 
-	if (typeof ps.subscribing === 'boolean') {
-		if (ps.subscribing) {
-			query.andWhere('instance.followersCount > 0');
-		} else {
-			query.andWhere('instance.followersCount = 0');
-		}
-	}
+			if (typeof ps.federating === 'boolean') {
+				if (ps.federating) {
+					query.andWhere('((instance.followingCount > 0) OR (instance.followersCount > 0))');
+				} else {
+					query.andWhere('((instance.followingCount = 0) AND (instance.followersCount = 0))');
+				}
+			}
 
-	if (typeof ps.publishing === 'boolean') {
-		if (ps.publishing) {
-			query.andWhere('instance.followingCount > 0');
-		} else {
-			query.andWhere('instance.followingCount = 0');
-		}
-	}
+			if (typeof ps.subscribing === 'boolean') {
+				if (ps.subscribing) {
+					query.andWhere('instance.followersCount > 0');
+				} else {
+					query.andWhere('instance.followersCount = 0');
+				}
+			}
 
-	if (ps.host) {
-		query.andWhere('instance.host like :host', { host: '%' + ps.host.toLowerCase() + '%' });
-	}
+			if (typeof ps.publishing === 'boolean') {
+				if (ps.publishing) {
+					query.andWhere('instance.followingCount > 0');
+				} else {
+					query.andWhere('instance.followingCount = 0');
+				}
+			}
 
-	const instances = await query.take(ps.limit).skip(ps.offset).getMany();
+			if (ps.host) {
+				query.andWhere('instance.host like :host', { host: '%' + ps.host.toLowerCase() + '%' });
+			}
 
-	return await Instances.packMany(instances);
-});
+			const instances = await query.take(ps.limit).skip(ps.offset).getMany();
+
+			return await this.instanceEntityService.packMany(instances);
+		});
+	}
+}