Fix visited comment previews for Safari

attestate · Dec 5, 2024 · d1a4425 · d1a4425
1 parent 1d6c92a
commit d1a4425
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/src/views/components/row.mjs b/src/views/components/row.mjs
@@ -230,6 +230,10 @@ const row = (
   period,
   recentJoiners,
   invert = false,
+  // NOTE: query is currently only used when we want to mark a comment preview
+  // as visited, and so since comment previews are only active on / and /new, we
+  // don't have to properly set query anywhere else.
+  query = "",
 ) => {
   const size = 12;
   return (story, i) => {
@@ -666,7 +670,8 @@ const row = (
                     >
                       <a
                         class="comment-preview-anchor"
-                        href="#0x${story.lastComment.index}"
+                        href="${path === "/" ? "" : path}${query}#0x${story
+                          .lastComment.index}"
                         style="width: 100%; display: flex; pointer-events: none;"
                       >
                         <div style="width:90%;">

diff --git a/src/views/feed.mjs b/src/views/feed.mjs
@@ -452,6 +452,15 @@ export default async function (trie, theme, page, domain) {
   const content = await index(trie, page, domain);
   const { ad, originals, stories, start, contestStories } = content;
 
+  let currentQuery = "";
+  if (page && domain) {
+    currentQuery += `?page=${page}&domain=${domain}`;
+  } else if (page && !domain) {
+    currentQuery += `?page=${page}`;
+  } else if (!page && domain) {
+    currentQuery += `?domain=${domain}`;
+  }
+
   let query = `?page=${page + 1}`;
   if (domain) {
     query += `&domain=${domain}`;
@@ -510,6 +519,7 @@ export default async function (trie, theme, page, domain) {
                   null,
                   recentJoiners,
                   true,
+                  currentQuery,
                 ),
               )}
               ${stories
@@ -523,6 +533,8 @@ export default async function (trie, theme, page, domain) {
                     null,
                     null,
                     recentJoiners,
+                    false,
+                    currentQuery,
                   ),
                 )}
               ${ad &&
@@ -534,6 +546,8 @@ export default async function (trie, theme, page, domain) {
                 null,
                 null,
                 recentJoiners,
+                false,
+                currentQuery,
               )(ad)}
               ${stories
                 .slice(3, 8)
@@ -546,6 +560,8 @@ export default async function (trie, theme, page, domain) {
                     null,
                     null,
                     recentJoiners,
+                    false,
+                    currentQuery,
                   )(story, i + 3),
                 )}
               ${stories
@@ -559,6 +575,8 @@ export default async function (trie, theme, page, domain) {
                     null,
                     null,
                     recentJoiners,
+                    false,
+                    currentQuery,
                   )(story, i + 8),
                 )}
               ${stories.length < totalStories

diff --git a/src/views/new.mjs b/src/views/new.mjs
@@ -113,6 +113,7 @@ export default async function (trie, theme) {
   const path = "/new";
   const ogImage = "https://news.kiwistand.com/kiwi_new_feed_page.png";
   const recentJoiners = await registry.recents();
+  const query = "?cached=true";
   return html`
     <html lang="en" op="news">
       <head>
@@ -146,6 +147,8 @@ export default async function (trie, theme) {
                   null,
                   null,
                   recentJoiners,
+                  false,
+                  query,
                 ),
               )}
             </table>

diff --git a/src/views/upvotes.mjs b/src/views/upvotes.mjs
@@ -376,7 +376,7 @@ export default async function (
                     <td>No activity yet...</td>
                   </tr>`
                 : ""}
-              ${stories.map(Row(null, "/best", "margin-bottom: 17px;"))}
+              ${stories.map(Row(null, "/upvotes", "margin-bottom: 17px;"))}
               ${stories.length === totalStories
                 ? html`
                     <tr style="height: 50px">