From 908b77fe282a1da265e7d33ae641a37244943131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 3 Jun 2018 15:44:48 -0400 Subject: [PATCH] closes #6250 --- install/package.json | 6 +++--- src/socket.io/posts/tools.js | 26 ++++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/install/package.json b/install/package.json index 99aa7e96c0..a8e3a0ff9c 100644 --- a/install/package.json +++ b/install/package.json @@ -75,9 +75,9 @@ "nodebb-plugin-spam-be-gone": "0.5.4", "nodebb-rewards-essentials": "0.0.11", "nodebb-theme-lavender": "5.0.4", - "nodebb-theme-persona": "9.0.13", - "nodebb-theme-slick": "1.2.3", - "nodebb-theme-vanilla": "10.0.10", + "nodebb-theme-persona": "9.0.14", + "nodebb-theme-slick": "1.2.4", + "nodebb-theme-vanilla": "10.0.11", "nodebb-widget-essentials": "4.0.4", "nodemailer": "^4.6.5", "passport": "^0.4.0", diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js index b8533937ce..9b2da8ee01 100644 --- a/src/socket.io/posts/tools.js +++ b/src/socket.io/posts/tools.js @@ -55,20 +55,22 @@ module.exports = function (SocketPosts) { }, next); }, function (results, next) { - results.posts.tools = results.tools.tools; - results.posts.deleted = parseInt(results.posts.deleted, 10) === 1; - results.posts.bookmarked = results.bookmarked; - results.posts.selfPost = socket.uid && socket.uid === parseInt(results.posts.uid, 10); - results.posts.display_edit_tools = results.canEdit.flag; - results.posts.display_delete_tools = results.canDelete.flag; - results.posts.display_flag_tools = socket.uid && !results.posts.selfPost && results.canFlag.flag; - results.posts.display_moderator_tools = results.posts.display_edit_tools || results.posts.display_delete_tools; - results.posts.display_move_tools = results.isAdmin || results.isModerator; - results.posts.display_ip_ban = (results.isAdmin || results.isGlobalMod) && !results.posts.selfPost; - results.posts.display_history = results.history; + var posts = results.posts; + posts.tools = results.tools.tools; + posts.deleted = parseInt(posts.deleted, 10) === 1; + posts.bookmarked = results.bookmarked; + posts.selfPost = socket.uid && socket.uid === parseInt(posts.uid, 10); + posts.display_edit_tools = results.canEdit.flag; + posts.display_delete_tools = results.canDelete.flag; + posts.display_flag_tools = socket.uid && !posts.selfPost && results.canFlag.flag; + posts.display_moderator_tools = posts.display_edit_tools || posts.display_delete_tools; + posts.display_move_tools = results.isAdmin || results.isModerator; + posts.display_ip_ban = (results.isAdmin || results.isGlobalMod) && !posts.selfPost; + posts.display_history = results.history; + posts.toolsVisible = posts.tools.length || posts.display_moderator_tools; if (!results.isAdmin && !results.isGlobalMod && !results.isModerator) { - results.posts.ip = undefined; + posts.ip = undefined; } next(null, results); },