fix search with args

2 files changed, 3 insertions, 29 deletions

diff --git a/src/geddit.js b/src/geddit.js
index d81cedf..87a000b 100644
--- a/src/geddit.js
+++ b/src/geddit.js
@@ -241,13 +241,8 @@ class Geddit {
                 options.q = query;
                 options.type = "link";
 
-                const params = {
-                        limit: 25,
-                        include_over_18: true,
-                };
-
                 return await fetch(
-                        `${this.host}/search.json?${new URLSearchParams(Object.assign(params, options))}`,
+                        `${this.host}/search.json?${new URLSearchParams(options)}`,
                 )
                         .then((res) => res.json())
                         .then((json) => json.data)
diff --git a/src/routes/index.js b/src/routes/index.js
index 34a5e52..a743c7f 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -117,10 +117,7 @@ router.get("/sub-search", authenticateToken, async (req, res) => {
         if (!req.query || !req.query.q) {
                 res.render("sub-search", { user: req.user });
         } else {
-                const { q, options } = parseQuery(req.query.q);
-                const { items, after } = await G.searchSubreddits(q, {
-                        include_over_18: (options.nsfw ?? "no") === "yes",
-                });
+                const { items, after } = await G.searchSubreddits(q);
                 const subs = db
                         .query("SELECT subreddit FROM subscriptions WHERE user_id = $id")
                         .all({ id: req.user.id })
@@ -145,10 +142,7 @@ router.get("/post-search", authenticateToken, async (req, res) => {
         if (!req.query || !req.query.q) {
                 res.render("post-search", { user: req.user });
         } else {
-                const { q, options } = parseQuery(req.query.q);
-                const { items, after } = await G.searchSubmissions(q, {
-                        include_over_18: (options.nsfw ?? "no") === "yes",
-                });
+                const { items, after } = await G.searchSubmissions(req.query.q);
                 const message =
                         items.length === 0
                                 ? "no results found"
@@ -164,21 +158,6 @@ router.get("/post-search", authenticateToken, async (req, res) => {
         }
 });
 
-function parseQuery(q) {
-        return q.split(/\s+/).reduce(
-                (acc, word) => {
-                        if (word.includes(":")) {
-                                const [key, val] = word.split(":");
-                                acc.options[key] = val;
-                        } else {
-                                acc.q += `${word} `;
-                        }
-                        return acc;
-                },
-                { options: [], q: "" },
-        );
-}
-
 // GET /dashboard
 router.get("/dashboard", authenticateToken, async (req, res) => {
         let invites = null;