summaryrefslogtreecommitdiff
path: root/src/api/endpoints/i
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-28 16:46:11 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-28 16:46:11 +0900
commit1acc30822d869fcd4edf70fd8a8dca72f21c8730 (patch)
tree1c452aa0bf777f1cce35b3f21535ee698d3d151e /src/api/endpoints/i
parentwip (diff)
downloadsharkey-1acc30822d869fcd4edf70fd8a8dca72f21c8730.tar.gz
sharkey-1acc30822d869fcd4edf70fd8a8dca72f21c8730.tar.bz2
sharkey-1acc30822d869fcd4edf70fd8a8dca72f21c8730.zip
wip
Diffstat (limited to 'src/api/endpoints/i')
-rw-r--r--src/api/endpoints/i/change_password.ts12
-rw-r--r--src/api/endpoints/i/notifications.ts22
-rw-r--r--src/api/endpoints/i/signin_history.ts16
-rw-r--r--src/api/endpoints/i/update.ts8
4 files changed, 29 insertions, 29 deletions
diff --git a/src/api/endpoints/i/change_password.ts b/src/api/endpoints/i/change_password.ts
index 88fb36b1fb..e3b0127e7d 100644
--- a/src/api/endpoints/i/change_password.ts
+++ b/src/api/endpoints/i/change_password.ts
@@ -13,13 +13,13 @@ import User from '../../models/user';
* @return {Promise<any>}
*/
module.exports = async (params, user) => new Promise(async (res, rej) => {
- // Get 'current_password' parameter
- const [currentPassword, currentPasswordErr] = $(params.current_password).string().$;
- if (currentPasswordErr) return rej('invalid current_password param');
+ // Get 'currentPasword' parameter
+ const [currentPassword, currentPasswordErr] = $(params.currentPasword).string().$;
+ if (currentPasswordErr) return rej('invalid currentPasword param');
- // Get 'new_password' parameter
- const [newPassword, newPasswordErr] = $(params.new_password).string().$;
- if (newPasswordErr) return rej('invalid new_password param');
+ // Get 'newPassword' parameter
+ const [newPassword, newPasswordErr] = $(params.newPassword).string().$;
+ if (newPasswordErr) return rej('invalid newPassword param');
// Compare password
const same = await bcrypt.compare(currentPassword, user.account.password);
diff --git a/src/api/endpoints/i/notifications.ts b/src/api/endpoints/i/notifications.ts
index e3447c17ec..7119bf6ea3 100644
--- a/src/api/endpoints/i/notifications.ts
+++ b/src/api/endpoints/i/notifications.ts
@@ -21,9 +21,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
$(params.following).optional.boolean().$;
if (followingError) return rej('invalid following param');
- // Get 'mark_as_read' parameter
- const [markAsRead = true, markAsReadErr] = $(params.mark_as_read).optional.boolean().$;
- if (markAsReadErr) return rej('invalid mark_as_read param');
+ // Get 'markAsRead' parameter
+ const [markAsRead = true, markAsReadErr] = $(params.markAsRead).optional.boolean().$;
+ if (markAsReadErr) return rej('invalid markAsRead param');
// Get 'type' parameter
const [type, typeErr] = $(params.type).optional.array('string').unique().$;
@@ -33,17 +33,17 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
if (limitErr) return rej('invalid limit param');
- // Get 'since_id' parameter
- const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
- if (sinceIdErr) return rej('invalid since_id param');
+ // Get 'sinceId' parameter
+ const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$;
+ if (sinceIdErr) return rej('invalid sinceId param');
- // Get 'until_id' parameter
- const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
- if (untilIdErr) return rej('invalid until_id param');
+ // Get 'untilId' parameter
+ const [untilId, untilIdErr] = $(params.untilId).optional.id().$;
+ if (untilIdErr) return rej('invalid untilId param');
- // Check if both of since_id and until_id is specified
+ // Check if both of sinceId and untilId is specified
if (sinceId && untilId) {
- return rej('cannot set since_id and until_id');
+ return rej('cannot set sinceId and untilId');
}
const mute = await Mute.find({
diff --git a/src/api/endpoints/i/signin_history.ts b/src/api/endpoints/i/signin_history.ts
index 5b794d0a4b..a4ba22790c 100644
--- a/src/api/endpoints/i/signin_history.ts
+++ b/src/api/endpoints/i/signin_history.ts
@@ -16,17 +16,17 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$;
if (limitErr) return rej('invalid limit param');
- // Get 'since_id' parameter
- const [sinceId, sinceIdErr] = $(params.since_id).optional.id().$;
- if (sinceIdErr) return rej('invalid since_id param');
+ // Get 'sinceId' parameter
+ const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$;
+ if (sinceIdErr) return rej('invalid sinceId param');
- // Get 'until_id' parameter
- const [untilId, untilIdErr] = $(params.until_id).optional.id().$;
- if (untilIdErr) return rej('invalid until_id param');
+ // Get 'untilId' parameter
+ const [untilId, untilIdErr] = $(params.untilId).optional.id().$;
+ if (untilIdErr) return rej('invalid untilId param');
- // Check if both of since_id and until_id is specified
+ // Check if both of sinceId and untilId is specified
if (sinceId && untilId) {
- return rej('cannot set since_id and until_id');
+ return rej('cannot set sinceId and untilId');
}
const query = {
diff --git a/src/api/endpoints/i/update.ts b/src/api/endpoints/i/update.ts
index 6645751871..45dfddcfe7 100644
--- a/src/api/endpoints/i/update.ts
+++ b/src/api/endpoints/i/update.ts
@@ -51,10 +51,10 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
if (isBotErr) return rej('invalid isBot param');
if (isBot != null) user.account.isBot = isBot;
- // Get 'auto_watch' parameter
- const [autoWatch, autoWatchErr] = $(params.auto_watch).optional.boolean().$;
- if (autoWatchErr) return rej('invalid auto_watch param');
- if (autoWatch != null) user.account.settings.auto_watch = autoWatch;
+ // Get 'autoWatch' parameter
+ const [autoWatch, autoWatchErr] = $(params.autoWatch).optional.boolean().$;
+ if (autoWatchErr) return rej('invalid autoWatch param');
+ if (autoWatch != null) user.account.settings.autoWatch = autoWatch;
await User.update(user._id, {
$set: {