Merge branch 'oppiliappan:master' into master

voc0der · Jan 23, 2025 · 8758162 · 8758162
2 parents c0e63c1 + 342b9f1
commit 8758162
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/mixins/post.pug b/src/mixins/post.pug
@@ -25,9 +25,9 @@ mixin post(p, currentUrl)
               | &nbsp;·&nbsp;
               | #{timeDifference(Date.now(), p.created * 1000)}
               | &nbsp;·&nbsp;
-              a(href=`/r/${p.subreddit}?sort=${sortQuery}&view=${viewQuery}`) r/#{p.subreddit}
+              a(href=`/r/${p.subreddit}`) r/#{p.subreddit}
               | &nbsp;·&nbsp;
-              a(href=`/comments/${p.id}?from=${from}&sort=${sortQuery}&view=${viewQuery}`) #{fmtnum (p.num_comments)} ↩
+              a(href=`/comments/${p.id}?from=${from}`) #{fmtnum (p.num_comments)} ↩
           if (query.view == "card" && !isPostMedia(p) && p.selftext_html)
             div.self-text-overflow.card
               if p.spoiler || p.over_18

diff --git a/src/mixins/postUtils.pug b/src/mixins/postUtils.pug
@@ -60,7 +60,7 @@
     // Find all anchors that href to preview.redd.it, i.redd.it, i.imgur.com
     // and contain just a link to the same href
     const expression = /<a href="(http[s]?:\/\/(?:preview\.redd\.it|i\.redd\.it|i\.imgur\.com).*?)">\1?<\/a>/g;
-    const matches = html.matchAll(expression);
+    const matches = Array.from(html.matchAll(expression));
     var result = html;
     matches.forEach((match) => {
       // Replace each occurrence with an actual img tag
@@ -85,4 +85,4 @@
     var poster_url = p.preview && p.preview.images ? p.preview.images[0].source.url.replace(expression, '&') : '';
 
     return [hls_url, dash_url, fallback_url, scrubber_url, poster_url];
-  }
+  }