From b05bee58d28c3209d7f86a909f877c1e121c12ed Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 20 Mar 2017 04:24:19 +0900 Subject: #298 --- src/api/endpoints.ts | 19 ++----- src/api/endpoints/posts/likes.ts | 58 -------------------- src/api/endpoints/posts/likes/create.ts | 82 ----------------------------- src/api/endpoints/posts/likes/delete.ts | 74 -------------------------- src/api/endpoints/posts/reactions.ts | 58 ++++++++++++++++++++ src/api/endpoints/posts/reactions/create.ts | 81 ++++++++++++++++++++++++++++ src/api/endpoints/posts/reactions/delete.ts | 60 +++++++++++++++++++++ src/api/models/like.ts | 3 -- src/api/models/post-reaction.ts | 3 ++ src/api/serializers/notification.ts | 2 +- src/api/serializers/post-reaction.ts | 43 +++++++++++++++ src/api/serializers/post.ts | 14 ++--- 12 files changed, 258 insertions(+), 239 deletions(-) delete mode 100644 src/api/endpoints/posts/likes.ts delete mode 100644 src/api/endpoints/posts/likes/create.ts delete mode 100644 src/api/endpoints/posts/likes/delete.ts create mode 100644 src/api/endpoints/posts/reactions.ts create mode 100644 src/api/endpoints/posts/reactions/create.ts create mode 100644 src/api/endpoints/posts/reactions/delete.ts delete mode 100644 src/api/models/like.ts create mode 100644 src/api/models/post-reaction.ts create mode 100644 src/api/serializers/post-reaction.ts (limited to 'src/api') diff --git a/src/api/endpoints.ts b/src/api/endpoints.ts index 17cd8ff56f..2d3716bb85 100644 --- a/src/api/endpoints.ts +++ b/src/api/endpoints.ts @@ -115,21 +115,12 @@ const endpoints: Endpoint[] = [ { name: 'aggregation/users/post', }, - { - name: 'aggregation/users/like' - }, { name: 'aggregation/users/followers' }, { name: 'aggregation/users/following' }, - { - name: 'aggregation/posts/like' - }, - { - name: 'aggregation/posts/likes' - }, { name: 'aggregation/posts/repost' }, @@ -370,26 +361,26 @@ const endpoints: Endpoint[] = [ } }, { - name: 'posts/likes', + name: 'posts/reactions', withCredential: true }, { - name: 'posts/likes/create', + name: 'posts/reactions/create', withCredential: true, limit: { duration: ms('1hour'), max: 100 }, - kind: 'like-write' + kind: 'reaction-write' }, { - name: 'posts/likes/delete', + name: 'posts/reactions/delete', withCredential: true, limit: { duration: ms('1hour'), max: 100 }, - kind: 'like-write' + kind: 'reaction-write' }, { name: 'posts/favorites/create', diff --git a/src/api/endpoints/posts/likes.ts b/src/api/endpoints/posts/likes.ts deleted file mode 100644 index 29aff1de38..0000000000 --- a/src/api/endpoints/posts/likes.ts +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Module dependencies - */ -import $ from 'cafy'; -import Post from '../../models/post'; -import Like from '../../models/like'; -import serialize from '../../serializers/user'; - -/** - * Show a likes of a post - * - * @param {any} params - * @param {any} user - * @return {Promise} - */ -module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = $(params.post_id).id().$; - if (postIdErr) return rej('invalid post_id param'); - - // Get 'limit' parameter - const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; - if (limitErr) return rej('invalid limit param'); - - // Get 'offset' parameter - const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$; - if (offsetErr) return rej('invalid offset param'); - - // Get 'sort' parameter - const [sort = 'desc', sortError] = $(params.sort).optional.string().or('desc asc').$; - if (sortError) return rej('invalid sort param'); - - // Lookup post - const post = await Post.findOne({ - _id: postId - }); - - if (post === null) { - return rej('post not found'); - } - - // Issue query - const likes = await Like - .find({ - post_id: post._id, - deleted_at: { $exists: false } - }, { - limit: limit, - skip: offset, - sort: { - _id: sort == 'asc' ? 1 : -1 - } - }); - - // Serialize - res(await Promise.all(likes.map(async like => - await serialize(like.user_id, user)))); -}); diff --git a/src/api/endpoints/posts/likes/create.ts b/src/api/endpoints/posts/likes/create.ts deleted file mode 100644 index 3a7650dead..0000000000 --- a/src/api/endpoints/posts/likes/create.ts +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Module dependencies - */ -import $ from 'cafy'; -import Like from '../../../models/like'; -import Post from '../../../models/post'; -import User from '../../../models/user'; -import notify from '../../../common/notify'; - -/** - * Like a post - * - * @param {any} params - * @param {any} user - * @return {Promise} - */ -module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = $(params.post_id).id().$; - 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 - }); -}); diff --git a/src/api/endpoints/posts/likes/delete.ts b/src/api/endpoints/posts/likes/delete.ts deleted file mode 100644 index d90f2937e0..0000000000 --- a/src/api/endpoints/posts/likes/delete.ts +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Module dependencies - */ -import $ from 'cafy'; -import Like from '../../../models/like'; -import Post from '../../../models/post'; -import User from '../../../models/user'; -// import event from '../../../event'; - -/** - * Unlike a post - * - * @param {any} params - * @param {any} user - * @return {Promise} - */ -module.exports = (params, user) => new Promise(async (res, rej) => { - // Get 'post_id' parameter - const [postId, postIdErr] = $(params.post_id).id().$; - 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 - } - }); -}); diff --git a/src/api/endpoints/posts/reactions.ts b/src/api/endpoints/posts/reactions.ts new file mode 100644 index 0000000000..eab5d9b258 --- /dev/null +++ b/src/api/endpoints/posts/reactions.ts @@ -0,0 +1,58 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import Post from '../../models/post'; +import Reaction from '../../models/post-reaction'; +import serialize from '../../serializers/post-reaction'; + +/** + * Show reactions of a post + * + * @param {any} params + * @param {any} user + * @return {Promise} + */ +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = $(params.post_id).id().$; + if (postIdErr) return rej('invalid post_id param'); + + // Get 'limit' parameter + const [limit = 10, limitErr] = $(params.limit).optional.number().range(1, 100).$; + if (limitErr) return rej('invalid limit param'); + + // Get 'offset' parameter + const [offset = 0, offsetErr] = $(params.offset).optional.number().min(0).$; + if (offsetErr) return rej('invalid offset param'); + + // Get 'sort' parameter + const [sort = 'desc', sortError] = $(params.sort).optional.string().or('desc asc').$; + if (sortError) return rej('invalid sort param'); + + // Lookup post + const post = await Post.findOne({ + _id: postId + }); + + if (post === null) { + return rej('post not found'); + } + + // Issue query + const reactions = await Reaction + .find({ + post_id: post._id, + deleted_at: { $exists: false } + }, { + limit: limit, + skip: offset, + sort: { + _id: sort == 'asc' ? 1 : -1 + } + }); + + // Serialize + res(await Promise.all(reactions.map(async reaction => + await serialize(reaction, user)))); +}); diff --git a/src/api/endpoints/posts/reactions/create.ts b/src/api/endpoints/posts/reactions/create.ts new file mode 100644 index 0000000000..de4df5fbe1 --- /dev/null +++ b/src/api/endpoints/posts/reactions/create.ts @@ -0,0 +1,81 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import Reaction from '../../../models/post-reaction'; +import Post from '../../../models/post'; +import notify from '../../../common/notify'; + +/** + * React to a post + * + * @param {any} params + * @param {any} user + * @return {Promise} + */ +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = $(params.post_id).id().$; + if (postIdErr) return rej('invalid post_id param'); + + // Get 'reaction' parameter + const [reaction, reactionErr] = $(params.reaction).string().or([ + 'like', + 'love', + 'laugh', + 'hmm', + 'surprise', + 'congrats' + ]).$; + if (reactionErr) return rej('invalid reaction param'); + + // Fetch reactee + 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('cannot react to my post'); + } + + // if already reacted + const exist = await Reaction.findOne({ + post_id: post._id, + user_id: user._id, + deleted_at: { $exists: false } + }); + + if (exist !== null) { + return rej('already reacted'); + } + + // Create reaction + await Reaction.insert({ + created_at: new Date(), + post_id: post._id, + user_id: user._id, + reaction: reaction + }); + + // Send response + res(); + + const inc = {}; + inc['reaction_counts.' + reaction] = 1; + + // Increment reactions count + Post.update({ _id: post._id }, { + $inc: inc + }); + + // Notify + notify(post.user_id, user._id, 'reaction', { + post_id: post._id, + reaction: reaction + }); +}); diff --git a/src/api/endpoints/posts/reactions/delete.ts b/src/api/endpoints/posts/reactions/delete.ts new file mode 100644 index 0000000000..89f6beb103 --- /dev/null +++ b/src/api/endpoints/posts/reactions/delete.ts @@ -0,0 +1,60 @@ +/** + * Module dependencies + */ +import $ from 'cafy'; +import Reaction from '../../../models/post-reaction'; +import Post from '../../../models/post'; +// import event from '../../../event'; + +/** + * Unreact to a post + * + * @param {any} params + * @param {any} user + * @return {Promise} + */ +module.exports = (params, user) => new Promise(async (res, rej) => { + // Get 'post_id' parameter + const [postId, postIdErr] = $(params.post_id).id().$; + if (postIdErr) return rej('invalid post_id param'); + + // Fetch unreactee + const post = await Post.findOne({ + _id: postId + }); + + if (post === null) { + return rej('post not found'); + } + + // if already unreacted + const exist = await Reaction.findOne({ + post_id: post._id, + user_id: user._id, + deleted_at: { $exists: false } + }); + + if (exist === null) { + return rej('never reacted'); + } + + // Delete reaction + await Reaction.update({ + _id: exist._id + }, { + $set: { + deleted_at: new Date() + } + }); + + // Send response + res(); + + const dec = {}; + dec['reaction_counts.' + exist.reaction] = -1; + + // Decrement reactions count + Post.update({ _id: post._id }, { + $inc: dec + }); +}); diff --git a/src/api/models/like.ts b/src/api/models/like.ts deleted file mode 100644 index ff04d8d0f7..0000000000 --- a/src/api/models/like.ts +++ /dev/null @@ -1,3 +0,0 @@ -import db from '../../db/mongodb'; - -export default db.get('likes') as any; // fuck type definition diff --git a/src/api/models/post-reaction.ts b/src/api/models/post-reaction.ts new file mode 100644 index 0000000000..282ae5bd21 --- /dev/null +++ b/src/api/models/post-reaction.ts @@ -0,0 +1,3 @@ +import db from '../../db/mongodb'; + +export default db.get('post_reactions') as any; // fuck type definition diff --git a/src/api/serializers/notification.ts b/src/api/serializers/notification.ts index 50952e5426..ac919dc8b0 100644 --- a/src/api/serializers/notification.ts +++ b/src/api/serializers/notification.ts @@ -51,7 +51,7 @@ export default (notification: any) => new Promise(async (resolve, reject) = case 'reply': case 'repost': case 'quote': - case 'like': + case 'reaction': case 'poll_vote': // Populate post _notification.post = await serializePost(_notification.post_id, me); diff --git a/src/api/serializers/post-reaction.ts b/src/api/serializers/post-reaction.ts new file mode 100644 index 0000000000..b8807a741c --- /dev/null +++ b/src/api/serializers/post-reaction.ts @@ -0,0 +1,43 @@ +/** + * Module dependencies + */ +import * as mongo from 'mongodb'; +import deepcopy = require('deepcopy'); +import Reaction from '../models/post-reaction'; +import serializeUser from './user'; + +/** + * Serialize a reaction + * + * @param {any} reaction + * @param {any} me? + * @return {Promise} + */ +export default ( + reaction: any, + me?: any +) => new Promise(async (resolve, reject) => { + let _reaction: any; + + // Populate the reaction if 'reaction' is ID + if (mongo.ObjectID.prototype.isPrototypeOf(reaction)) { + _reaction = await Reaction.findOne({ + _id: reaction + }); + } else if (typeof reaction === 'string') { + _reaction = await Reaction.findOne({ + _id: new mongo.ObjectID(reaction) + }); + } else { + _reaction = deepcopy(reaction); + } + + // Rename _id to id + _reaction.id = _reaction._id; + delete _reaction._id; + + // Populate user + _reaction.user = await serializeUser(_reaction.user_id, me); + + resolve(_reaction); +}); diff --git a/src/api/serializers/post.ts b/src/api/serializers/post.ts index f459529697..3c96884dd1 100644 --- a/src/api/serializers/post.ts +++ b/src/api/serializers/post.ts @@ -4,7 +4,7 @@ import * as mongo from 'mongodb'; import deepcopy = require('deepcopy'); import Post from '../models/post'; -import Like from '../models/like'; +import Reaction from '../models/post-reaction'; import Vote from '../models/poll-vote'; import serializeApp from './app'; import serializeUser from './user'; @@ -100,18 +100,18 @@ const self = ( } } - // Check if it is liked + // Fetch my reaction if (me && opts.detail) { - const liked = await Like - .count({ + const reaction = await Reaction + .findOne({ user_id: me._id, post_id: id, deleted_at: { $exists: false } - }, { - limit: 1 }); - _post.is_liked = liked === 1; + if (reaction) { + _post.my_reaction = reaction.reaction; + } } resolve(_post); -- cgit v1.2.3-freya