From ec1d5e38da3e1134a2218228425642c1512a1706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 9 Dec 2021 19:12:49 -0500 Subject: [PATCH] breaking: remove socket.emit('posts.upvote') socket.emit('posts.downvote') socket.emit('posts.unvote') --- src/socket.io/posts/votes.js | 18 ------ test/posts.js | 103 +++++++++++++++-------------------- 2 files changed, 45 insertions(+), 76 deletions(-) diff --git a/src/socket.io/posts/votes.js b/src/socket.io/posts/votes.js index cc87f96dc0..0ecd8196ef 100644 --- a/src/socket.io/posts/votes.js +++ b/src/socket.io/posts/votes.js @@ -5,9 +5,6 @@ const user = require('../../user'); const posts = require('../../posts'); const privileges = require('../../privileges'); const meta = require('../../meta'); -const api = require('../../api'); - -const sockets = require('..'); module.exports = function (SocketPosts) { SocketPosts.getVoters = async function (socket, data) { @@ -61,19 +58,4 @@ module.exports = function (SocketPosts) { })); return result; }; - - SocketPosts.upvote = async function (socket, data) { - sockets.warnDeprecated(socket, 'PUT /api/v3/posts/:pid/vote'); - return await api.posts.upvote(socket, data); - }; - - SocketPosts.downvote = async function (socket, data) { - sockets.warnDeprecated(socket, 'PUT /api/v3/posts/:pid/vote'); - return await api.posts.downvote(socket, data); - }; - - SocketPosts.unvote = async function (socket, data) { - sockets.warnDeprecated(socket, 'DELETE /api/v3/posts/:pid/vote'); - return await api.posts.unvote(socket, data); - }; }; diff --git a/test/posts.js b/test/posts.js index 1d20e01ecd..cbfcddfc4b 100644 --- a/test/posts.js +++ b/test/posts.js @@ -163,36 +163,33 @@ describe('Post\'s', () => { }); describe('voting', () => { - it('should fail to upvote post if group does not have upvote permission', (done) => { - privileges.categories.rescind(['groups:posts:upvote', 'groups:posts:downvote'], cid, 'registered-users', (err) => { - assert.ifError(err); - socketPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, (err) => { - assert.equal(err.message, '[[error:no-privileges]]'); - socketPosts.downvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, (err) => { - assert.equal(err.message, '[[error:no-privileges]]'); - privileges.categories.give(['groups:posts:upvote', 'groups:posts:downvote'], cid, 'registered-users', (err) => { - assert.ifError(err); - done(); - }); - }); - }); - }); + it('should fail to upvote post if group does not have upvote permission', async () => { + await privileges.categories.rescind(['groups:posts:upvote', 'groups:posts:downvote'], cid, 'registered-users'); + let err; + try { + await apiPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }); + } catch (_err) { + err = _err; + } + assert.equal(err.message, '[[error:no-privileges]]'); + try { + await apiPosts.downvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }); + } catch (_err) { + err = _err; + } + assert.equal(err.message, '[[error:no-privileges]]'); + await privileges.categories.give(['groups:posts:upvote', 'groups:posts:downvote'], cid, 'registered-users'); }); - it('should upvote a post', (done) => { - socketPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, (err, result) => { - assert.ifError(err); - assert.equal(result.post.upvotes, 1); - assert.equal(result.post.downvotes, 0); - assert.equal(result.post.votes, 1); - assert.equal(result.user.reputation, 1); - posts.hasVoted(postData.pid, voterUid, (err, data) => { - assert.ifError(err); - assert.equal(data.upvoted, true); - assert.equal(data.downvoted, false); - done(); - }); - }); + it('should upvote a post', async () => { + const result = await apiPosts.upvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }); + assert.equal(result.post.upvotes, 1); + assert.equal(result.post.downvotes, 0); + assert.equal(result.post.votes, 1); + assert.equal(result.user.reputation, 1); + const data = await posts.hasVoted(postData.pid, voterUid); + assert.equal(data.upvoted, true); + assert.equal(data.downvoted, false); }); it('should get voters', (done) => { @@ -215,36 +212,26 @@ describe('Post\'s', () => { }); }); - it('should unvote a post', (done) => { - socketPosts.unvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, (err, result) => { - assert.ifError(err); - assert.equal(result.post.upvotes, 0); - assert.equal(result.post.downvotes, 0); - assert.equal(result.post.votes, 0); - assert.equal(result.user.reputation, 0); - posts.hasVoted(postData.pid, voterUid, (err, data) => { - assert.ifError(err); - assert.equal(data.upvoted, false); - assert.equal(data.downvoted, false); - done(); - }); - }); + it('should unvote a post', async () => { + const result = await apiPosts.unvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }); + assert.equal(result.post.upvotes, 0); + assert.equal(result.post.downvotes, 0); + assert.equal(result.post.votes, 0); + assert.equal(result.user.reputation, 0); + const data = await posts.hasVoted(postData.pid, voterUid); + assert.equal(data.upvoted, false); + assert.equal(data.downvoted, false); }); - it('should downvote a post', (done) => { - socketPosts.downvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }, (err, result) => { - assert.ifError(err); - assert.equal(result.post.upvotes, 0); - assert.equal(result.post.downvotes, 1); - assert.equal(result.post.votes, -1); - assert.equal(result.user.reputation, -1); - posts.hasVoted(postData.pid, voterUid, (err, data) => { - assert.ifError(err); - assert.equal(data.upvoted, false); - assert.equal(data.downvoted, true); - done(); - }); - }); + it('should downvote a post', async () => { + const result = await apiPosts.downvote({ uid: voterUid }, { pid: postData.pid, room_id: 'topic_1' }); + assert.equal(result.post.upvotes, 0); + assert.equal(result.post.downvotes, 1); + assert.equal(result.post.votes, -1); + assert.equal(result.user.reputation, -1); + const data = await posts.hasVoted(postData.pid, voterUid); + assert.equal(data.upvoted, false); + assert.equal(data.downvoted, true); }); it('should prevent downvoting more than total daily limit', async () => { @@ -257,7 +244,7 @@ describe('Post\'s', () => { content: 'raw content', }); try { - await socketPosts.downvote({ uid: voterUid }, { pid: p1.pid, room_id: 'topic_1' }); + await apiPosts.downvote({ uid: voterUid }, { pid: p1.pid, room_id: 'topic_1' }); } catch (_err) { err = _err; } @@ -275,7 +262,7 @@ describe('Post\'s', () => { content: 'raw content', }); try { - await socketPosts.downvote({ uid: voterUid }, { pid: p1.pid, room_id: 'topic_1' }); + await apiPosts.downvote({ uid: voterUid }, { pid: p1.pid, room_id: 'topic_1' }); } catch (_err) { err = _err; }