Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

WIP(ApNoteService.ts): non-null assertion

Browse source 
non-nullアサーションを減らすために事前に存在確認をするようにした。
エラーをスローするようにしたのでメッセージを考えなければならない。
This commit is contained in:
okayurisotto 2023-07-02 19:05:23 +09:00
parent b1ecaecf40
commit 71ca66e24e
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -257,7 +257,7 @@ export class ApPersonService implements OnModuleInit {
} }
// Create user // Create user
let user: RemoteUser; let user: RemoteUser | null = null;
try { try {
// Start transaction // Start transaction
await this.db.transaction(async transactionalEntityManager => { await this.db.transaction(async transactionalEntityManager => {
@ -323,6 +323,8 @@ export class ApPersonService implements OnModuleInit {
} }
} }
if (user == null) throw new Error(''); // TODO
// Register host // Register host
this.federatedInstanceService.fetch(host).then(async i => { this.federatedInstanceService.fetch(host).then(async i => {
this.instancesRepository.increment({ id: i.id }, 'usersCount', 1); this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
@ -332,10 +334,10 @@ export class ApPersonService implements OnModuleInit {
} }
}); });
this.usersChart.update(user!, true); this.usersChart.update(user, true);
// ハッシュタグ更新 // ハッシュタグ更新
this.hashtagService.updateUsertags(user!, tags); this.hashtagService.updateUsertags(user, tags);
//#region アバターとヘッダー画像をフェッチ //#region アバターとヘッダー画像をフェッチ
const [avatar, banner] = await Promise.all([ const [avatar, banner] = await Promise.all([
@ -354,7 +356,7 @@ export class ApPersonService implements OnModuleInit {
const avatarBlurhash = avatar ? avatar.blurhash : null; const avatarBlurhash = avatar ? avatar.blurhash : null;
const bannerBlurhash = banner ? banner.blurhash : null; const bannerBlurhash = banner ? banner.blurhash : null;
await this.usersRepository.update(user!.id, { await this.usersRepository.update(user.id, {
avatarId, avatarId,
bannerId, bannerId,
avatarUrl, avatarUrl,
@ -363,12 +365,12 @@ export class ApPersonService implements OnModuleInit {
bannerBlurhash, bannerBlurhash,
}); });
user!.avatarId = avatarId; user.avatarId = avatarId;
user!.bannerId = bannerId; user.bannerId = bannerId;
user!.avatarUrl = avatarUrl; user.avatarUrl = avatarUrl;
user!.bannerUrl = bannerUrl; user.bannerUrl = bannerUrl;
user!.avatarBlurhash = avatarBlurhash; user.avatarBlurhash = avatarBlurhash;
user!.bannerBlurhash = bannerBlurhash; user.bannerBlurhash = bannerBlurhash;
//#endregion //#endregion
//#region カスタム絵文字取得 //#region カスタム絵文字取得
@ -379,14 +381,12 @@ export class ApPersonService implements OnModuleInit {
const emojiNames = emojis.map(emoji => emoji.name); const emojiNames = emojis.map(emoji => emoji.name);
await this.usersRepository.update(user!.id, { await this.usersRepository.update(user.id, { emojis: emojiNames });
emojis: emojiNames,
});
//#endregion //#endregion
await this.updateFeatured(user!.id, resolver).catch(err => this.logger.error(err)); await this.updateFeatured(user.id, resolver).catch(err => this.logger.error(err));
return user!; return user;
} }
/** /**