diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-07-28 07:52:48 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-07-28 07:52:48 +0900 |
| commit | ce405fc4f6cc773e73ac83a651594d61f2ff9f71 (patch) | |
| tree | ffd9480d5e421250639b5528846cb51c6ab0b693 /src/models | |
| parent | Fix #2000 (diff) | |
| download | sharkey-ce405fc4f6cc773e73ac83a651594d61f2ff9f71.tar.gz sharkey-ce405fc4f6cc773e73ac83a651594d61f2ff9f71.tar.bz2 sharkey-ce405fc4f6cc773e73ac83a651594d61f2ff9f71.zip | |
Fix #2007
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/user.ts | 21 |
1 files changed, 10 insertions, 11 deletions
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; |