From 5d61c7c6918914c7a0a8185be3f84407d0dbeac1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 1 Nov 2018 09:30:51 +0900
Subject: [PATCH] Refactor and use original image for banner

---
 src/remote/activitypub/models/person.ts | 6 +++---
 src/server/api/endpoints/i/update.ts    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 7842e8788..d78bc15c9 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -210,8 +210,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IU
 
 	const avatarId = avatar ? avatar._id : null;
 	const bannerId = banner ? banner._id : null;
-	const avatarUrl = (avatar && avatar.metadata.thumbnailUrl) ? avatar.metadata.thumbnailUrl : (avatar && avatar.metadata.url) ? avatar.metadata.url : null;
-	const bannerUrl = (banner && banner.metadata.url) ? banner.metadata.url : null;
+	const avatarUrl = getDriveFileUrl(avatar, true);
+	const bannerUrl = getDriveFileUrl(banner, false);
 
 	await User.update({ _id: user._id }, {
 		$set: {
@@ -305,7 +305,7 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: obje
 			avatarId: avatar ? avatar._id : null,
 			bannerId: banner ? banner._id : null,
 			avatarUrl: getDriveFileUrl(avatar, true),
-			bannerUrl: getDriveFileUrl(banner, true),
+			bannerUrl: getDriveFileUrl(banner, false),
 			description: htmlToMFM(person.summary),
 			followersCount,
 			followingCount,
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 357b57129..04f132c55 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -144,7 +144,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a
 		if (banner == null) return rej('banner not found');
 		if (!banner.contentType.startsWith('image/')) return rej('banner not an image');
 
-		updates.bannerUrl = getDriveFileUrl(banner, true);
+		updates.bannerUrl = getDriveFileUrl(banner, false);
 
 		if (banner.metadata.properties.avgColor) {
 			updates.bannerColor = banner.metadata.properties.avgColor;