Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 11:05:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6079

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-11-23 14:19:22 -05:00
parent f1d79635ff
commit 71895f3736
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/socket.io/posts/tools.js
View File

@@ -75,7 +75,7 @@ module.exports = function (SocketPosts) {
}, },
function (results, next) { function (results, next) {
if (results.isMain && results.isLast) { if (results.isMain && results.isLast) {
deleteTopicOf(data.pid, socket, next); deleteOrRestoreTopicOf('delete', data.pid, socket, next);
} else { } else {
next(); next();
} }
@@ -99,12 +99,23 @@ module.exports = function (SocketPosts) {
if (!data || !data.pid) { if (!data || !data.pid) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
var postData;
async.waterfall([ async.waterfall([
function (next) { function (next) {
posts.tools.restore(socket.uid, data.pid, next); posts.tools.restore(socket.uid, data.pid, next);
}, },
function (postData, next) { function (_postData, next) {
postData = _postData;
isMainAndLastPost(data.pid, next);
},
function (results, next) {
if (results.isMain && results.isLast) {
deleteOrRestoreTopicOf('restore', data.pid, socket, next);
} else {
setImmediate(next);
}
},
function (next) {
websockets.in('topic_' + data.tid).emit('event:post_restored', postData); websockets.in('topic_' + data.tid).emit('event:post_restored', postData);
events.log({ events.log({
@@ -185,13 +196,19 @@ module.exports = function (SocketPosts) {
], callback); ], callback);
}; };
function deleteTopicOf(pid, socket, callback) { function deleteOrRestoreTopicOf(command, pid, socket, callback) {
async.waterfall([ async.waterfall([
function (next) { function (next) {
posts.getTopicFields(pid, ['tid', 'cid'], next); posts.getTopicFields(pid, ['tid', 'cid', 'deleted'], next);
}, },
function (topic, next) { function (topic, next) {
socketTopics.doTopicAction('delete', 'event:topic_deleted', socket, { tids: [topic.tid], cid: topic.cid }, next); if (parseInt(topic.deleted, 10) !== 1 && command === 'delete') {
socketTopics.doTopicAction('delete', 'event:topic_deleted', socket, { tids: [topic.tid], cid: topic.cid }, next);
} else if (parseInt(topic.deleted, 10) === 1 && command === 'restore') {
socketTopics.doTopicAction('restore', 'event:topic_restored', socket, { tids: [topic.tid], cid: topic.cid }, next);
} else {
setImmediate(next);
}
}, },
], callback); ], callback);
} }