From 3c1b92baa1ac15c23fe63e2f50739105252ca516 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 4 Mar 2017 04:28:38 +0900 Subject: [PATCH] Follow linter --- src/api/endpoints/aggregation/posts/like.ts | 12 +- src/api/endpoints/aggregation/posts/likes.ts | 6 +- src/api/endpoints/aggregation/posts/reply.ts | 12 +- src/api/endpoints/aggregation/posts/repost.ts | 12 +- .../endpoints/aggregation/users/followers.ts | 6 +- .../endpoints/aggregation/users/following.ts | 6 +- src/api/endpoints/aggregation/users/like.ts | 12 +- src/api/endpoints/aggregation/users/post.ts | 12 +- src/api/endpoints/app/create.ts | 6 +- src/api/endpoints/app/name_id/available.ts | 6 +- src/api/endpoints/app/show.ts | 6 +- src/api/endpoints/auth/accept.ts | 6 +- src/api/endpoints/auth/session/generate.ts | 6 +- src/api/endpoints/auth/session/show.ts | 6 +- src/api/endpoints/auth/session/userkey.ts | 115 ++++++++------- src/api/endpoints/drive.ts | 47 +++---- src/api/endpoints/drive/files.ts | 6 +- src/api/endpoints/drive/files/create.ts | 8 +- src/api/endpoints/drive/files/find.ts | 6 +- src/api/endpoints/drive/files/show.ts | 6 +- src/api/endpoints/drive/files/update.ts | 6 +- .../endpoints/drive/files/upload_from_url.ts | 6 +- src/api/endpoints/drive/folders.ts | 6 +- src/api/endpoints/drive/folders/create.ts | 6 +- src/api/endpoints/drive/folders/find.ts | 6 +- src/api/endpoints/drive/folders/show.ts | 6 +- src/api/endpoints/drive/folders/update.ts | 6 +- src/api/endpoints/drive/stream.ts | 6 +- src/api/endpoints/following/create.ts | 6 +- src/api/endpoints/following/delete.ts | 6 +- src/api/endpoints/i.ts | 6 +- src/api/endpoints/i/appdata/get.ts | 6 +- src/api/endpoints/i/appdata/set.ts | 6 +- src/api/endpoints/i/authorized_apps.ts | 6 +- src/api/endpoints/i/favorites.ts | 6 +- src/api/endpoints/i/notifications.ts | 6 +- src/api/endpoints/i/signin_history.ts | 6 +- src/api/endpoints/i/update.ts | 6 +- src/api/endpoints/messaging/history.ts | 6 +- src/api/endpoints/messaging/messages.ts | 6 +- .../endpoints/messaging/messages/create.ts | 6 +- src/api/endpoints/messaging/unread.ts | 6 +- src/api/endpoints/meta.ts | 17 +-- src/api/endpoints/my/apps.ts | 6 +- .../endpoints/notifications/mark_as_read.ts | 57 ++++---- src/api/endpoints/posts.ts | 101 +++++++------- src/api/endpoints/posts/context.ts | 6 +- src/api/endpoints/posts/create.ts | 6 +- src/api/endpoints/posts/favorites/create.ts | 67 +++++---- src/api/endpoints/posts/favorites/delete.ts | 63 ++++----- src/api/endpoints/posts/likes.ts | 6 +- src/api/endpoints/posts/likes/create.ts | 131 +++++++++--------- src/api/endpoints/posts/likes/delete.ts | 115 ++++++++------- src/api/endpoints/posts/mentions.ts | 6 +- src/api/endpoints/posts/polls/vote.ts | 121 ++++++++-------- src/api/endpoints/posts/replies.ts | 6 +- src/api/endpoints/posts/reposts.ts | 6 +- src/api/endpoints/posts/search.ts | 6 +- src/api/endpoints/posts/show.ts | 6 +- src/api/endpoints/posts/timeline.ts | 6 +- src/api/endpoints/username/available.ts | 6 +- src/api/endpoints/users.ts | 79 +++++------ src/api/endpoints/users/followers.ts | 6 +- src/api/endpoints/users/following.ts | 6 +- src/api/endpoints/users/posts.ts | 6 +- src/api/endpoints/users/recommendation.ts | 6 +- src/api/endpoints/users/search.ts | 6 +- src/api/endpoints/users/search_by_username.ts | 6 +- src/api/endpoints/users/show.ts | 6 +- src/api/models/messaging-message.ts | 1 - 70 files changed, 514 insertions(+), 780 deletions(-) diff --git a/src/api/endpoints/aggregation/posts/like.ts b/src/api/endpoints/aggregation/posts/like.ts index 38ed7e6e1..7eaf0335c 100644 --- a/src/api/endpoints/aggregation/posts/like.ts +++ b/src/api/endpoints/aggregation/posts/like.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Like from '../../../models/like'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id).expect.id().required().qed(); if (postIdErr) return rej('invalid post_id param'); @@ -63,7 +59,7 @@ module.exports = (params) => )[0]; if (data) { - graph.push(data) + graph.push(data); } else { graph.push({ date: { @@ -72,8 +68,8 @@ module.exports = (params) => day: day.getDate() }, count: 0 - }) - }; + }); + } } res(graph); diff --git a/src/api/endpoints/aggregation/posts/likes.ts b/src/api/endpoints/aggregation/posts/likes.ts index 55fe077f6..c39de7d0c 100644 --- a/src/api/endpoints/aggregation/posts/likes.ts +++ b/src/api/endpoints/aggregation/posts/likes.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Like from '../../../models/like'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id).expect.id().required().qed(); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/aggregation/posts/reply.ts b/src/api/endpoints/aggregation/posts/reply.ts index 1f936bbc2..541bc594d 100644 --- a/src/api/endpoints/aggregation/posts/reply.ts +++ b/src/api/endpoints/aggregation/posts/reply.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -12,9 +10,7 @@ import Post from '../../../models/post'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id).expect.id().required().qed(); if (postIdErr) return rej('invalid post_id param'); @@ -62,7 +58,7 @@ module.exports = (params) => )[0]; if (data) { - graph.push(data) + graph.push(data); } else { graph.push({ date: { @@ -71,8 +67,8 @@ module.exports = (params) => day: day.getDate() }, count: 0 - }) - }; + }); + } } res(graph); diff --git a/src/api/endpoints/aggregation/posts/repost.ts b/src/api/endpoints/aggregation/posts/repost.ts index e4a1bf7c7..823a6ed9e 100644 --- a/src/api/endpoints/aggregation/posts/repost.ts +++ b/src/api/endpoints/aggregation/posts/repost.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -12,9 +10,7 @@ import Post from '../../../models/post'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id).expect.id().required().qed(); if (postIdErr) return rej('invalid post_id param'); @@ -62,7 +58,7 @@ module.exports = (params) => )[0]; if (data) { - graph.push(data) + graph.push(data); } else { graph.push({ date: { @@ -71,8 +67,8 @@ module.exports = (params) => day: day.getDate() }, count: 0 - }) - }; + }); + } } res(graph); diff --git a/src/api/endpoints/aggregation/users/followers.ts b/src/api/endpoints/aggregation/users/followers.ts index 9336a102f..cc217643c 100644 --- a/src/api/endpoints/aggregation/users/followers.ts +++ b/src/api/endpoints/aggregation/users/followers.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Following from '../../../models/following'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id).expect.id().required().qed(); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/aggregation/users/following.ts b/src/api/endpoints/aggregation/users/following.ts index d46822915..75e0c7469 100644 --- a/src/api/endpoints/aggregation/users/following.ts +++ b/src/api/endpoints/aggregation/users/following.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Following from '../../../models/following'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id).expect.id().required().qed(); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/aggregation/users/like.ts b/src/api/endpoints/aggregation/users/like.ts index 4a932354a..a1a3b5cd9 100644 --- a/src/api/endpoints/aggregation/users/like.ts +++ b/src/api/endpoints/aggregation/users/like.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Like from '../../../models/like'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id).expect.id().required().qed(); if (userIdErr) return rej('invalid user_id param'); @@ -67,7 +63,7 @@ module.exports = (params) => )[0]; if (data) { - graph.push(data) + graph.push(data); } else { graph.push({ date: { @@ -76,8 +72,8 @@ module.exports = (params) => day: day.getDate() }, count: 0 - }) - }; + }); + } } res(graph); diff --git a/src/api/endpoints/aggregation/users/post.ts b/src/api/endpoints/aggregation/users/post.ts index b62dd6ec9..a4d9e2ddf 100644 --- a/src/api/endpoints/aggregation/users/post.ts +++ b/src/api/endpoints/aggregation/users/post.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import Post from '../../../models/post'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id).expect.id().required().qed(); if (userIdErr) return rej('invalid user_id param'); @@ -95,7 +91,7 @@ module.exports = (params) => )[0]; if (data) { - graph.push(data) + graph.push(data); } else { graph.push({ date: { @@ -106,8 +102,8 @@ module.exports = (params) => posts: 0, reposts: 0, replies: 0 - }) - }; + }); + } } res(graph); diff --git a/src/api/endpoints/app/create.ts b/src/api/endpoints/app/create.ts index adbb205f6..a357280aa 100644 --- a/src/api/endpoints/app/create.ts +++ b/src/api/endpoints/app/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -69,9 +67,7 @@ import serialize from '../../serializers/app'; * @param {any} user * @return {Promise} */ -module.exports = async (params, user) => - new Promise(async (res, rej) => -{ +module.exports = async (params, user) => new Promise(async (res, rej) => { // Get 'name_id' parameter const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).qed(); if (nameIdErr) return rej('invalid name_id param'); diff --git a/src/api/endpoints/app/name_id/available.ts b/src/api/endpoints/app/name_id/available.ts index 6af18ae83..64171fc73 100644 --- a/src/api/endpoints/app/name_id/available.ts +++ b/src/api/endpoints/app/name_id/available.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -42,9 +40,7 @@ import { isValidNameId } from '../../../models/app'; * @param {any} params * @return {Promise} */ -module.exports = async (params) => - new Promise(async (res, rej) => -{ +module.exports = async (params) => new Promise(async (res, rej) => { // Get 'name_id' parameter const [nameId, nameIdErr] = it(params.name_id).expect.string().required().validate(isValidNameId).qed(); if (nameIdErr) return rej('invalid name_id param'); diff --git a/src/api/endpoints/app/show.ts b/src/api/endpoints/app/show.ts index 6b6e4f010..e0ff02cf4 100644 --- a/src/api/endpoints/app/show.ts +++ b/src/api/endpoints/app/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -46,9 +44,7 @@ import serialize from '../../serializers/app'; * @param {any} isSecure * @return {Promise} */ -module.exports = (params, user, _, isSecure) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => { // Get 'app_id' parameter const [appId, appIdErr] = it(params.app_id, 'id'); if (appIdErr) return rej('invalid app_id param'); diff --git a/src/api/endpoints/auth/accept.ts b/src/api/endpoints/auth/accept.ts index 2c104ef1c..7fc4a8a87 100644 --- a/src/api/endpoints/auth/accept.ts +++ b/src/api/endpoints/auth/accept.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -40,9 +38,7 @@ import AccessToken from '../../models/access-token'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'token' parameter const [token, tokenErr] = it(params.token).expect.string().required().qed(); if (tokenErr) return rej('invalid token param'); diff --git a/src/api/endpoints/auth/session/generate.ts b/src/api/endpoints/auth/session/generate.ts index 6e730123c..ceb3079ae 100644 --- a/src/api/endpoints/auth/session/generate.ts +++ b/src/api/endpoints/auth/session/generate.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -46,9 +44,7 @@ import config from '../../../../conf'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => -{ +module.exports = (params) => new Promise(async (res, rej) => { // Get 'app_secret' parameter const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); if (appSecretErr) return rej('invalid app_secret param'); diff --git a/src/api/endpoints/auth/session/show.ts b/src/api/endpoints/auth/session/show.ts index 55641929d..77f8c5dc9 100644 --- a/src/api/endpoints/auth/session/show.ts +++ b/src/api/endpoints/auth/session/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -54,9 +52,7 @@ import serialize from '../../../serializers/auth-session'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'token' parameter const [token, tokenErr] = it(params.token).expect.string().required().qed(); if (tokenErr) return rej('invalid token param'); diff --git a/src/api/endpoints/auth/session/userkey.ts b/src/api/endpoints/auth/session/userkey.ts index fdb8c26d4..121c9ce26 100644 --- a/src/api/endpoints/auth/session/userkey.ts +++ b/src/api/endpoints/auth/session/userkey.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -51,62 +49,61 @@ import serialize from '../../../serializers/user'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => { - // Get 'app_secret' parameter - const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); - if (appSecretErr) return rej('invalid app_secret param'); +module.exports = (params) => new Promise(async (res, rej) => { + // Get 'app_secret' parameter + const [appSecret, appSecretErr] = it(params.app_secret).expect.string().required().qed(); + if (appSecretErr) return rej('invalid app_secret param'); - // Lookup app - const app = await App.findOne({ - secret: appSecret - }); - - if (app == null) { - return rej('app not found'); - } - - // Get 'token' parameter - const [token, tokenErr] = it(params.token).expect.string().required().qed(); - if (tokenErr) return rej('invalid token param'); - - // Fetch token - const session = await AuthSess - .findOne({ - token: token, - app_id: app._id - }); - - if (session === null) { - return rej('session not found'); - } - - if (session.user_id == null) { - return rej('this session is not allowed yet'); - } - - // Lookup access token - const accessToken = await AccessToken.findOne({ - app_id: app._id, - user_id: session.user_id - }); - - // Delete session - - /* https://github.com/Automattic/monk/issues/178 - AuthSess.deleteOne({ - _id: session._id - }); - */ - AuthSess.remove({ - _id: session._id - }); - - // Response - res({ - access_token: accessToken.token, - user: await serialize(session.user_id, null, { - detail: true - }) - }); + // Lookup app + const app = await App.findOne({ + secret: appSecret }); + + if (app == null) { + return rej('app not found'); + } + + // Get 'token' parameter + const [token, tokenErr] = it(params.token).expect.string().required().qed(); + if (tokenErr) return rej('invalid token param'); + + // Fetch token + const session = await AuthSess + .findOne({ + token: token, + app_id: app._id + }); + + if (session === null) { + return rej('session not found'); + } + + if (session.user_id == null) { + return rej('this session is not allowed yet'); + } + + // Lookup access token + const accessToken = await AccessToken.findOne({ + app_id: app._id, + user_id: session.user_id + }); + + // Delete session + + /* https://github.com/Automattic/monk/issues/178 + AuthSess.deleteOne({ + _id: session._id + }); + */ + AuthSess.remove({ + _id: session._id + }); + + // Response + res({ + access_token: accessToken.token, + user: await serialize(session.user_id, null, { + detail: true + }) + }); +}); diff --git a/src/api/endpoints/drive.ts b/src/api/endpoints/drive.ts index d73de67f4..41ad6301d 100644 --- a/src/api/endpoints/drive.ts +++ b/src/api/endpoints/drive.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -12,29 +10,28 @@ import DriveFile from '../models/drive-file'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Calculate drive usage - const usage = ((await DriveFile - .aggregate([ - { $match: { user_id: user._id } }, - { - $project: { - datasize: true - } - }, - { - $group: { - _id: null, - usage: { $sum: '$datasize' } - } +module.exports = (params, user) => new Promise(async (res, rej) => { + // Calculate drive usage + const usage = ((await DriveFile + .aggregate([ + { $match: { user_id: user._id } }, + { + $project: { + datasize: true } - ]))[0] || { - usage: 0 - }).usage; + }, + { + $group: { + _id: null, + usage: { $sum: '$datasize' } + } + } + ]))[0] || { + usage: 0 + }).usage; - res({ - capacity: user.drive_capacity, - usage: usage - }); + res({ + capacity: user.drive_capacity, + usage: usage }); +}); diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts index 2600e613e..16606d54b 100644 --- a/src/api/endpoints/drive/files.ts +++ b/src/api/endpoints/drive/files.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/drive-file'; * @param {any} app * @return {Promise} */ -module.exports = (params, user, app) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/drive/files/create.ts b/src/api/endpoints/drive/files/create.ts index 7efd14981..c2dc18f33 100644 --- a/src/api/endpoints/drive/files/create.ts +++ b/src/api/endpoints/drive/files/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,15 +15,13 @@ import create from '../../../common/add-file-to-drive'; * @param {any} user * @return {Promise} */ -module.exports = (file, params, user) => - new Promise(async (res, rej) => -{ +module.exports = (file, params, user) => new Promise(async (res, rej) => { if (file == null) { return rej('file is required'); } const buffer = fs.readFileSync(file.path); - fs.unlink(file.path, (err) => { if (err) console.log(err) }); + fs.unlink(file.path, (err) => { if (err) console.log(err); }); // Get 'name' parameter let name = file.originalname; diff --git a/src/api/endpoints/drive/files/find.ts b/src/api/endpoints/drive/files/find.ts index 393b8c5b9..f2819692f 100644 --- a/src/api/endpoints/drive/files/find.ts +++ b/src/api/endpoints/drive/files/find.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../../serializers/drive-file'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'name' parameter const [name, nameErr] = it(params.name).expect.string().required().qed(); if (nameErr) return rej('invalid name param'); diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts index 2024a56ca..d439ec49f 100644 --- a/src/api/endpoints/drive/files/show.ts +++ b/src/api/endpoints/drive/files/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../../serializers/drive-file'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'file_id' parameter const [fileId, fileIdErr] = it(params.file_id).expect.id().required().qed(); if (fileIdErr) return rej('invalid file_id param'); diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts index 595d50165..1a75a15da 100644 --- a/src/api/endpoints/drive/files/update.ts +++ b/src/api/endpoints/drive/files/update.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import event from '../../../event'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'file_id' parameter const [fileId, fileIdErr] = it(params.file_id).expect.id().required().qed(); if (fileIdErr) return rej('invalid file_id param'); diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/api/endpoints/drive/files/upload_from_url.ts index b6f478931..7042b1e02 100644 --- a/src/api/endpoints/drive/files/upload_from_url.ts +++ b/src/api/endpoints/drive/files/upload_from_url.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import create from '../../../common/add-file-to-drive'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'url' parameter // TODO: Validate this url const [url, urlErr] = it(params.url).expect.string().required().qed(); diff --git a/src/api/endpoints/drive/folders.ts b/src/api/endpoints/drive/folders.ts index 45c0117ba..8e04aa711 100644 --- a/src/api/endpoints/drive/folders.ts +++ b/src/api/endpoints/drive/folders.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/drive-folder'; * @param {any} app * @return {Promise} */ -module.exports = (params, user, app) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/drive/folders/create.ts b/src/api/endpoints/drive/folders/create.ts index d327572af..f2f788fe4 100644 --- a/src/api/endpoints/drive/folders/create.ts +++ b/src/api/endpoints/drive/folders/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import event from '../../../event'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'name' parameter const [name, nameErr] = it(params.name).expect.string().validate(isValidFolderName).default('無題のフォルダー').qed(); if (nameErr) return rej('invalid name param'); diff --git a/src/api/endpoints/drive/folders/find.ts b/src/api/endpoints/drive/folders/find.ts index 041e9ccb2..27f667b21 100644 --- a/src/api/endpoints/drive/folders/find.ts +++ b/src/api/endpoints/drive/folders/find.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../../serializers/drive-folder'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'name' parameter const [name, nameErr] = it(params.name).expect.string().required().qed(); if (nameErr) return rej('invalid name param'); diff --git a/src/api/endpoints/drive/folders/show.ts b/src/api/endpoints/drive/folders/show.ts index 3b3ed4171..ea9a56d7d 100644 --- a/src/api/endpoints/drive/folders/show.ts +++ b/src/api/endpoints/drive/folders/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../../serializers/drive-folder'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'folder_id' parameter const [folderId, folderIdErr] = it(params.folder_id).expect.id().required().qed(); if (folderIdErr) return rej('invalid folder_id param'); diff --git a/src/api/endpoints/drive/folders/update.ts b/src/api/endpoints/drive/folders/update.ts index 81d414354..982b44a5f 100644 --- a/src/api/endpoints/drive/folders/update.ts +++ b/src/api/endpoints/drive/folders/update.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import event from '../../../event'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'folder_id' parameter const [folderId, folderIdErr] = it(params.folder_id).expect.id().required().qed(); if (folderIdErr) return rej('invalid folder_id param'); diff --git a/src/api/endpoints/drive/stream.ts b/src/api/endpoints/drive/stream.ts index 95a7584b1..69848825a 100644 --- a/src/api/endpoints/drive/stream.ts +++ b/src/api/endpoints/drive/stream.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/drive-file'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/following/create.ts b/src/api/endpoints/following/create.ts index 0edc122b9..7991f5fd9 100644 --- a/src/api/endpoints/following/create.ts +++ b/src/api/endpoints/following/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import serializeUser from '../../serializers/user'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { const follower = user; // Get 'user_id' parameter diff --git a/src/api/endpoints/following/delete.ts b/src/api/endpoints/following/delete.ts index 7f0e90806..84b1efd0f 100644 --- a/src/api/endpoints/following/delete.ts +++ b/src/api/endpoints/following/delete.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import serializeUser from '../../serializers/user'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { const follower = user; // Get 'user_id' parameter diff --git a/src/api/endpoints/i.ts b/src/api/endpoints/i.ts index df8c0d0e0..0e5efdb98 100644 --- a/src/api/endpoints/i.ts +++ b/src/api/endpoints/i.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../serializers/user'; * @param {Boolean} isSecure * @return {Promise} */ -module.exports = (params, user, _, isSecure) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => { // Serialize res(await serialize(user, user, { detail: true, diff --git a/src/api/endpoints/i/appdata/get.ts b/src/api/endpoints/i/appdata/get.ts index 7f1bdf071..ccd820253 100644 --- a/src/api/endpoints/i/appdata/get.ts +++ b/src/api/endpoints/i/appdata/get.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import Appdata from '../../../models/appdata'; * @param {Boolean} isSecure * @return {Promise} */ -module.exports = (params, user, app, isSecure) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app, isSecure) => new Promise(async (res, rej) => { // Get 'key' parameter let key = params.key; if (key === undefined) { diff --git a/src/api/endpoints/i/appdata/set.ts b/src/api/endpoints/i/appdata/set.ts index 57001f4e8..354935cb4 100644 --- a/src/api/endpoints/i/appdata/set.ts +++ b/src/api/endpoints/i/appdata/set.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import event from '../../../event'; * @param {Boolean} isSecure * @return {Promise} */ -module.exports = (params, user, app, isSecure) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app, isSecure) => new Promise(async (res, rej) => { const data = params.data; if (data == null) { return rej('data is required'); diff --git a/src/api/endpoints/i/authorized_apps.ts b/src/api/endpoints/i/authorized_apps.ts index fb56a107e..ed3670c7d 100644 --- a/src/api/endpoints/i/authorized_apps.ts +++ b/src/api/endpoints/i/authorized_apps.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/app'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/i/favorites.ts b/src/api/endpoints/i/favorites.ts index c04d31837..11de625be 100644 --- a/src/api/endpoints/i/favorites.ts +++ b/src/api/endpoints/i/favorites.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/i/notifications.ts b/src/api/endpoints/i/notifications.ts index 4f4f0780b..e6c6558fb 100644 --- a/src/api/endpoints/i/notifications.ts +++ b/src/api/endpoints/i/notifications.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import getFriends from '../../common/get-friends'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'following' parameter const [following, followingError] = it(params.following).expect.boolean().default(false).qed(); diff --git a/src/api/endpoints/i/signin_history.ts b/src/api/endpoints/i/signin_history.ts index eb8fc8c23..d549f682c 100644 --- a/src/api/endpoints/i/signin_history.ts +++ b/src/api/endpoints/i/signin_history.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/signin'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/i/update.ts b/src/api/endpoints/i/update.ts index b0c14777e..1895d2837 100644 --- a/src/api/endpoints/i/update.ts +++ b/src/api/endpoints/i/update.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -19,9 +17,7 @@ import config from '../../../conf'; * @param {boolean} isSecure * @return {Promise} */ -module.exports = async (params, user, _, isSecure) => - new Promise(async (res, rej) => -{ +module.exports = async (params, user, _, isSecure) => new Promise(async (res, rej) => { // Get 'name' parameter const [name, nameErr] = it(params.name).expect.string().validate(isValidName).qed(); if (nameErr) return rej('invalid name param'); diff --git a/src/api/endpoints/messaging/history.ts b/src/api/endpoints/messaging/history.ts index 07ad6e0f2..73d7af77a 100644 --- a/src/api/endpoints/messaging/history.ts +++ b/src/api/endpoints/messaging/history.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/messaging-message'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/messaging/messages.ts b/src/api/endpoints/messaging/messages.ts index 671ed2796..40fd0cf04 100644 --- a/src/api/endpoints/messaging/messages.ts +++ b/src/api/endpoints/messaging/messages.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import { publishMessagingStream } from '../../event'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().qed(); if (recipientIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/messaging/messages/create.ts b/src/api/endpoints/messaging/messages/create.ts index dbe7f617f..81968c897 100644 --- a/src/api/endpoints/messaging/messages/create.ts +++ b/src/api/endpoints/messaging/messages/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -21,9 +19,7 @@ import config from '../../../../conf'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [recipientId, recipientIdErr] = it(params.user_id).expect.id().required().qed(); if (recipientIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/messaging/unread.ts b/src/api/endpoints/messaging/unread.ts index faba171bd..40bc83fe1 100644 --- a/src/api/endpoints/messaging/unread.ts +++ b/src/api/endpoints/messaging/unread.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -12,9 +10,7 @@ import Message from '../../models/messaging-message'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { const count = await Message .count({ recipient_id: user._id, diff --git a/src/api/endpoints/meta.ts b/src/api/endpoints/meta.ts index 5fd9c20c5..ea2a8206a 100644 --- a/src/api/endpoints/meta.ts +++ b/src/api/endpoints/meta.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -40,13 +38,12 @@ import config from '../../conf'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => { - const commit = await prominence(git).getLastCommit(); +module.exports = (params) => new Promise(async (res, rej) => { + const commit = await prominence(git).getLastCommit(); - res({ - maintainer: config.maintainer, - commit: commit.shortHash, - secure: config.https.enable - }); + res({ + maintainer: config.maintainer, + commit: commit.shortHash, + secure: config.https.enable }); +}); diff --git a/src/api/endpoints/my/apps.ts b/src/api/endpoints/my/apps.ts index 2466a47ce..f16be81d0 100644 --- a/src/api/endpoints/my/apps.ts +++ b/src/api/endpoints/my/apps.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/app'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/notifications/mark_as_read.ts b/src/api/endpoints/notifications/mark_as_read.ts index 6e75927cf..703562fec 100644 --- a/src/api/endpoints/notifications/mark_as_read.ts +++ b/src/api/endpoints/notifications/mark_as_read.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,36 +13,35 @@ import event from '../../event'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - const [notificationId, notificationIdErr] = it(params.notification_id).expect.id().required().qed(); - if (notificationIdErr) return rej('invalid notification_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + const [notificationId, notificationIdErr] = it(params.notification_id).expect.id().required().qed(); + if (notificationIdErr) return rej('invalid notification_id param'); - // Get notification - const notification = await Notification - .findOne({ - _id: notificationId, - i: user._id - }); - - if (notification === null) { - return rej('notification-not-found'); - } - - // Update - notification.is_read = true; - Notification.update({ _id: notification._id }, { - $set: { - is_read: true - } + // Get notification + const notification = await Notification + .findOne({ + _id: notificationId, + i: user._id }); - // Response - res(); + if (notification === null) { + return rej('notification-not-found'); + } - // Serialize - const notificationObj = await serialize(notification); - - // Publish read_notification event - event(user._id, 'read_notification', notificationObj); + // Update + notification.is_read = true; + Notification.update({ _id: notification._id }, { + $set: { + is_read: true + } }); + + // Response + res(); + + // Serialize + const notificationObj = await serialize(notification); + + // Publish read_notification event + event(user._id, 'read_notification', notificationObj); +}); diff --git a/src/api/endpoints/posts.ts b/src/api/endpoints/posts.ts index 39548d44a..cd2da99c2 100644 --- a/src/api/endpoints/posts.ts +++ b/src/api/endpoints/posts.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,64 +11,63 @@ import serialize from '../serializers/post'; * @param {any} params * @return {Promise} */ -module.exports = (params) => - new Promise(async (res, rej) => { - // Get 'include_replies' parameter - const [includeReplies, includeRepliesErr] = it(params.include_replies).expect.boolean().default(true).qed(); - if (includeRepliesErr) return rej('invalid include_replies param'); +module.exports = (params) => new Promise(async (res, rej) => { + // Get 'include_replies' parameter + const [includeReplies, includeRepliesErr] = it(params.include_replies).expect.boolean().default(true).qed(); + if (includeRepliesErr) return rej('invalid include_replies param'); - // Get 'include_reposts' parameter - const [includeReposts, includeRepostsErr] = it(params.include_reposts).expect.boolean().default(true).qed(); - if (includeRepostsErr) return rej('invalid include_reposts param'); + // Get 'include_reposts' parameter + const [includeReposts, includeRepostsErr] = it(params.include_reposts).expect.boolean().default(true).qed(); + if (includeRepostsErr) return rej('invalid include_reposts param'); - // Get 'limit' parameter - const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); - if (limitErr) return rej('invalid limit param'); + // Get 'limit' parameter + const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); + if (limitErr) return rej('invalid limit param'); - // Get 'since_id' parameter - const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed(); - if (sinceIdErr) return rej('invalid since_id param'); + // Get 'since_id' parameter + const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed(); + if (sinceIdErr) return rej('invalid since_id param'); - // Get 'max_id' parameter - const [maxId, maxIdErr] = it(params.max_id).expect.id().qed(); - if (maxIdErr) return rej('invalid max_id param'); + // Get 'max_id' parameter + const [maxId, maxIdErr] = it(params.max_id).expect.id().qed(); + if (maxIdErr) return rej('invalid max_id param'); - // Check if both of since_id and max_id is specified - if (sinceId && maxId) { - return rej('cannot set since_id and max_id'); - } + // Check if both of since_id and max_id is specified + if (sinceId && maxId) { + return rej('cannot set since_id and max_id'); + } - // Construct query - const sort = { - _id: -1 + // Construct query + const sort = { + _id: -1 + }; + const query = {} as any; + if (sinceId) { + sort._id = 1; + query._id = { + $gt: sinceId }; - const query = {} as any; - if (sinceId) { - sort._id = 1; - query._id = { - $gt: sinceId - }; - } else if (maxId) { - query._id = { - $lt: maxId - }; - } + } else if (maxId) { + query._id = { + $lt: maxId + }; + } - if (!includeReplies) { - query.reply_to_id = null; - } + if (!includeReplies) { + query.reply_to_id = null; + } - if (!includeReposts) { - query.repost_id = null; - } + if (!includeReposts) { + query.repost_id = null; + } - // Issue query - const posts = await Post - .find(query, { - limit: limit, - sort: sort - }); + // Issue query + const posts = await Post + .find(query, { + limit: limit, + sort: sort + }); - // Serialize - res(await Promise.all(posts.map(async post => await serialize(post)))); - }); + // Serialize + res(await Promise.all(posts.map(async post => await serialize(post)))); +}); diff --git a/src/api/endpoints/posts/context.ts b/src/api/endpoints/posts/context.ts index 5b0a56f35..7bccecfb9 100644 --- a/src/api/endpoints/posts/context.ts +++ b/src/api/endpoints/posts/context.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id, 'id', true); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/posts/create.ts b/src/api/endpoints/posts/create.ts index d558cd301..dfc986651 100644 --- a/src/api/endpoints/posts/create.ts +++ b/src/api/endpoints/posts/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -23,9 +21,7 @@ import config from '../../../conf'; * @param {any} app * @return {Promise} */ -module.exports = (params, user, app) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app) => new Promise(async (res, rej) => { // Get 'text' parameter const [text, textErr] = it(params.text).must.be.a.string().validate(isValidText).qed(); if (textErr) return rej('invalid text'); diff --git a/src/api/endpoints/posts/favorites/create.ts b/src/api/endpoints/posts/favorites/create.ts index 45a347ebb..7ae77778e 100644 --- a/src/api/endpoints/posts/favorites/create.ts +++ b/src/api/endpoints/posts/favorites/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,38 +12,37 @@ import Post from '../../../models/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = it(params.post_id, 'id', true); - if (postIdErr) return rej('invalid post_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = it(params.post_id, 'id', true); + if (postIdErr) return rej('invalid post_id param'); - // Get favoritee - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - // if already favorited - const exist = await Favorite.findOne({ - post_id: post._id, - user_id: user._id - }); - - if (exist !== null) { - return rej('already favorited'); - } - - // Create favorite - await Favorite.insert({ - created_at: new Date(), - post_id: post._id, - user_id: user._id - }); - - // Send response - res(); + // Get favoritee + const post = await Post.findOne({ + _id: postId }); + + if (post === null) { + return rej('post not found'); + } + + // if already favorited + const exist = await Favorite.findOne({ + post_id: post._id, + user_id: user._id + }); + + if (exist !== null) { + return rej('already favorited'); + } + + // Create favorite + await Favorite.insert({ + created_at: new Date(), + post_id: post._id, + user_id: user._id + }); + + // Send response + res(); +}); diff --git a/src/api/endpoints/posts/favorites/delete.ts b/src/api/endpoints/posts/favorites/delete.ts index df1121590..437863d06 100644 --- a/src/api/endpoints/posts/favorites/delete.ts +++ b/src/api/endpoints/posts/favorites/delete.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,36 +12,35 @@ import Post from '../../../models/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = it(params.post_id, 'id', true); - if (postIdErr) return rej('invalid post_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = it(params.post_id, 'id', true); + if (postIdErr) return rej('invalid post_id param'); - // Get favoritee - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - // if already favorited - const exist = await Favorite.findOne({ - post_id: post._id, - user_id: user._id - }); - - if (exist === null) { - return rej('already not favorited'); - } - - // Delete favorite - await Favorite.deleteOne({ - _id: exist._id - }); - - // Send response - res(); + // Get favoritee + const post = await Post.findOne({ + _id: postId }); + + if (post === null) { + return rej('post not found'); + } + + // if already favorited + const exist = await Favorite.findOne({ + post_id: post._id, + user_id: user._id + }); + + if (exist === null) { + return rej('already not favorited'); + } + + // Delete favorite + await Favorite.deleteOne({ + _id: exist._id + }); + + // Send response + res(); +}); diff --git a/src/api/endpoints/posts/likes.ts b/src/api/endpoints/posts/likes.ts index f299de749..88d3a6e1d 100644 --- a/src/api/endpoints/posts/likes.ts +++ b/src/api/endpoints/posts/likes.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/user'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id, 'id', true); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/posts/likes/create.ts b/src/api/endpoints/posts/likes/create.ts index 0ae417e23..43e76d1a5 100644 --- a/src/api/endpoints/posts/likes/create.ts +++ b/src/api/endpoints/posts/likes/create.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,70 +14,69 @@ import notify from '../../../common/notify'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = it(params.post_id, 'id', true); - if (postIdErr) return rej('invalid post_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = it(params.post_id, 'id', true); + if (postIdErr) return rej('invalid post_id param'); - // Get likee - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - // Myself - if (post.user_id.equals(user._id)) { - return rej('-need-translate-'); - } - - // if already liked - const exist = await Like.findOne({ - post_id: post._id, - user_id: user._id, - deleted_at: { $exists: false } - }); - - if (exist !== null) { - return rej('already liked'); - } - - // Create like - await Like.insert({ - created_at: new Date(), - post_id: post._id, - user_id: user._id - }); - - // Send response - res(); - - // Increment likes count - Post.update({ _id: post._id }, { - $inc: { - likes_count: 1 - } - }); - - // Increment user likes count - User.update({ _id: user._id }, { - $inc: { - likes_count: 1 - } - }); - - // Increment user liked count - User.update({ _id: post.user_id }, { - $inc: { - liked_count: 1 - } - }); - - // Notify - notify(post.user_id, user._id, 'like', { - post_id: post._id - }); + // Get likee + const post = await Post.findOne({ + _id: postId }); + + if (post === null) { + return rej('post not found'); + } + + // Myself + if (post.user_id.equals(user._id)) { + return rej('-need-translate-'); + } + + // if already liked + const exist = await Like.findOne({ + post_id: post._id, + user_id: user._id, + deleted_at: { $exists: false } + }); + + if (exist !== null) { + return rej('already liked'); + } + + // Create like + await Like.insert({ + created_at: new Date(), + post_id: post._id, + user_id: user._id + }); + + // Send response + res(); + + // Increment likes count + Post.update({ _id: post._id }, { + $inc: { + likes_count: 1 + } + }); + + // Increment user likes count + User.update({ _id: user._id }, { + $inc: { + likes_count: 1 + } + }); + + // Increment user liked count + User.update({ _id: post.user_id }, { + $inc: { + liked_count: 1 + } + }); + + // Notify + notify(post.user_id, user._id, 'like', { + post_id: post._id + }); +}); diff --git a/src/api/endpoints/posts/likes/delete.ts b/src/api/endpoints/posts/likes/delete.ts index 2b642c107..bd2f83e21 100644 --- a/src/api/endpoints/posts/likes/delete.ts +++ b/src/api/endpoints/posts/likes/delete.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,62 +14,61 @@ import User from '../../../models/user'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = it(params.post_id, 'id', true); - if (postIdErr) return rej('invalid post_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = it(params.post_id, 'id', true); + if (postIdErr) return rej('invalid post_id param'); - // Get likee - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - // if already liked - const exist = await Like.findOne({ - post_id: post._id, - user_id: user._id, - deleted_at: { $exists: false } - }); - - if (exist === null) { - return rej('already not liked'); - } - - // Delete like - await Like.update({ - _id: exist._id - }, { - $set: { - deleted_at: new Date() - } - }); - - // Send response - res(); - - // Decrement likes count - Post.update({ _id: post._id }, { - $inc: { - likes_count: -1 - } - }); - - // Decrement user likes count - User.update({ _id: user._id }, { - $inc: { - likes_count: -1 - } - }); - - // Decrement user liked count - User.update({ _id: post.user_id }, { - $inc: { - liked_count: -1 - } - }); + // Get likee + const post = await Post.findOne({ + _id: postId }); + + if (post === null) { + return rej('post not found'); + } + + // if already liked + const exist = await Like.findOne({ + post_id: post._id, + user_id: user._id, + deleted_at: { $exists: false } + }); + + if (exist === null) { + return rej('already not liked'); + } + + // Delete like + await Like.update({ + _id: exist._id + }, { + $set: { + deleted_at: new Date() + } + }); + + // Send response + res(); + + // Decrement likes count + Post.update({ _id: post._id }, { + $inc: { + likes_count: -1 + } + }); + + // Decrement user likes count + User.update({ _id: user._id }, { + $inc: { + likes_count: -1 + } + }); + + // Decrement user liked count + User.update({ _id: post.user_id }, { + $inc: { + liked_count: -1 + } + }); +}); diff --git a/src/api/endpoints/posts/mentions.ts b/src/api/endpoints/posts/mentions.ts index a190b55f1..3f5467495 100644 --- a/src/api/endpoints/posts/mentions.ts +++ b/src/api/endpoints/posts/mentions.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'following' parameter const [following, followingError] = it(params.following).expect.boolean().default(false).qed(); diff --git a/src/api/endpoints/posts/polls/vote.ts b/src/api/endpoints/posts/polls/vote.ts index d0caf7da9..36d0de975 100644 --- a/src/api/endpoints/posts/polls/vote.ts +++ b/src/api/endpoints/posts/polls/vote.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,69 +13,68 @@ import notify from '../../../common/notify'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = it(params.post_id, 'id', true); - if (postIdErr) return rej('invalid post_id param'); +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = it(params.post_id, 'id', true); + if (postIdErr) return rej('invalid post_id param'); - // Get votee - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - if (post.poll == null) { - return rej('poll not found'); - } - - // Get 'choice' parameter - const [choice, choiceError] = - it(params.choice).expect.string() - .required() - .validate(c => post.poll.choices.some(x => x.id == c)) - .qed(); - if (choiceError) return rej('invalid choice param'); - - // if already voted - const exist = await Vote.findOne({ - post_id: post._id, - user_id: user._id - }); - - if (exist !== null) { - return rej('already voted'); - } - - // Create vote - await Vote.insert({ - created_at: new Date(), - post_id: post._id, - user_id: user._id, - choice: choice - }); - - // Send response - res(); - - const inc = {}; - inc[`poll.choices.${findWithAttr(post.poll.choices, 'id', choice)}.votes`] = 1; - - // Increment likes count - Post.update({ _id: post._id }, { - $inc: inc - }); - - // Notify - notify(post.user_id, user._id, 'poll_vote', { - post_id: post._id, - choice: choice - }); + // Get votee + const post = await Post.findOne({ + _id: postId }); + if (post === null) { + return rej('post not found'); + } + + if (post.poll == null) { + return rej('poll not found'); + } + + // Get 'choice' parameter + const [choice, choiceError] = + it(params.choice).expect.string() + .required() + .validate(c => post.poll.choices.some(x => x.id == c)) + .qed(); + if (choiceError) return rej('invalid choice param'); + + // if already voted + const exist = await Vote.findOne({ + post_id: post._id, + user_id: user._id + }); + + if (exist !== null) { + return rej('already voted'); + } + + // Create vote + await Vote.insert({ + created_at: new Date(), + post_id: post._id, + user_id: user._id, + choice: choice + }); + + // Send response + res(); + + const inc = {}; + inc[`poll.choices.${findWithAttr(post.poll.choices, 'id', choice)}.votes`] = 1; + + // Increment likes count + Post.update({ _id: post._id }, { + $inc: inc + }); + + // Notify + notify(post.user_id, user._id, 'poll_vote', { + post_id: post._id, + choice: choice + }); +}); + function findWithAttr(array, attr, value) { for (let i = 0; i < array.length; i += 1) { if (array[i][attr] === value) { diff --git a/src/api/endpoints/posts/replies.ts b/src/api/endpoints/posts/replies.ts index 3f448d163..378ba7ec2 100644 --- a/src/api/endpoints/posts/replies.ts +++ b/src/api/endpoints/posts/replies.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id, 'id', true); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/posts/reposts.ts b/src/api/endpoints/posts/reposts.ts index 0c1fa9bbd..fc9b56cfc 100644 --- a/src/api/endpoints/posts/reposts.ts +++ b/src/api/endpoints/posts/reposts.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id, 'id', true); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/posts/search.ts b/src/api/endpoints/posts/search.ts index 1d02f6775..e869701a3 100644 --- a/src/api/endpoints/posts/search.ts +++ b/src/api/endpoints/posts/search.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ import config from '../../../conf'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'query' parameter const [query, queryError] = it(params.query).expect.string().required().trim().validate(x => x != '').qed(); if (queryError) return rej('invalid query param'); diff --git a/src/api/endpoints/posts/show.ts b/src/api/endpoints/posts/show.ts index 712ef1e16..0ff1947e9 100644 --- a/src/api/endpoints/posts/show.ts +++ b/src/api/endpoints/posts/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/post'; * @param {any} user * @return {Promise} */ -module.exports = (params, user) => - new Promise(async (res, rej) => -{ +module.exports = (params, user) => new Promise(async (res, rej) => { // Get 'post_id' parameter const [postId, postIdErr] = it(params.post_id, 'id', true); if (postIdErr) return rej('invalid post_id param'); diff --git a/src/api/endpoints/posts/timeline.ts b/src/api/endpoints/posts/timeline.ts index c599c4ded..83a96e6c6 100644 --- a/src/api/endpoints/posts/timeline.ts +++ b/src/api/endpoints/posts/timeline.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import serialize from '../../serializers/post'; * @param {any} app * @return {Promise} */ -module.exports = (params, user, app) => - new Promise(async (res, rej) => -{ +module.exports = (params, user, app) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/username/available.ts b/src/api/endpoints/username/available.ts index 9a85644b6..049121d2d 100644 --- a/src/api/endpoints/username/available.ts +++ b/src/api/endpoints/username/available.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -13,9 +11,7 @@ import { validateUsername } from '../../models/user'; * @param {any} params * @return {Promise} */ -module.exports = async (params) => - new Promise(async (res, rej) => -{ +module.exports = async (params) => new Promise(async (res, rej) => { // Get 'username' parameter const [username, usernameError] = it(params.username).expect.string().required().trim().validate(validateUsername).qed(); if (usernameError) return rej('invalid username param'); diff --git a/src/api/endpoints/users.ts b/src/api/endpoints/users.ts index 7f9fa69df..cc4e5865a 100644 --- a/src/api/endpoints/users.ts +++ b/src/api/endpoints/users.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,49 +12,48 @@ import serialize from '../serializers/user'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => { - // Get 'limit' parameter - const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); - if (limitErr) return rej('invalid limit param'); +module.exports = (params, me) => new Promise(async (res, rej) => { + // Get 'limit' parameter + const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); + if (limitErr) return rej('invalid limit param'); - // Get 'since_id' parameter - const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed(); - if (sinceIdErr) return rej('invalid since_id param'); + // Get 'since_id' parameter + const [sinceId, sinceIdErr] = it(params.since_id).expect.id().qed(); + if (sinceIdErr) return rej('invalid since_id param'); - // Get 'max_id' parameter - const [maxId, maxIdErr] = it(params.max_id).expect.id().qed(); - if (maxIdErr) return rej('invalid max_id param'); + // Get 'max_id' parameter + const [maxId, maxIdErr] = it(params.max_id).expect.id().qed(); + if (maxIdErr) return rej('invalid max_id param'); - // Check if both of since_id and max_id is specified - if (sinceId && maxId) { - return rej('cannot set since_id and max_id'); - } + // Check if both of since_id and max_id is specified + if (sinceId && maxId) { + return rej('cannot set since_id and max_id'); + } - // Construct query - const sort = { - _id: -1 + // Construct query + const sort = { + _id: -1 + }; + const query = {} as any; + if (sinceId) { + sort._id = 1; + query._id = { + $gt: sinceId }; - const query = {} as any; - if (sinceId) { - sort._id = 1; - query._id = { - $gt: sinceId - }; - } else if (maxId) { - query._id = { - $lt: maxId - }; - } + } else if (maxId) { + query._id = { + $lt: maxId + }; + } - // Issue query - const users = await User - .find(query, { - limit: limit, - sort: sort - }); + // Issue query + const users = await User + .find(query, { + limit: limit, + sort: sort + }); - // Serialize - res(await Promise.all(users.map(async user => - await serialize(user, me)))); - }); + // Serialize + res(await Promise.all(users.map(async user => + await serialize(user, me)))); +}); diff --git a/src/api/endpoints/users/followers.ts b/src/api/endpoints/users/followers.ts index 011a1c70c..e593854e8 100644 --- a/src/api/endpoints/users/followers.ts +++ b/src/api/endpoints/users/followers.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import getFriends from '../../common/get-friends'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id, 'id', true); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/users/following.ts b/src/api/endpoints/users/following.ts index df5c05835..00baedbf8 100644 --- a/src/api/endpoints/users/following.ts +++ b/src/api/endpoints/users/following.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -16,9 +14,7 @@ import getFriends from '../../common/get-friends'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id, 'id', true); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/users/posts.ts b/src/api/endpoints/users/posts.ts index 78f91b16c..2832c5c6c 100644 --- a/src/api/endpoints/users/posts.ts +++ b/src/api/endpoints/users/posts.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/post'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id, 'id'); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/endpoints/users/recommendation.ts b/src/api/endpoints/users/recommendation.ts index c37ae4c97..f502f4126 100644 --- a/src/api/endpoints/users/recommendation.ts +++ b/src/api/endpoints/users/recommendation.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import getFriends from '../../common/get-friends'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'limit' parameter const [limit, limitErr] = it(params.limit).expect.number().range(1, 100).default(10).qed(); if (limitErr) return rej('invalid limit param'); diff --git a/src/api/endpoints/users/search.ts b/src/api/endpoints/users/search.ts index 3fb08b0a3..b21d8a239 100644 --- a/src/api/endpoints/users/search.ts +++ b/src/api/endpoints/users/search.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -17,9 +15,7 @@ const escapeRegexp = require('escape-regexp'); * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'query' parameter const [query, queryError] = it(params.query).expect.string().required().trim().validate(x => x != '').qed(); if (queryError) return rej('invalid query param'); diff --git a/src/api/endpoints/users/search_by_username.ts b/src/api/endpoints/users/search_by_username.ts index 540c48e7c..4071f341f 100644 --- a/src/api/endpoints/users/search_by_username.ts +++ b/src/api/endpoints/users/search_by_username.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -15,9 +13,7 @@ import serialize from '../../serializers/user'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'query' parameter const [query, queryError] = it(params.query).expect.string().required().trim().validate(validateUsername).qed(); if (queryError) return rej('invalid query param'); diff --git a/src/api/endpoints/users/show.ts b/src/api/endpoints/users/show.ts index 9997d2ba0..d35bfbae2 100644 --- a/src/api/endpoints/users/show.ts +++ b/src/api/endpoints/users/show.ts @@ -1,5 +1,3 @@ -'use strict'; - /** * Module dependencies */ @@ -14,9 +12,7 @@ import serialize from '../../serializers/user'; * @param {any} me * @return {Promise} */ -module.exports = (params, me) => - new Promise(async (res, rej) => -{ +module.exports = (params, me) => new Promise(async (res, rej) => { // Get 'user_id' parameter const [userId, userIdErr] = it(params.user_id, 'id'); if (userIdErr) return rej('invalid user_id param'); diff --git a/src/api/models/messaging-message.ts b/src/api/models/messaging-message.ts index 50955d7fb..81aee2cab 100644 --- a/src/api/models/messaging-message.ts +++ b/src/api/models/messaging-message.ts @@ -5,4 +5,3 @@ export default db.get('messaging_messages') as any; // fuck type definition export function isValidText(text: string): boolean { return text.length <= 1000 && text.trim() != ''; } -