profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #2335

Browse source
This commit is contained in:
syuilo 2018-08-19 04:01:10 +09:00
parent 78b560d89a
commit f3936a79aa
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/server/api/endpoints/i/update.ts
View file

@ -105,17 +105,22 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a
} }
} }
if (wallpaperId) { if (wallpaperId !== undefined) {
const wallpaper = await DriveFile.findOne({ if (wallpaperId === null) {
_id: wallpaperId 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) { if (wallpaper.metadata.properties.avgColor) {
updates.wallpaperColor = wallpaper.metadata.properties.avgColor; updates.wallpaperColor = wallpaper.metadata.properties.avgColor;
}
} }
} }