From ce405fc4f6cc773e73ac83a651594d61f2ff9f71 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 28 Jul 2018 07:52:48 +0900
Subject: Fix #2007

---
 src/models/user.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/models')

diff --git a/src/models/user.ts b/src/models/user.ts
index 8681b5b0c3..fdbb245faa 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -50,6 +50,7 @@ type IUserBase = {
 	avatarUrl?: string;
 	bannerUrl?: string;
 	wallpaperId: mongo.ObjectID;
+	wallpaperUrl?: string;
 	data: any;
 	description: string;
 	pinnedNoteId: mongo.ObjectID;
@@ -400,20 +401,18 @@ export const pack = (
 	}
 
 	if (_user.avatarUrl == null) {
-		_user.avatarUrl = _user.avatarId != null
-			? `${config.drive_url}/${_user.avatarId}`
-			: `${config.drive_url}/default-avatar.jpg`;
-	}
+		_user.avatarUrl = `${config.drive_url}/default-avatar.jpg`;
 
-	if (_user.bannerUrl == null) {
-		_user.bannerUrl = _user.bannerId != null
-			? `${config.drive_url}/${_user.bannerId}`
-			: null;
+		// 互換性のため
+		if (_user.avatarId) {
+			_user.avatarUrl = `${config.drive_url}/${_user.avatarId}`;
+		}
 	}
 
-	_user.wallpaperUrl = _user.wallpaperId != null
-		? `${config.drive_url}/${_user.wallpaperId}`
-		: null;
+	// 互換性のため
+	if (_user.bannerId && _user.bannerUrl == null) {
+		_user.bannerUrl = `${config.drive_url}/${_user.bannerId}`;
+	}
 
 	if (!meId || !meId.equals(_user.id) || !opts.detail) {
 		delete _user.avatarId;
-- 
cgit v1.2.3-freya