2 files changed, 19 insertions, 24 deletions
diff --git a/src/server/api/endpoints/admin/drive/files.ts b/src/server/api/endpoints/admin/drive/files.ts
index 8ed417a429..1ccabc92d9 100644
--- a/src/server/api/endpoints/admin/drive/files.ts
+++ b/src/server/api/endpoints/admin/drive/files.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import File, { packMany } from '../../../../../models/drive-file';
 import define from '../../../define';
 import { fallback } from '../../../../../prelude/symbol';
+import { DriveFiles } from '../../../../../models';
 
 export const meta = {
 	tags: ['admin'],
@@ -41,27 +41,25 @@ export const meta = {
 };
 
 const sort: any = { // < https://github.com/Microsoft/TypeScript/issues/1863
-	'+createdAt': { uploadDate: -1 },
-	'-createdAt': { uploadDate: 1 },
-	'+size': { length: -1 },
-	'-size': { length: 1 },
-	[fallback]: { _id: -1 }
+	'+createdAt': { createdAt: -1 },
+	'-createdAt': { createdAt: 1 },
+	'+size': { size: -1 },
+	'-size': { size: 1 },
+	[fallback]: { id: -1 }
 };
 
 export default define(meta, async (ps, me) => {
-	const q = {
-		'metadata.deletedAt': { $exists: false },
-	} as any;
+	const q = {} as any;
 
-	if (ps.origin == 'local') q['metadata._user.host'] = null;
-	if (ps.origin == 'remote') q['metadata._user.host'] = { $ne: null };
+	if (ps.origin == 'local') q['userHost'] = null;
+	if (ps.origin == 'remote') q['userHost'] = { $ne: null };
 
-	const files = await File
-		.find(q, {
-			limit: ps.limit,
-			sort: sort[ps.sort] || sort[fallback],
-			skip: ps.offset
-		});
+	const files = await DriveFiles.find({
+		where: q,
+		take: ps.limit,
+		order: sort[ps.sort] || sort[fallback],
+		skip: ps.offset
+	});
 
-	return await packMany(files, { detail: true, withUser: true, self: true });
+	return await DriveFiles.packMany(files, { detail: true, withUser: true, self: true });
 });
diff --git a/src/server/api/endpoints/admin/drive/show-file.ts b/src/server/api/endpoints/admin/drive/show-file.ts
index 405b6d44ce..a2b6c158f0 100644
--- a/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/src/server/api/endpoints/admin/drive/show-file.ts
@@ -1,8 +1,8 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
+import { ID } from '../../../../../misc/cafy-id';
 import define from '../../../define';
-import DriveFile from '../../../../../models/drive-file';
 import { ApiError } from '../../../error';
+import { DriveFiles } from '../../../../../models';
 
 export const meta = {
 	tags: ['admin'],
@@ -13,7 +13,6 @@ export const meta = {
 	params: {
 		fileId: {
 			validator: $.type(ID),
-			transform: transform,
 		},
 	},
 
@@ -27,9 +26,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
-	const file = await DriveFile.findOne({
-		_id: ps.fileId
-	});
+	const file = await DriveFiles.findOne(ps.fileId);
 
 	if (file == null) {
 		throw new ApiError(meta.errors.noSuchFile);