strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
This commit is contained in:
syuilo 2019-04-13 01:43:22 +09:00 committed by GitHub
parent 4ee40c3345
commit 987168b863
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
214 changed files with 939 additions and 785 deletions

View file

@ -14,6 +14,7 @@ import { instanceChart, perUserFollowingChart } from '../chart';
import { genId } from '../../misc/gen-id';
import { createNotification } from '../create-notification';
import { isDuplicateKeyValueError } from '../../misc/is-duplicate-key-value-error';
import { ensure } from '../../prelude/ensure';
const logger = new Logger('following/create');
@ -115,7 +116,7 @@ export default async function(follower: User, followee: User, requestId?: string
if (blocked != null) throw new IdentifiableError('3338392a-f764-498d-8855-db939dcf8c48', 'blocked');
}
const followeeProfile = await UserProfiles.findOne({ userId: followee.id });
const followeeProfile = await UserProfiles.findOne(followee.id).then(ensure);
// フォロー対象が鍵アカウントである or
// フォロワーがBotであり、フォロー対象がBotからのフォローに慎重である or

View file

@ -1,6 +1,7 @@
import accept from './accept';
import { User } from '../../../models/entities/user';
import { FollowRequests, Users } from '../../../models';
import { ensure } from '../../../prelude/ensure';
/**
*
@ -12,7 +13,7 @@ export default async function(user: User) {
});
for (const request of requests) {
const follower = await Users.findOne(request.followerId);
const follower = await Users.findOne(request.followerId).then(ensure);
accept(user, follower);
}
}

View file

@ -16,7 +16,7 @@ export default async function(followee: User, follower: User) {
await insertFollowingDoc(followee, follower);
if (Users.isRemoteUser(follower) && request) {
const content = renderActivity(renderAccept(renderFollow(follower, followee, request.requestId), followee as ILocalUser));
const content = renderActivity(renderAccept(renderFollow(follower, followee, request.requestId!), followee as ILocalUser));
deliver(followee as ILocalUser, content, follower.inbox);
}

View file

@ -13,7 +13,7 @@ export default async function(followee: User, follower: User) {
followerId: follower.id
});
const content = renderActivity(renderReject(renderFollow(follower, followee, request.requestId), followee as ILocalUser));
const content = renderActivity(renderReject(renderFollow(follower, followee, request!.requestId!), followee as ILocalUser));
deliver(followee as ILocalUser, content, follower.inbox);
}