summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-19 04:01:10 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-19 04:01:10 +0900
commitf3936a79aa0f6b247f50866c3ac88daf21594962 (patch)
tree710422a5438cd4245379274b943327a579e94970 /src/server
parent#2324 (diff)
downloadsharkey-f3936a79aa0f6b247f50866c3ac88daf21594962.tar.gz
sharkey-f3936a79aa0f6b247f50866c3ac88daf21594962.tar.bz2
sharkey-f3936a79aa0f6b247f50866c3ac88daf21594962.zip
Fix #2335
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/i/update.ts21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index aa801b1b04..922b396797 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -105,17 +105,22 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a
}
}
- if (wallpaperId) {
- const wallpaper = await DriveFile.findOne({
- _id: wallpaperId
- });
+ if (wallpaperId !== undefined) {
+ if (wallpaperId === null) {
+ updates.wallpaperUrl = null;
+ updates.wallpaperColor = null;
+ } else {
+ const wallpaper = await DriveFile.findOne({
+ _id: wallpaperId
+ });
- if (wallpaper == null) return rej('wallpaper not found');
+ if (wallpaper == null) return rej('wallpaper not found');
- updates.wallpaperUrl = wallpaper.metadata.url || `${config.drive_url}/${wallpaper._id}`;
+ updates.wallpaperUrl = wallpaper.metadata.url || `${config.drive_url}/${wallpaper._id}`;
- if (wallpaper.metadata.properties.avgColor) {
- updates.wallpaperColor = wallpaper.metadata.properties.avgColor;
+ if (wallpaper.metadata.properties.avgColor) {
+ updates.wallpaperColor = wallpaper.metadata.properties.avgColor;
+ }
}
}