mention fix

jerimiah-smiggins · Oct 19, 2024 · e9bbe2d · e9bbe2d
1 parent 529e55a
commit e9bbe2d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/smiggins/templates/js/base.js b/smiggins/templates/js/base.js
@@ -172,7 +172,7 @@ function getPostHTML(postJSON, isComment = false, includeUserLink = true, includ
           ${includePostLink ? `<a aria-hidden="true" href="/${isComment ? "c" : "p"}/${postJSON.post_id}" tabindex="-1" class="text no-underline">` : ""}
             ${linkifyHtml(escapeHTML(postJSON.content), {
         formatHref: {
-            mention: (href) => fakeMentions ? "javascript:void(0);" : "/u" + href,
+            mention: (href) => fakeMentions ? "javascript:void(0);" : "/u/" + href.slice(1),
             hashtag: (href) => "/hashtag/" + href.slice(1)
         }
     }).replaceAll("\n", "<br>\n")
@@ -252,7 +252,7 @@ function getPostHTML(postJSON, isComment = false, includeUserLink = true, includ
                     <a aria-hidden="true" href="/${postJSON.quote.comment ? "c" : "p"}/${postJSON.quote.post_id}" class="text no-underline">
                       ${linkifyHtml(escapeHTML(postJSON.quote.content), {
         formatHref: {
-            mention: (href) => fakeMentions ? "javascript:void(0);" : "/u" + href,
+            mention: (href) => fakeMentions ? "javascript:void(0);" : "/u/" + href.slice(1),
             hashtag: (href) => "/hashtag/" + href.slice(1)
         }
     }).replaceAll("\n", "<br>")

diff --git a/smiggins/templates/js/message.js b/smiggins/templates/js/message.js
@@ -26,7 +26,7 @@ function refreshMessages(start = false, forward = true) {
                 y.setAttribute("class", `message ${message.from_self ? "send" : "receive"}`);
                 y.innerHTML = `<div>${linkifyHtml(escapeHTML(message.content), {
                     formatHref: {
-                        mention: (href) => "/u" + href,
+                        mention: (href) => "/u/" + href.slice(1),
                         hashtag: (href) => "/hashtag/" + href.slice(1)
                     },
                 })}</div><span class="timestamp">${timeSince(message.timestamp)}</span>`;

diff --git a/smiggins/templates/js/pending.js b/smiggins/templates/js/pending.js
@@ -43,7 +43,7 @@ function refreshPendingList(fromStart = false) {
               <div class="main-content">
                 ${user.bio ? linkifyHtml(escapeHTML(user.bio), {
                     formatHref: {
-                        mention: (href) => "/u" + href,
+                        mention: (href) => "/u/" + href.slice(1),
                         hashtag: (href) => "/hashtag/" + href.slice(1)
                     }
                 }) : `<i>${lang.user_page.lists_no_bio}</i>`}

diff --git a/smiggins/templates/js/user.js b/smiggins/templates/js/user.js
@@ -9,7 +9,7 @@ function extra(json) {
     ENABLE_USER_BIOS && dom("user-bio").removeAttribute("hidden");
     ENABLE_USER_BIOS && (dom("user-bio").innerHTML = linkifyHtml(escapeHTML(json.bio), {
         formatHref: {
-            mention: (href) => "/u" + href,
+            mention: (href) => "/u/" + href.slice(1),
             hashtag: (href) => "/hashtag/" + href.slice(1)
         }
     }));

diff --git a/smiggins/templates/user_lists.html b/smiggins/templates/user_lists.html
@@ -168,7 +168,7 @@ <h2>{{ lang.user_page.lists_followers }}</h2>
     [...document.querySelectorAll("[data-linkify]")].forEach((val, index) => {
       val.innerHTML = linkifyHtml(val.innerHTML, {
         formatHref: {
-          mention: (href) => "/u" + href,
+          mention: (href) => "/u/" + href.slice(1),
           hashtag: (href) => "/hashtag/" + href.slice(1)
         }
       });

diff --git a/smiggins/ts/base.ts b/smiggins/ts/base.ts
@@ -206,7 +206,7 @@ function getPostHTML(
             ${
               linkifyHtml(escapeHTML(postJSON.content), {
                 formatHref: {
-                  mention: (href: string): string => fakeMentions ? "javascript:void(0);" : "/u" + href,
+                  mention: (href: string): string => fakeMentions ? "javascript:void(0);" : "/u/" + href.slice(1),
                   hashtag: (href: string): string => "/hashtag/" + href.slice(1)
                 }
               }).replaceAll("\n", "<br>\n")
@@ -294,7 +294,7 @@ function getPostHTML(
                       ${
                         linkifyHtml(escapeHTML(postJSON.quote.content), {
                           formatHref: {
-                            mention: (href: string): string => fakeMentions ? "javascript:void(0);" : "/u" + href,
+                            mention: (href: string): string => fakeMentions ? "javascript:void(0);" : "/u/" + href.slice(1),
                             hashtag: (href: string): string => "/hashtag/" + href.slice(1)
                           }
                         }).replaceAll("\n", "<br>")

diff --git a/smiggins/ts/message.ts b/smiggins/ts/message.ts
@@ -45,7 +45,7 @@ function refreshMessages(start=false, forward=true): void {
           y.setAttribute("class", `message ${message.from_self ? "send" : "receive"}`);
           y.innerHTML = `<div>${linkifyHtml(escapeHTML(message.content), {
             formatHref: {
-              mention: (href: string): string => "/u" + href,
+              mention: (href: string): string => "/u/" + href.slice(1),
               hashtag: (href: string): string => "/hashtag/" + href.slice(1)
             },
           })}</div><span class="timestamp">${timeSince(message.timestamp)}</span>`;

diff --git a/smiggins/ts/pending.ts b/smiggins/ts/pending.ts
@@ -60,7 +60,7 @@ function refreshPendingList(fromStart=false): void {
                 ${
                   user.bio ? linkifyHtml(escapeHTML(user.bio), {
                     formatHref: {
-                      mention: (href: string): string => "/u" + href,
+                      mention: (href: string): string => "/u/" + href.slice(1),
                       hashtag: (href: string): string => "/hashtag/" + href.slice(1)
                     }
                   }) : `<i>${lang.user_page.lists_no_bio}</i>`

diff --git a/smiggins/ts/user.ts b/smiggins/ts/user.ts
@@ -17,7 +17,7 @@ function extra(json: {
   ENABLE_USER_BIOS && dom("user-bio").removeAttribute("hidden");
   ENABLE_USER_BIOS && (dom("user-bio").innerHTML = linkifyHtml(escapeHTML(json.bio), {
     formatHref: {
-      mention: (href: string): string => "/u" + href,
+      mention: (href: string): string => "/u/" + href.slice(1),
       hashtag: (href: string): string => "/hashtag/" + href.slice(1)
     }
   }));