strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

6 files changed, 12 insertions, 12 deletions

diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts
index 400b73d3b7..4e4db6c780 100644
--- a/src/server/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
@@ -66,7 +66,7 @@ export default define(meta, async (ps, user) => {
 		}
 	}
 
-	const files = await query.take(ps.limit).getMany();
+	const files = await query.take(ps.limit!).getMany();
 
 	return await DriveFiles.packMany(files, { detail: false, self: true });
 });
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index 5702c70fc0..340a39a41c 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -92,6 +92,6 @@ export default define(meta, async (ps, user, app, file, cleanup) => {
 		apiLogger.error(e);
 		throw new ApiError();
 	} finally {
-		cleanup();
+		cleanup!();
 	}
 });
diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index b516ec2df6..e8c0e683c9 100644
--- a/src/server/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
@@ -63,7 +63,7 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	let file: DriveFile;
+	let file: DriveFile | undefined;
 
 	if (ps.fileId) {
 		file = await DriveFiles.findOne(ps.fileId);
@@ -81,14 +81,14 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.fileIdOrUrlRequired);
 	}
 
-	if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
-		throw new ApiError(meta.errors.accessDenied);
-	}
-
 	if (file == null) {
 		throw new ApiError(meta.errors.noSuchFile);
 	}
 
+	if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
+		throw new ApiError(meta.errors.accessDenied);
+	}
+
 	return await DriveFiles.pack(file, {
 		detail: true,
 		self: true
diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index f5c3816407..08ae2ff709 100644
--- a/src/server/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
@@ -54,7 +54,7 @@ export default define(meta, async (ps, user) => {
 		query.andWhere('folder.parentId IS NULL');
 	}
 
-	const folders = await query.take(ps.limit).getMany();
+	const folders = await query.take(ps.limit!).getMany();
 
 	return await Promise.all(folders.map(folder => DriveFolders.pack(folder)));
 });
diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index 90129bed63..7d3ece00a3 100644
--- a/src/server/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
@@ -102,10 +102,10 @@ export default define(meta, async (ps, user) => {
 					id: folderId
 				});
 
-				if (folder2.id === folder.id) {
+				if (folder2!.id === folder!.id) {
 					return true;
-				} else if (folder2.parentId) {
-					return await checkCircle(folder2.parentId);
+				} else if (folder2!.parentId) {
+					return await checkCircle(folder2!.parentId);
 				} else {
 					return false;
 				}
diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts
index 9a84627767..96d9f82421 100644
--- a/src/server/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
@@ -50,7 +50,7 @@ export default define(meta, async (ps, user) => {
 		}
 	}
 
-	const files = await query.take(ps.limit).getMany();
+	const files = await query.take(ps.limit!).getMany();
 
 	return await DriveFiles.packMany(files, { detail: false, self: true });
 });