2 files changed, 9 insertions, 21 deletions
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index 9b27d4cac1..6eb950d418 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -6,6 +6,7 @@ import { pack } from '../../../../models/messaging-message';
 import read from '../../common/read-messaging-message';
 import define from '../../define';
 import { ApiError } from '../../error';
+import { getUser } from '../../common/getters';
 
 export const meta = {
 	desc: {
@@ -59,17 +60,10 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Fetch recipient
-	const recipient = await User.findOne({
-		_id: ps.userId
-	}, {
-			fields: {
-				_id: true
-			}
-		});
-
-	if (recipient === null) {
-		throw new ApiError(meta.errors.noSuchUser);
-	}
+	const recipient = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
+	});
 
 	const query = {
 		$or: [{
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index 3885d2583c..7ff6526295 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -11,6 +11,7 @@ import { publishMessagingStream, publishMessagingIndexStream } from '../../../..
 import pushSw from '../../../../../services/push-notification';
 import define from '../../../define';
 import { ApiError } from '../../../error';
+import { getUser } from '../../../common/getters';
 
 export const meta = {
 	desc: {
@@ -76,18 +77,11 @@ export default define(meta, async (ps, user) => {
 	}
 
 	// Fetch recipient
-	const recipient = await User.findOne({
-		_id: ps.userId
-	}, {
-		fields: {
-			_id: true
-		}
+	const recipient = await getUser(ps.userId).catch(e => {
+		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+		throw e;
 	});
 
-	if (recipient === null) {
-		throw new ApiError(meta.errors.noSuchUser);
-	}
-
 	let file = null;
 	if (ps.fileId != null) {
 		file = await DriveFile.findOne({