Refactor

2 files changed, 8 insertions, 22 deletions

diff --git a/src/server/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts
index 166900e62f..45e2080648 100644
--- a/src/server/api/endpoints/mute/create.ts
+++ b/src/server/api/endpoints/mute/create.ts
@@ -4,6 +4,7 @@ import User from '../../../../models/user';
 import Mute from '../../../../models/mute';
 import define from '../../define';
 import { ApiError } from '../../error';
+import { getUser } from '../../common/getters';
 
 export const meta = {
 	desc: {
@@ -56,19 +57,11 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await User.findOne({
-		_id: ps.userId
-	}, {
-		fields: {
-			data: false,
-			profile: false
-		}
+	const mutee = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
 	});
 
-	if (mutee === null) {
-		throw new ApiError(meta.errors.noSuchUser);
-	}
-
 	// Check if already muting
 	const exist = await Mute.findOne({
 		muterId: muter._id,
diff --git a/src/server/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts
index 1d74c45ef1..d9f7025d53 100644
--- a/src/server/api/endpoints/mute/delete.ts
+++ b/src/server/api/endpoints/mute/delete.ts
@@ -4,6 +4,7 @@ import User from '../../../../models/user';
 import Mute from '../../../../models/mute';
 import define from '../../define';
 import { ApiError } from '../../error';
+import { getUser } from '../../common/getters';
 
 export const meta = {
 	desc: {
@@ -56,19 +57,11 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Get mutee
-	const mutee = await User.findOne({
-		_id: ps.userId
-	}, {
-		fields: {
-			data: false,
-			profile: false
-		}
+	const mutee = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
 	});
 
-	if (mutee === null) {
-		throw new ApiError(meta.errors.noSuchUser);
-	}
-
 	// Check not muting
 	const exist = await Mute.findOne({
 		muterId: muter._id,