From 7e3535b88ba46f75e30acf479bd00688bce3a588 Mon Sep 17 00:00:00 2001 From: StevenNMeza Date: Fri, 19 Mar 2021 19:20:12 +0100 Subject: [PATCH 1/2] Do not run a search if there is no query --- routes.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/routes.js b/routes.js index 10aff1d..e0ce46e 100644 --- a/routes.js +++ b/routes.js @@ -719,6 +719,21 @@ module.exports = (app, redis, fetch, RedditAPI) => { app.get('/r/:subreddit/search', (req, res, next) => { let subreddit = req.params.subreddit let q = req.query.q + + if (typeof q === "undefined") { + return res.render('search', { + json: { posts: [] }, + no_query: true, + q: '', + restrict_sr: undefined, + nsfw: undefined, + subreddit: subreddit, + sortby: undefined, + past: undefined, + user_preferences: req.cookies + }) + } + let restrict_sr = req.query.restrict_sr let nsfw = req.query.nsfw let sortby = req.query.sort From 858a584870535a649f24d9459f84c5ed785184bc Mon Sep 17 00:00:00 2001 From: StevenNMeza Date: Fri, 19 Mar 2021 19:26:38 +0100 Subject: [PATCH 2/2] Check the options by default on the search page In accordance with the search in the subreddit view. --- views/search.pug | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/search.pug b/views/search.pug index 447ced0..f5bdf12 100644 --- a/views/search.pug +++ b/views/search.pug @@ -15,13 +15,13 @@ html input(type="text", name="q", id="q", placeholder="search", value=""+ q +"") div label(for="restrict_sr") limit my search to r/#{subreddit} - if restrict_sr === 'on' + if !restrict_sr || restrict_sr === 'on' input(type="checkbox", name="restrict_sr", id="restrict_sr", checked="checked") else input(type="checkbox", name="restrict_sr", id="restrict_sr") div label(for="nsfw") include NSFW results - if nsfw === 'on' + if !nsfw || nsfw === 'on' input(type="checkbox", name="nsfw", id="nsfw", checked="checked") else input(type="checkbox", name="nsfw", id="nsfw")