From 71895f37367383f67a5367189b42f4e43f1e532f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Thu, 23 Nov 2017 14:19:22 -0500
Subject: [PATCH] closes #6079

---
 src/socket.io/posts/tools.js | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js
index 7f80ce9805..a9bbc6137b 100644
--- a/src/socket.io/posts/tools.js
+++ b/src/socket.io/posts/tools.js
@@ -75,7 +75,7 @@ module.exports = function (SocketPosts) {
 			},
 			function (results, next) {
 				if (results.isMain && results.isLast) {
-					deleteTopicOf(data.pid, socket, next);
+					deleteOrRestoreTopicOf('delete', data.pid, socket, next);
 				} else {
 					next();
 				}
@@ -99,12 +99,23 @@ module.exports = function (SocketPosts) {
 		if (!data || !data.pid) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
-
+		var postData;
 		async.waterfall([
 			function (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);
 
 				events.log({
@@ -185,13 +196,19 @@ module.exports = function (SocketPosts) {
 		], callback);
 	};
 
-	function deleteTopicOf(pid, socket, callback) {
+	function deleteOrRestoreTopicOf(command, pid, socket, callback) {
 		async.waterfall([
 			function (next) {
-				posts.getTopicFields(pid, ['tid', 'cid'], next);
+				posts.getTopicFields(pid, ['tid', 'cid', 'deleted'], 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);
 	}