strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

2 files changed, 4 insertions, 3 deletions

diff --git a/src/tools/clean-remote-files.ts b/src/tools/clean-remote-files.ts
index f64affea97..e722552e14 100644
--- a/src/tools/clean-remote-files.ts
+++ b/src/tools/clean-remote-files.ts
@@ -3,6 +3,7 @@ import del from '../services/drive/delete-file';
 import { DriveFiles } from '../models';
 import { Not } from 'typeorm';
 import { DriveFile } from '../models/entities/drive-file';
+import { ensure } from '../prelude/ensure';
 
 const limit = promiseLimit(16);
 
@@ -17,7 +18,7 @@ DriveFiles.find({
 });
 
 async function job(file: DriveFile): Promise<any> {
-	file = await DriveFiles.findOne(file.id);
+	file = await DriveFiles.findOne(file.id).then(ensure);
 
 	await del(file, true);
 
diff --git a/src/tools/show-signin-history.ts b/src/tools/show-signin-history.ts
index 584bece6bb..9e6e849f5d 100644
--- a/src/tools/show-signin-history.ts
+++ b/src/tools/show-signin-history.ts
@@ -9,7 +9,7 @@ import { Users, Signins } from '../models';
 // node built/tools/show-signin-history username all
 //  with full request headers
 
-async function main(username: string, headers: string[]) {
+async function main(username: string, headers?: string[]) {
 	const user = await Users.findOne({
 		host: null,
 		usernameLower: username.toLowerCase(),
@@ -39,7 +39,7 @@ async function main(username: string, headers: string[]) {
 const args = process.argv.slice(2);
 
 let username = args[0];
-let headers: string[];
+let headers: string[] | undefined;
 
 if (args[1] != null) {
 	headers = args[1].split(/,/).map(header => header.toLowerCase());