summaryrefslogtreecommitdiff
path: root/src/remote/activitypub/models
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-11-24 17:29:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-11-24 17:29:32 +0900
commit95ba7e43b1370a0233b03d63dd1b13247aba219c (patch)
treee8ad6ce650e01a25ebca1d39c18934ab5ef1fddc /src/remote/activitypub/models
parentFix lint (diff)
downloadmisskey-95ba7e43b1370a0233b03d63dd1b13247aba219c.tar.gz
misskey-95ba7e43b1370a0233b03d63dd1b13247aba219c.tar.bz2
misskey-95ba7e43b1370a0233b03d63dd1b13247aba219c.zip
Fix bug: リモートユーザーのアイコンとバナーの色が取得されていない問題を修正
Diffstat (limited to 'src/remote/activitypub/models')
-rw-r--r--src/remote/activitypub/models/person.ts10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index b2ca2eccae..6f694a6ec1 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -212,13 +212,17 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
const bannerId = banner ? banner._id : null;
const avatarUrl = getDriveFileUrl(avatar, true);
const bannerUrl = getDriveFileUrl(banner, false);
+ const avatarColor = avatar && avatar.metadata.properties.avgColor ? avatar.metadata.properties.avgColor : null;
+ const bannerColor = banner && avatar.metadata.properties.avgColor ? banner.metadata.properties.avgColor : null;
await User.update({ _id: user._id }, {
$set: {
avatarId,
bannerId,
avatarUrl,
- bannerUrl
+ bannerUrl,
+ avatarColor,
+ bannerColor
}
});
@@ -226,6 +230,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
user.bannerId = bannerId;
user.avatarUrl = avatarUrl;
user.bannerUrl = bannerUrl;
+ user.avatarColor = avatarColor;
+ user.bannerColor = bannerColor;
//#endregion
await updateFeatured(user._id).catch(err => console.log(err));
@@ -306,6 +312,8 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
bannerId: banner ? banner._id : null,
avatarUrl: getDriveFileUrl(avatar, true),
bannerUrl: getDriveFileUrl(banner, false),
+ avatarColor: avatar && avatar.metadata.properties.avgColor ? avatar.metadata.properties.avgColor : null,
+ bannerColor: banner && banner.metadata.properties.avgColor ? banner.metadata.properties.avgColor : null,
description: htmlToMFM(person.summary),
followersCount,
followingCount,