Skip to content

Commit

Permalink
feat: #9511 send notifications on accept/reject
Browse files Browse the repository at this point in the history
  • Loading branch information
barisusakli committed Apr 26, 2021
1 parent 2bfa63a commit b40fc4b
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 6 deletions.
2 changes: 2 additions & 0 deletions public/language/en-GB/notifications.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
"posts-exported": "<strong>%1</strong> posts exported, click to download",
"uploads-exported": "<strong>%1</strong> uploads exported, click to download",
"users-csv-exported": "Users csv exported, click to download",
"post-queue-accepted": "Your queued post has been accepted. Click here to see your post.",
"post-queue-rejected": "Your queued post has been rejected.",

"email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",
Expand Down
2 changes: 1 addition & 1 deletion public/language/en-GB/success.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"success": "Success",
"topic-post": "You have successfully posted.",
"post-queued": "Your post is queued for approval.",
"post-queued": "Your post is queued for approval. You will get a notification when it is accepted or rejected.",
"authentication-successful": "Authentication Successful",
"settings-saved": "Settings saved!"
}
14 changes: 12 additions & 2 deletions src/posts/queue.js
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,15 @@ module.exports = function (Posts) {
}

Posts.removeFromQueue = async function (id) {
const data = await getParsedObject(id);
if (!data) {
return;
}
await removeQueueNotification(id);
await db.sortedSetRemove('post:queue', id);
await db.delete(`post:queue:${id}`);
cache.del('post-queue');
return data;
};

Posts.submitFromQueue = async function (id) {
Expand All @@ -240,11 +245,14 @@ module.exports = function (Posts) {
return;
}
if (data.type === 'topic') {
await createTopic(data.data);
const result = await createTopic(data.data);
data.pid = result.postData.pid;
} else if (data.type === 'reply') {
await createReply(data.data);
const result = await createReply(data.data);
data.pid = result.pid;
}
await Posts.removeFromQueue(id);
return data;
};

async function getParsedObject(id) {
Expand All @@ -260,6 +268,7 @@ module.exports = function (Posts) {
async function createTopic(data) {
const result = await topics.post(data);
socketHelpers.notifyNew(data.uid, 'newTopic', { posts: [result.postData], topic: result.topicData });
return result;
}

async function createReply(data) {
Expand All @@ -270,6 +279,7 @@ module.exports = function (Posts) {
'downvote:disabled': !!meta.config['downvote:disabled'],
};
socketHelpers.notifyNew(data.uid, 'newPost', result);
return postData;
}

Posts.editQueuedContent = async function (uid, editData) {
Expand Down
20 changes: 17 additions & 3 deletions src/socket.io/posts.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const plugins = require('../plugins');
const meta = require('../meta');
const topics = require('../topics');
const user = require('../user');
const notifications = require('../notifications');
const socketHelpers = require('./helpers');
const utils = require('../utils');
const api = require('../api');
Expand Down Expand Up @@ -130,19 +131,32 @@ SocketPosts.getReplies = async function (socket, pid) {
};

SocketPosts.accept = async function (socket, data) {
await acceptOrReject(posts.submitFromQueue, socket, data);
const result = await acceptOrReject(posts.submitFromQueue, socket, data);
await sendQueueNotification('post-queue-accepted', result.uid, `/post/${result.pid}`);
};

SocketPosts.reject = async function (socket, data) {
await acceptOrReject(posts.removeFromQueue, socket, data);
const result = await acceptOrReject(posts.removeFromQueue, socket, data);
await sendQueueNotification('post-queue-rejected', result.uid, '/');
};

async function acceptOrReject(method, socket, data) {
const canEditQueue = await posts.canEditQueue(socket.uid, data);
if (!canEditQueue) {
throw new Error('[[error:no-privileges]]');
}
await method(data.id);
return await method(data.id);
}

async function sendQueueNotification(type, targetUid, path) {
const notifObj = await notifications.create({
type: type,
nid: `${type}-${targetUid}-${path}`,
bodyShort: type === 'post-queue-accepted' ?
'[[notifications:post-queue-accepted]]' : '[[notifications:post-queue-rejected]]',
path: path,
});
await notifications.push(notifObj, [targetUid]);
}

SocketPosts.editQueuedContent = async function (socket, data) {
Expand Down

0 comments on commit b40fc4b

Please sign in to comment.