2 files changed, 11 insertions, 21 deletions
diff --git a/src/server/api/endpoints/admin/federation/remove-all-following.ts b/src/server/api/endpoints/admin/federation/remove-all-following.ts
index 98afdfc2a5..25aae6db88 100644
--- a/src/server/api/endpoints/admin/federation/remove-all-following.ts
+++ b/src/server/api/endpoints/admin/federation/remove-all-following.ts
@@ -1,8 +1,8 @@
 import $ from 'cafy';
 import define from '../../../define';
-import Following from '../../../../../models/following';
-import User from '../../../../../models/user';
 import deleteFollowing from '../../../../../services/following/delete';
+import { Followings, Users } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	tags: ['admin'],
@@ -18,18 +18,16 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const followings = await Following.find({
-		'_follower.host': ps.host
+	const followings = await Followings.find({
+		followerHost: ps.host
 	});
 
 	const pairs = await Promise.all(followings.map(f => Promise.all([
-		User.findOne({ _id: f.followerId }),
-		User.findOne({ _id: f.followeeId })
+		Users.findOne(f.followerId).then(ensure),
+		Users.findOne(f.followeeId).then(ensure)
 	])));
 
 	for (const pair of pairs) {
 		deleteFollowing(pair[0], pair[1]);
 	}
-
-	return;
 });
diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts
index 0d127b53b3..90ab7a3ec5 100644
--- a/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -1,6 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
-import Instance from '../../../../../models/instance';
+import { Instances } from '../../../../../models';
+import { toPuny } from '../../../../../misc/convert-host';
 
 export const meta = {
 	tags: ['admin'],
@@ -13,10 +14,6 @@ export const meta = {
 			validator: $.str
 		},
 
-		isBlocked: {
-			validator: $.bool
-		},
-
 		isClosed: {
 			validator: $.bool
 		},
@@ -24,18 +21,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const instance = await Instance.findOne({ host: ps.host });
+	const instance = await Instances.findOne({ host: toPuny(ps.host) });
 
 	if (instance == null) {
 		throw new Error('instance not found');
 	}
 
-	Instance.update({ host: ps.host }, {
-		$set: {
-			isBlocked: ps.isBlocked,
-			isMarkedAsClosed: ps.isClosed
-		}
+	Instances.update({ host: toPuny(ps.host) }, {
+		isMarkedAsClosed: ps.isClosed
 	});
-
-	return;
 });