strictNullChecks (#4666)
* wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip
This commit is contained in:
parent
4ee40c3345
commit
987168b863
214 changed files with 939 additions and 785 deletions
|
|
@ -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 });
|
||||
});
|
||||
|
|
|
|||
|
|
@ -92,6 +92,6 @@ export default define(meta, async (ps, user, app, file, cleanup) => {
|
|||
apiLogger.error(e);
|
||||
throw new ApiError();
|
||||
} finally {
|
||||
cleanup();
|
||||
cleanup!();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 });
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue