summaryrefslogtreecommitdiff
path: root/src/server/api/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-02-22 14:02:56 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-02-22 14:02:56 +0900
commitbe3298639da3d5bebff000fb39a64174d43ba06c (patch)
tree73eab87ee64d5dd9f9a6b30442d97e8582c0bd27 /src/server/api/common
parentNew Crowdin translations (#4337) (diff)
downloadsharkey-be3298639da3d5bebff000fb39a64174d43ba06c.tar.gz
sharkey-be3298639da3d5bebff000fb39a64174d43ba06c.tar.bz2
sharkey-be3298639da3d5bebff000fb39a64174d43ba06c.zip
Refactor
Diffstat (limited to 'src/server/api/common')
-rw-r--r--src/server/api/common/getters.ts15
1 files changed, 11 insertions, 4 deletions
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.');
}