From 2adb6dfa113526dd2b5eec89e9c23551b3b6480a Mon Sep 17 00:00:00 2001 From: fatchan Date: Sun, 21 Apr 2019 07:37:01 +0000 Subject: [PATCH] closes #18 --- models/forms/lockposts.js | 4 ++-- models/forms/make-post.js | 1 - models/forms/sageposts.js | 4 ++-- models/forms/stickyposts.js | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/models/forms/lockposts.js b/models/forms/lockposts.js index b2fea9bc..e47dc87b 100644 --- a/models/forms/lockposts.js +++ b/models/forms/lockposts.js @@ -3,12 +3,12 @@ module.exports = (posts) => { const filteredposts = posts.filter(post => { - return !post.locked + return !post.thread && !post.locked }) if (filteredposts.length === 0) { return { - message: 'Post(s) already locked', + message: 'No thread(s) to lock', }; } diff --git a/models/forms/make-post.js b/models/forms/make-post.js index 6903a520..db1eb486 100644 --- a/models/forms/make-post.js +++ b/models/forms/make-post.js @@ -196,7 +196,6 @@ module.exports = async (req, res, next, numFiles) => { 'sticky': false, 'locked': false, 'saged': false, - 'cyclic': false, }; let postId; diff --git a/models/forms/sageposts.js b/models/forms/sageposts.js index 522394b2..668efb32 100644 --- a/models/forms/sageposts.js +++ b/models/forms/sageposts.js @@ -3,12 +3,12 @@ module.exports = (posts) => { const filteredposts = posts.filter(post => { - return !post.saged + return !post.thread && !post.saged }) if (filteredposts.length === 0) { return { - message: 'Post(s) already saged', + message: 'No thread(s) to sage', }; } diff --git a/models/forms/stickyposts.js b/models/forms/stickyposts.js index 4d5a3246..2b50a80a 100644 --- a/models/forms/stickyposts.js +++ b/models/forms/stickyposts.js @@ -3,12 +3,12 @@ module.exports = (posts) => { const filteredposts = posts.filter(post => { - return !post.sticky + return !post.thread && !post.sticky }) if (filteredposts.length === 0) { return { - message: 'Post(s) already stickied', + message: 'No thread(s) to sticky', }; }