natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update update.ts (#4357) 

* Update update.ts

* Update update.ts

* Update update.ts

* Update update.ts
This commit is contained in:
Acid Chicken (硫酸鶏) 2019-02-24 03:32:30 +09:00 committed by syuilo
parent 4ad7632113
commit e13fe97ebb
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/api/endpoints/i/update.ts
View File

@ -159,7 +159,7 @@ export const meta = {
message: 'The file specified as a banner is not an image.', message: 'The file specified as a banner is not an image.',
code: 'BANNER_NOT_AN_IMAGE', code: 'BANNER_NOT_AN_IMAGE',
id: '75aedb19-2afd-4e6d-87fc-67941256fa60' id: '75aedb19-2afd-4e6d-87fc-67941256fa60'
}, }
} }
}; };
@ -192,12 +192,16 @@ export default define(meta, async (ps, user, app) => {
if (avatar == null) throw new ApiError(meta.errors.noSuchAvatar); if (avatar == null) throw new ApiError(meta.errors.noSuchAvatar);
if (!avatar.contentType.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage); if (!avatar.contentType.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage);
if (avatar.metadata.deletedAt) {
updates.avatarUrl = null;
} else {
updates.avatarUrl = getDriveFileUrl(avatar, true); updates.avatarUrl = getDriveFileUrl(avatar, true);
if (avatar.metadata.properties.avgColor) { if (avatar.metadata.properties.avgColor) {
updates.avatarColor = avatar.metadata.properties.avgColor; updates.avatarColor = avatar.metadata.properties.avgColor;
} }
} }
}
if (ps.bannerId) { if (ps.bannerId) {
const banner = await DriveFile.findOne({ const banner = await DriveFile.findOne({
@ -207,12 +211,16 @@ export default define(meta, async (ps, user, app) => {
if (banner == null) throw new ApiError(meta.errors.noSuchBanner); if (banner == null) throw new ApiError(meta.errors.noSuchBanner);
if (!banner.contentType.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage); if (!banner.contentType.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage);
if (banner.metadata.deletedAt) {
updates.bannerUrl = null;
} else {
updates.bannerUrl = getDriveFileUrl(banner, false); updates.bannerUrl = getDriveFileUrl(banner, false);
if (banner.metadata.properties.avgColor) { if (banner.metadata.properties.avgColor) {
updates.bannerColor = banner.metadata.properties.avgColor; updates.bannerColor = banner.metadata.properties.avgColor;
} }
} }
}
if (ps.wallpaperId !== undefined) { if (ps.wallpaperId !== undefined) {
if (ps.wallpaperId === null) { if (ps.wallpaperId === null) {
@ -225,6 +233,9 @@ export default define(meta, async (ps, user, app) => {
if (wallpaper == null) throw new Error('wallpaper not found'); if (wallpaper == null) throw new Error('wallpaper not found');
if (wallpaper.metadata.deletedAt) {
updates.wallpaperUrl = null;
} else {
updates.wallpaperUrl = getDriveFileUrl(wallpaper); updates.wallpaperUrl = getDriveFileUrl(wallpaper);
if (wallpaper.metadata.properties.avgColor) { if (wallpaper.metadata.properties.avgColor) {
@ -232,6 +243,7 @@ export default define(meta, async (ps, user, app) => {
} }
} }
} }
}
//#region emojis/tags //#region emojis/tags
if (updates.name != null || updates.description != null) { if (updates.name != null || updates.description != null) {