From bae3b10a94a486b0328b7e4f0ba22e1bafffc169 Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Thu, 26 Jan 2023 00:22:34 +0800
Subject: [PATCH] merge with upsteam
 https://github.com/importantimport/urara/commit/950fc380684fd86bed0233a17ad2443f76f52bdb

---
 src/lib/components/footer.svelte        |  6 ++---
 src/lib/components/header.svelte        |  8 +++++--
 src/lib/components/header_nav.svelte    | 10 ++++----
 src/lib/components/header_search.svelte |  1 -
 src/lib/components/index_profile.svelte |  4 ++--
 src/lib/components/post_reply.svelte    | 31 +++++++------------------
 6 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/lib/components/footer.svelte b/src/lib/components/footer.svelte
index f8eedf1c..9e2c0164 100644
--- a/src/lib/components/footer.svelte
+++ b/src/lib/components/footer.svelte
@@ -16,7 +16,7 @@
     <p>
       {#if footerConfig.nav}
         {#each footerConfig.nav as { text, link }, i}
-          <a href={link} rel="noopener external" target="_blank">{text}</a>
+          <a href={link} rel="noopener noreferrer external" target="_blank">{text}</a>
           {#if i + 1 < footerConfig.nav.length}
             <span class="mr-1">·</span>
           {/if}
@@ -30,7 +30,7 @@
       <br />
       Powered by
       <a
-        rel="noopener external"
+        rel="noopener noreferrer external"
         target="_blank"
         class="tooltip tooltip-secondary hover:text-secondary"
         data-tip="🌸 [δ] - Based on MDsveX & SvelteKit 🌸"
@@ -43,4 +43,4 @@
       {/if}
     </p>
   </div>
-</footer>
+</footer>
\ No newline at end of file
diff --git a/src/lib/components/header.svelte b/src/lib/components/header.svelte
index b2f5fa66..9b6c610a 100644
--- a/src/lib/components/header.svelte
+++ b/src/lib/components/header.svelte
@@ -62,7 +62,7 @@
         {#if headerConfig.nav}
           <Nav {path} {title} {pin} {scrollY} nav={headerConfig.nav} />
         {/if}
-        <a href="/" data-sveltekit-prefetch class="btn btn-ghost normal-case text-lg">{site.title}</a>
+        <a href="/" class="btn btn-ghost normal-case text-lg">{site.title}</a>
       </div>
       <div class="navbar-end">
         {#if headerConfig.search}
@@ -71,9 +71,13 @@
           </button>
         {/if}
         <div id="change-theme" class="dropdown dropdown-end">
+          <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+          <!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
           <div tabindex="0" class="btn btn-square btn-ghost">
             <span class="i-heroicons-outline-color-swatch" />
           </div>
+          <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+          <!-- reference: https://github.com/saadeghi/daisyui/issues/1285 -->
           <ul
             tabindex="0"
             class="flex flex-nowrap shadow-2xl menu dropdown-content bg-base-100 text-base-content rounded-box w-52 p-2 gap-2 overflow-y-auto max-h-[21.5rem]"
@@ -131,4 +135,4 @@
     class="border-4 border-base-content/10 group-hover:border-transparent col-start-1 row-start-1 rounded-full w-full h-full p-4 grid duration-500 ease-in-out">
     <span class="i-heroicons-solid-chevron-up !w-6 !h-6" />
   </div>
-</button>
+</button>
\ No newline at end of file
diff --git a/src/lib/components/header_nav.svelte b/src/lib/components/header_nav.svelte
index b480e21f..0a3f5352 100644
--- a/src/lib/components/header_nav.svelte
+++ b/src/lib/components/header_nav.svelte
@@ -21,7 +21,7 @@
     {#each nav as { text, link, children }}
       {#if link && !children}
         <li>
-          <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
+          <a class:font-bold={link === path} href={link}>{text}</a>
         </li>
       {:else if children}
         <li tabindex="0">
@@ -32,7 +32,7 @@
           <ul class="bg-base-100 text-base-content shadow-lg p-2">
             {#each children as { text, link }}
               <li>
-                <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
+                <a class:font-bold={link === path} href={link}>{text}</a>
               </li>
             {/each}
           </ul>
@@ -52,7 +52,7 @@
     {#each nav as { text, link, children }}
       {#if link && !children}
         <li>
-          <a data-sveltekit-prefetch class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
+          <a class="!rounded-btn" class:font-bold={link === path} href={link}>{text}</a>
         </li>
       {:else if children}
         <li>
@@ -64,7 +64,7 @@
           <ul tabindex="0" class="menu rounded-box bg-base-100 text-base-content shadow-lg p-2">
             {#each children as { text, link }}
               <li>
-                <a data-sveltekit-prefetch class:font-bold={link === path} href={link}>{text}</a>
+                <a class:font-bold={link === path} href={link}>{text}</a>
               </li>
             {/each}
           </ul>
@@ -72,4 +72,4 @@
       {/if}
     {/each}
   </ul>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/header_search.svelte b/src/lib/components/header_search.svelte
index 5712f35f..624d8331 100644
--- a/src/lib/components/header_search.svelte
+++ b/src/lib/components/header_search.svelte
@@ -6,7 +6,6 @@
 <form
   action={headerConfig?.search?.provider === 'duckduckgo' ? '//duckduckgo.com/' : '//google.com/search'}
   method="get"
-  accept-charset="UTF-8"
   class="flex-1">
   <input
     type="text"
diff --git a/src/lib/components/index_profile.svelte b/src/lib/components/index_profile.svelte
index 9f828f11..36870b71 100644
--- a/src/lib/components/index_profile.svelte
+++ b/src/lib/components/index_profile.svelte
@@ -40,7 +40,7 @@
             {#if link}
               <a
                 href={link}
-                rel={rel ?? 'me noopener external'}
+                rel={rel ?? 'me noopener  noreferrer external'}
                 class:btn-square={!text}
                 class="btn btn-sm btn-ghost normal-case gap-2 u-url"
                 target="_blank">
@@ -52,7 +52,7 @@
                 {/if}
               </a>
             {:else}
-              <button class:btn-square={!text} class="btn btn-sm btn-ghost normal-case gap-2" {rel}>
+              <button class:btn-square={!text} class="btn btn-sm btn-ghost normal-case gap-2">
                 {#if icon}
                   <span class="{icon} !w-5 !h-5" />
                 {/if}
diff --git a/src/lib/components/post_reply.svelte b/src/lib/components/post_reply.svelte
index 0ed962e9..1325c6a2 100644
--- a/src/lib/components/post_reply.svelte
+++ b/src/lib/components/post_reply.svelte
@@ -6,25 +6,12 @@
 
 <div class="flex flex-wrap gap-2 rounded-box outline outline-neutral/10 p-4 {className}">
   <span class="flex-none font-bold uppercase opacity-30">Reply to:&nbsp;</span>
-  {#if Array.isArray(in_reply_to)}
-    {#each in_reply_to as reply}
-      <a
-        href={reply}
-        rel="noopener external"
-        target="_blank"
-        class="flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to">
-        <span class="i-heroicons-outline-reply my-auto !w-4 !h-4" />
-        {reply}
-      </a>
-    {/each}
-  {:else}
-    <a
-      href={in_reply_to}
-      rel="noopener external"
-      target="_blank"
-      class="ml-auto flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to">
-      <span class="i-heroicons-outline-reply my-auto !w-4 !h-4" />
-      {in_reply_to}
-    </a>
-  {/if}
-</div>
+  <a
+    href={in_reply_to}
+    rel="noopener noreferrer external"
+    target="_blank"
+    class="ml-auto flex-none flex rounded-badge bg-base-200 hover:bg-base-300 transition-all gap-2 px-4 u-in-reply-to">
+    <span class="i-heroicons-outline-reply my-auto !w-4 !h-4" />
+    {in_reply_to}
+  </a>
+</div>
\ No newline at end of file