diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-05-26 12:35:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 12:35:14 +0900 |
| commit | bc9487822529b260fbdc9a8dcca35c3da25db04e (patch) | |
| tree | d5fd0dffb95e03b95df8e98692305d75f855e645 /src/server/api/endpoints/i | |
| parent | New translations ja.yml (Portuguese) (diff) | |
| parent | Merge pull request #1649 from l2dy/i18n (diff) | |
| download | misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.tar.gz misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.tar.bz2 misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.zip | |
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/notifications.ts | 3 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index 50ed9b27e8..ba9c47508c 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -96,8 +96,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => { }); // Serialize - res(await Promise.all(notifications.map(async notification => - await pack(notification)))); + res(await Promise.all(notifications.map(notification => pack(notification)))); // Mark as read all if (notifications.length > 0 && markAsRead) { diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index b7b25d0f65..6e0c5b8515 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -47,6 +47,11 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => { if (isBotErr) return rej('invalid isBot param'); if (isBot != null) user.isBot = isBot; + // Get 'isCat' parameter + const [isCat, isCatErr] = $.bool.optional().get(params.isCat); + if (isCatErr) return rej('invalid isCat param'); + if (isCat != null) user.isCat = isCat; + // Get 'autoWatch' parameter const [autoWatch, autoWatchErr] = $.bool.optional().get(params.autoWatch); if (autoWatchErr) return rej('invalid autoWatch param'); @@ -82,6 +87,7 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => { bannerColor: user.bannerColor, profile: user.profile, isBot: user.isBot, + isCat: user.isCat, settings: user.settings } }); |