Improve instances manegement

Resolve #4187

src/server/api/endpoints/admin/federation/update-instance.ts

@@ -14,6 +14,10 @@ export const meta = {
 		isBlocked: {
 			validator: $.bool
 		},
+
+		isClosed: {
+			validator: $.bool
+		},
 	}
 };
 
@@ -26,7 +30,8 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 
 	Instance.update({ host: ps.host }, {
 		$set: {
-			isBlocked: ps.isBlocked
+			isBlocked: ps.isBlocked,
+			isMarkedAsClosed: ps.isClosed
 		}
 	});
 

src/server/api/endpoints/federation/instances.ts

@@ -6,8 +6,16 @@ export const meta = {
 	requireCredential: false,
 
 	params: {
-		state: {
-			validator: $.str.optional,
+		blocked: {
+			validator: $.bool.optional.nullable,
+		},
+
+		notResponding: {
+			validator: $.bool.optional.nullable,
+		},
+
+		markedAsClosed: {
+			validator: $.bool.optional.nullable,
 		},
 
 		limit: {
@@ -70,6 +78,14 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			sort = {
 				caughtAt: 1
 			};
+		} else if (ps.sort == '+lastCommunicatedAt') {
+			sort = {
+				lastCommunicatedAt: -1
+			};
+		} else if (ps.sort == '-lastCommunicatedAt') {
+			sort = {
+				lastCommunicatedAt: 1
+			};
 		} else if (ps.sort == '+driveUsage') {
 			sort = {
 				driveUsage: -1
@@ -95,9 +111,9 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 
 	const q = {} as any;
 
-	if (ps.state === 'blocked') {
-		q.isBlocked = true;
-	}
+	if (typeof ps.blocked === 'boolean') q.isBlocked = ps.blocked;
+	if (typeof ps.notResponding === 'boolean') q.isNotResponding = ps.notResponding;
+	if (typeof ps.markedAsClosed === 'boolean') q.isMarkedAsClosed = ps.markedAsClosed;
 
 	const instances = await Instance
 		.find(q, {