From fe1e60a28cae3ce8932c9aa57b15532ec0b76057 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Aug 2018 09:33:59 +0900 Subject: [PATCH] Fix #2334 --- src/server/api/endpoints/drive/stream.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts index 53f94a263..a9f3f7e9a 100644 --- a/src/server/api/endpoints/drive/stream.ts +++ b/src/server/api/endpoints/drive/stream.ts @@ -34,9 +34,12 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = const sort = { _id: -1 }; + const query = { - 'metadata.userId': user._id + 'metadata.userId': user._id, + 'metadata.deletedAt': { $exists: false } } as any; + if (sinceId) { sort._id = 1; query._id = { @@ -47,6 +50,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = $lt: untilId }; } + if (type) { query.contentType = new RegExp(`^${type.replace(/\*/g, '.+?')}$`); } @@ -59,6 +63,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = }); // Serialize - res(await Promise.all(files.map(async file => - await pack(file)))); + res(await Promise.all(files.map(file => pack(file)))); });