From ebceffba1eb3d762fe164a10ee58fc78547a0a27 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 15 Dec 2018 00:09:04 +0900 Subject: Resolve #2165 --- src/server/api/endpoints/admin/drive/files.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/server/api/endpoints/admin') diff --git a/src/server/api/endpoints/admin/drive/files.ts b/src/server/api/endpoints/admin/drive/files.ts index 2e54270a0f..6fc83f8191 100644 --- a/src/server/api/endpoints/admin/drive/files.ts +++ b/src/server/api/endpoints/admin/drive/files.ts @@ -63,10 +63,12 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { }; } - const q = - ps.origin == 'local' ? { host: null } : - ps.origin == 'remote' ? { host: { $ne: null } } : - {}; + const q = { + 'metadata.deletedAt': { $exists: false }, + } as any; + + if (ps.origin == 'local') q['metadata._user.host'] = null; + if (ps.origin == 'remote') q['metadata._user.host'] = { $ne: null }; const files = await File .find(q, { -- cgit v1.2.3-freya