1 files changed, 35 insertions, 8 deletions

diff --git a/src/routes/index.js b/src/routes/index.js
index 117b728..9415607 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -16,11 +16,14 @@ router.get("/", authenticateToken, async (req, res) => {
         const subs = db
                 .query("SELECT * FROM subscriptions WHERE user_id = $id")
                 .all({ id: req.user.id });
+
+        const qs = req.query ? ('?' + new URLSearchParams(req.query).toString()) : '';
+
         if (subs.length === 0) {
-                res.redirect("/r/all");
+                res.redirect(`/r/all${qs}`);
         } else {
                 const p = subs.map((s) => s.subreddit).join("+");
-                res.redirect(`/r/${p}`);
+                res.redirect(`/r/${p}${qs}`);
         }
 });
 
@@ -32,6 +35,9 @@ router.get("/r/:subreddit", authenticateToken, async (req, res) => {
         if (!query.sort) {
                 query.sort = "hot";
         }
+        if (!query.view) {
+                query.view = "compact";
+        }
 
         let isSubbed = false;
         if (!isMulti) {
@@ -47,6 +53,10 @@ router.get("/r/:subreddit", authenticateToken, async (req, res) => {
 
         const [posts, about] = await Promise.all([postsReq, aboutReq]);
 
+        if (query.view == 'card' && posts && posts.posts) {
+                posts.posts.forEach(unescape_selftext);
+        }
+
         res.render("index", {
                 subreddit,
                 posts,
@@ -71,6 +81,7 @@ router.get("/comments/:id", authenticateToken, async (req, res) => {
                 data: unescape_submission(response),
                 user: req.user,
                 from: req.query.from,
+                query: req.query,
         });
 });
 
@@ -104,12 +115,12 @@ router.get("/subs", authenticateToken, async (req, res) => {
                 )
                 .all({ id: req.user.id });
 
-        res.render("subs", { subs, user: req.user });
+        res.render("subs", { subs, user: req.user, query: req.query });
 });
 
 // GET /search
 router.get("/search", authenticateToken, async (req, res) => {
-        res.render("search", { user: req.user });
+        res.render("search", { user: req.user, query: req.query });
 });
 
 // GET /sub-search
@@ -133,6 +144,7 @@ router.get("/sub-search", authenticateToken, async (req, res) => {
                         message,
                         user: req.user,
                         original_query: req.query.q,
+                        query: req.query,
                 });
         }
 });
@@ -147,6 +159,11 @@ router.get("/post-search", authenticateToken, async (req, res) => {
                         items.length === 0
                                 ? "no results found"
                                 : `showing ${items.length} results`;
+
+                if (req.query.view == 'card' && items) {
+                        items.forEach(unescape_selftext);
+                }
+        
                 res.render("post-search", {
                         items,
                         after,
@@ -154,6 +171,7 @@ router.get("/post-search", authenticateToken, async (req, res) => {
                         user: req.user,
                         original_query: req.query.q,
                         currentUrl: req.url,
+                        query: req.query,
                 });
         }
 });
@@ -176,7 +194,7 @@ router.get("/dashboard", authenticateToken, async (req, res) => {
                                 usedAt: Date.parse(inv.usedAt),
                         }));
         }
-        res.render("dashboard", { invites, isAdmin, user: req.user });
+        res.render("dashboard", { invites, isAdmin, user: req.user, query: req.query });
 });
 
 router.get("/create-invite", authenticateAdmin, async (req, res) => {
@@ -359,14 +377,23 @@ function unescape_submission(response) {
         const post = response.submission.data;
         const comments = response.comments;
 
-        if (post.selftext_html) {
-                post.selftext_html = he.decode(post.selftext_html);
-        }
+        unescape_selftext(post);
         comments.forEach(unescape_comment);
 
         return { post, comments };
 }
 
+function unescape_selftext(post) {
+        // If called after getSubmissions
+        if (post.data && post.data.selftext_html) {
+                post.data.selftext_html = he.decode(post.data.selftext_html);
+        }
+        // If called after getSubmissionComments
+        if (post.selftext_html) {
+                post.selftext_html = he.decode(post.selftext_html);
+        }
+}
+
 function unescape_comment(comment) {
         if (comment.data.body_html) {
                 comment.data.body_html = he.decode(comment.data.body_html);