diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-10-31 22:35:02 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-10-31 22:35:02 +0900 |
| commit | 1a51b9870039da8b328acc673b2e8cb08ae2e663 (patch) | |
| tree | 71784c690f794cf0b3f37f3de56ce7316643da19 /src/server | |
| parent | Revert "Clean up" (diff) | |
| download | sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.gz sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.tar.bz2 sharkey-1a51b9870039da8b328acc673b2e8cb08ae2e663.zip | |
Refactor
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 7b8431f0ee..357b571293 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -4,9 +4,9 @@ import { publishMainStream } from '../../../../stream'; import DriveFile from '../../../../models/drive-file'; import acceptAllFollowRequests from '../../../../services/following/requests/accept-all'; import { IApp } from '../../../../models/app'; -import config from '../../../../config'; import { publishToFollowers } from '../../../../services/i/update'; import getParams from '../../get-params'; +import getDriveFileUrl from '../../../../misc/get-drive-file-url'; export const meta = { desc: { @@ -129,7 +129,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a if (avatar == null) return rej('avatar not found'); if (!avatar.contentType.startsWith('image/')) return rej('avatar not an image'); - updates.avatarUrl = avatar.metadata.thumbnailUrl || avatar.metadata.url || `${config.drive_url}/${avatar._id}`; + updates.avatarUrl = getDriveFileUrl(avatar, true); if (avatar.metadata.properties.avgColor) { updates.avatarColor = avatar.metadata.properties.avgColor; @@ -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 = banner.metadata.url || `${config.drive_url}/${banner._id}`; + updates.bannerUrl = getDriveFileUrl(banner, true); if (banner.metadata.properties.avgColor) { updates.bannerColor = banner.metadata.properties.avgColor; @@ -162,7 +162,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a if (wallpaper == null) return rej('wallpaper not found'); - updates.wallpaperUrl = wallpaper.metadata.url || `${config.drive_url}/${wallpaper._id}`; + updates.wallpaperUrl = getDriveFileUrl(wallpaper); if (wallpaper.metadata.properties.avgColor) { updates.wallpaperColor = wallpaper.metadata.properties.avgColor; |