From c705e08a76056fe3ce91a6adf5ec606b6396af11 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 29 Jul 2020 16:55:14 -0400 Subject: [PATCH] feat: allow direct link to flag from post tools, #8531 --- public/language/en-GB/topic.json | 6 ++++-- src/socket.io/posts/tools.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/public/language/en-GB/topic.json b/public/language/en-GB/topic.json index 6ce276025d..805ceb40cb 100644 --- a/public/language/en-GB/topic.json +++ b/public/language/en-GB/topic.json @@ -41,8 +41,10 @@ "bookmark_instructions" : "Click here to return to the last read post in this thread.", - "flag_post": "Flag this post", - "flag_user": "Flag this user", + "flag-post": "Flag this post", + "flag-user": "Flag this user", + "already-flagged": "Already Flagged", + "view-flag-report": "View Flag Report", "merged_message": "This topic has been merged into %2", "deleted_message": "This topic has been deleted. Only users with topic management privileges can see it.", diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js index 9c3ee0af49..ded60cd53a 100644 --- a/src/socket.io/posts/tools.js +++ b/src/socket.io/posts/tools.js @@ -19,7 +19,7 @@ module.exports = function (SocketPosts) { } const results = await utils.promiseParallel({ - posts: posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip']), + posts: posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip', 'flagId']), isAdmin: user.isAdministrator(socket.uid), isGlobalMod: user.isGlobalModerator(socket.uid), isModerator: user.isModerator(socket.uid, data.cid),