From be3298639da3d5bebff000fb39a64174d43ba06c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 22 Feb 2019 14:02:56 +0900
Subject: Refactor

---
 src/server/api/common/getters.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/server/api/common')

diff --git a/src/server/api/common/getters.ts b/src/server/api/common/getters.ts
index f74f6130cb..1947c95ab6 100644
--- a/src/server/api/common/getters.ts
+++ b/src/server/api/common/getters.ts
@@ -4,9 +4,9 @@ import User, { isRemoteUser, isLocalUser } from '../../../models/user';
 import { IdentifiableError } from '../../../misc/identifiable-error';
 
 /**
- * Get valied note for API processing
+ * Get note for API processing
  */
-export async function getValiedNote(noteId: mongo.ObjectID) {
+export async function getNote(noteId: mongo.ObjectID) {
 	const note = await Note.findOne({
 		_id: noteId,
 		deletedAt: { $exists: false }
@@ -24,10 +24,17 @@ export async function getValiedNote(noteId: mongo.ObjectID) {
  */
 export async function getUser(userId: mongo.ObjectID) {
 	const user = await User.findOne({
-		_id: userId
+		_id: userId,
+		isDeleted: false
+	}, {
+		fields: {
+			data: false,
+			profile: false,
+			clientSettings: false
+		}
 	});
 
-	if (user == null) {
+	if (user === null) {
 		throw new IdentifiableError('15348ddd-432d-49c2-8a5a-8069753becff', 'No such user.');
 	}
 
-- 
cgit v1.2.3-freya