WIP(ApPersonService.ts): 可読性の低い三項演算子を削除しつつnon-null assertionを回避

エラーメッセージを考える必要がある。

packages/backend/src/core/activitypub/models/ApPersonService.ts

@@ -341,14 +341,11 @@ export class ApPersonService implements OnModuleInit {
 		this.hashtagService.updateUsertags(user, tags);
 
 		//#region アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
-			person.icon,
+			if (img == null) return null;
-			person.image,
+			if (user == null) throw new Error(''); // TODO
-		].map(img =>
+			return this.apImageService.resolveImage(user, img).catch(() => null);
-			img == null
+		}));
-				? Promise.resolve(null)
-				: this.apImageService.resolveImage(user!, img).catch(() => null),
-		));
 
 		const avatarId = avatar ? avatar.id : null;
 		const bannerId = banner ? banner.id : null;
@@ -427,14 +424,10 @@ export class ApPersonService implements OnModuleInit {
 		this.logger.info(`Updating the Person: ${person.id}`);
 
 		// アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
-			person.icon,
+			if (img == null) return null;
-			person.image,
+			return this.apImageService.resolveImage(exist, img).catch(() => null);
-		].map(img =>
+		}));	
-			img == null
-				? Promise.resolve(null)
-				: this.apImageService.resolveImage(exist, img).catch(() => null),
-		));
 
 		// カスタム絵文字取得
 		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], exist.host).catch(e => {