strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

src/server/api/endpoints/i/2fa/done.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import * as speakeasy from 'speakeasy';
 import define from '../../../define';
 import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -18,7 +19,7 @@ export const meta = {
 export default define(meta, async (ps, user) => {
 	const token = ps.token.replace(/\s/g, '');
 
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	if (profile.twoFactorTempSecret == null) {
 		throw new Error('二段階認証の設定が開始されていません');

src/server/api/endpoints/i/2fa/register.ts

@@ -5,6 +5,7 @@ import * as QRCode from 'qrcode';
 import config from '../../../../../config';
 import define from '../../../define';
 import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -19,10 +20,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/2fa/unregister.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../../define';
 import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -16,10 +17,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/authorized-apps.ts

@@ -31,7 +31,7 @@ export default define(meta, async (ps, user) => {
 		where: {
 			userId: user.id
 		},
-		take: ps.limit,
+		take: ps.limit!,
 		skip: ps.offset,
 		order: {
 			id: ps.sort == 'asc' ? 1 : -1

src/server/api/endpoints/i/change-password.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../define';
 import { UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -20,10 +21,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.currentPassword, profile.password);
+	const same = await bcrypt.compare(ps.currentPassword, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/delete-account.ts

@@ -2,6 +2,7 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import define from '../../define';
 import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -16,10 +17,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/favorites.ts

@@ -38,7 +38,7 @@ export default define(meta, async (ps, user) => {
 		.leftJoinAndSelect('favorite.note', 'note');
 
 	const favorites = await query
-		.take(ps.limit)
+		.take(ps.limit!)
 		.getMany();
 
 	return await NoteFavorites.packMany(favorites, user);

src/server/api/endpoints/i/notifications.ts

@@ -81,13 +81,13 @@ export default define(meta, async (ps, user) => {
 		query.setParameters(followingQuery.getParameters());
 	}
 
-	if (ps.includeTypes.length > 0) {
+	if (ps.includeTypes!.length > 0) {
 		query.andWhere(`notification.type IN (:...includeTypes)`, { includeTypes: ps.includeTypes });
-	} else if (ps.excludeTypes.length > 0) {
+	} else if (ps.excludeTypes!.length > 0) {
 		query.andWhere(`notification.type NOT IN (:...excludeTypes)`, { excludeTypes: ps.excludeTypes });
 	}
 
-	const notifications = await query.take(ps.limit).getMany();
+	const notifications = await query.take(ps.limit!).getMany();
 
 	// Mark all as read
 	if (notifications.length > 0 && ps.markAsRead) {

src/server/api/endpoints/i/regenerate-token.ts

@@ -4,6 +4,7 @@ import { publishMainStream } from '../../../../services/stream';
 import generateUserToken from '../../common/generate-native-user-token';
 import define from '../../define';
 import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -18,10 +19,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/signin-history.ts

@@ -29,7 +29,7 @@ export default define(meta, async (ps, user) => {
 	const query = makePaginationQuery(Signins.createQueryBuilder('signin'), ps.sinceId, ps.untilId)
 		.andWhere(`signin.userId = :meId`, { meId: user.id });
 
-	const history = await query.take(ps.limit).getMany();
+	const history = await query.take(ps.limit!).getMany();
 
 	return await Promise.all(history.map(record => Signins.pack(record)));
 });

src/server/api/endpoints/i/update-email.ts

@@ -9,6 +9,7 @@ import * as ms from 'ms';
 import * as bcrypt from 'bcryptjs';
 import { apiLogger } from '../../logger';
 import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -32,10 +33,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(ps.password, profile.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');

src/server/api/endpoints/i/update.ts

@@ -206,13 +206,13 @@ export default define(meta, async (ps, user, app) => {
 
 	if (updates.name != null) {
 		const tokens = parsePlain(updates.name);
-		emojis = emojis.concat(extractEmojis(tokens));
+		emojis = emojis.concat(extractEmojis(tokens!));
 	}
 
 	if (profile.description != null) {
 		const tokens = parse(profile.description);
-		emojis = emojis.concat(extractEmojis(tokens));
-		tags = extractHashtags(tokens).map(tag => tag.toLowerCase());
+		emojis = emojis.concat(extractEmojis(tokens!));
+		tags = extractHashtags(tokens!).map(tag => tag.toLowerCase());
 	}
 
 	updates.emojis = emojis;