From 2495dc7278de9682c51aca2fcbe8b9b06ce44237 Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Thu, 26 Jan 2023 00:15:28 +0800
Subject: [PATCH] merge with upsteam
 https://github.com/importantimport/urara/commit/2ef763fc343df0497cb9409af1e3c069962d814d

---
 src/app.d.ts                              | 10 +++++++---
 src/lib/components/extra/youtube.svelte   | 10 +++++-----
 src/lib/components/post_action.svelte     |  6 +++---
 src/lib/components/post_comment.svelte    |  7 ++++---
 src/lib/components/post_pagination.svelte |  4 +---
 src/lib/components/post_toc.svelte        |  3 ++-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/app.d.ts b/src/app.d.ts
index 6fdf9a6a..ef37bf76 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="@sveltejs/kit" />
 
-import { FFFBase, FFFExtra } from 'fff-flavored-frontmatter'
+import type { FFFBase, FFFMention } from 'fff-flavored-frontmatter'
 
 interface ImportMetaEnv extends Readonly<Record<string, string>> {
   readonly URARA_SITE_PROTOCOL?: 'http://' | 'https://'
@@ -15,8 +15,8 @@ interface ImportMeta {
 declare global {
   namespace Urara {
     namespace Post {
-      type Frontmatter = Omit<FFFBase, 'created' | 'updated' | 'image' | 'audio' | 'video' | 'flags'> &
-        Pick<FFFExtra, 'in_reply_to'> & {
+      type Frontmatter = Omit<FFFBase, 'flags'> &
+        Pick<FFFMention, 'in_reply_to'> & {
           /**
            * post type.
            * @remarks auto-generated
@@ -51,6 +51,10 @@ declare global {
            * @remarks auto-generated or set manually
            */
           updated: string
+          /**
+           * the published date of the post.
+           */
+          published?: string
           /**
            * the featured image for article, or image for "photo" / "multi-photo" posts.
            * @remarks currently only supports string
diff --git a/src/lib/components/extra/youtube.svelte b/src/lib/components/extra/youtube.svelte
index 21979c61..cc97d75d 100644
--- a/src/lib/components/extra/youtube.svelte
+++ b/src/lib/components/extra/youtube.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
   export let id: string
-  export let list: boolean = undefined
-  export let playlist: string = undefined
-  export let start: string = undefined
+  export let list: boolean | undefined = undefined
+  export let playlist: string | undefined = undefined
+  export let start: string | undefined = undefined
   export let autoplay: boolean = false
   export let disablekb: boolean = false
   export let controls: boolean = true
   export let fs = true
   export let loop = false
   const src = `https://www.youtube.com/embed/${id}?${new URLSearchParams({
-    ...(list ? { listType: 'playlist', list } : {}),
+    ...(list ? { listType: 'playlist', list: 'true' } : {}),
     ...(playlist ? { playlist } : {}),
     ...(start ? { start } : {}),
     autoplay: autoplay ? '1' : '0',
@@ -29,4 +29,4 @@
     allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
     loading="lazy"
     allowfullscreen />
-</div>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/post_action.svelte b/src/lib/components/post_action.svelte
index b8caa322..8c666311 100644
--- a/src/lib/components/post_action.svelte
+++ b/src/lib/components/post_action.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   export let post: Urara.Post
-  const actions = import.meta.glob<{ default: unknown }>('/src/lib/components/actions/*.svelte', { eager: true })
+  const actions = import.meta.glob<any>('/src/lib/components/actions/*.svelte', { eager: true, import: 'default' })
 </script>
 
 <div class="sticky top-24 hidden xl:flex flex-col gap-4 w-fit h-[calc(100vh-12rem)] ml-auto mr-8 my-8 justify-center">
   {#if Object.keys(actions).length}
     {#each Object.values(actions) as action}
-      <svelte:component this={action.default} {post} />
+      <svelte:component this={action} {post} />
     {/each}
   {/if}
-</div>
+</div>
\ No newline at end of file
diff --git a/src/lib/components/post_comment.svelte b/src/lib/components/post_comment.svelte
index a929f3c6..651f1332 100644
--- a/src/lib/components/post_comment.svelte
+++ b/src/lib/components/post_comment.svelte
@@ -3,7 +3,7 @@
   import { toSnake } from '$lib/utils/case'
   export let post: Urara.Post
   export let config: CommentConfig
-  const comments = import.meta.glob<{ default: unknown }>('/src/lib/components/comments/*.svelte', { eager: true })
+  const comments = import.meta.glob<any>('/src/lib/components/comments/*.svelte', { eager: true, import: 'default' })
   let currentComment: string | undefined = undefined
   let currentConfig: unknown | undefined = undefined
   currentComment = localStorage.getItem('comment') ?? toSnake(config.use[0])
@@ -16,6 +16,7 @@
     {#if config.use.length > 1}
       <div class="tabs w-full mb-8" class:tabs-boxed={config?.['style'] === 'boxed'}>
         {#each config.use as name}
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
           <span
             on:click={() => {
               currentComment = toSnake(name)
@@ -33,10 +34,10 @@
     {#if currentComment}
       {#key currentComment}
         <svelte:component
-          this={comments[`/src/lib/components/comments/${currentComment}.svelte`].default}
+          this={comments[`/src/lib/components/comments/${currentComment}.svelte`]}
           {post}
           config={currentConfig} />
       {/key}
     {/if}
   </div>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/src/lib/components/post_pagination.svelte b/src/lib/components/post_pagination.svelte
index 43b68348..f837ad1d 100644
--- a/src/lib/components/post_pagination.svelte
+++ b/src/lib/components/post_pagination.svelte
@@ -7,7 +7,6 @@
 <nav class="flex flex-col md:flex-row flex-warp justify-evenly">
   {#if prev}
     <div
-      href={prev.path}
       class:image-full={prev['image']}
       class:md:rounded-r-box={next && !next['image']}
       class="flex-1 card group rounded-none before:!rounded-none overflow-hidden">
@@ -34,7 +33,6 @@
   {/if}
   {#if next}
     <div
-      href={next.path}
       class:image-full={next['image']}
       class:md:rounded-l-box={prev && !prev['image']}
       class="flex-1 card group rounded-none before:!rounded-none overflow-hidden">
@@ -56,4 +54,4 @@
       </div>
     </div>
   {/if}
-</nav>
+</nav>
\ No newline at end of file
diff --git a/src/lib/components/post_toc.svelte b/src/lib/components/post_toc.svelte
index 03856656..e41a1571 100644
--- a/src/lib/components/post_toc.svelte
+++ b/src/lib/components/post_toc.svelte
@@ -55,6 +55,7 @@
     <ul dir="ltr" id="toc-list-root">
       {#each toc as { depth, title, slug }}
         <li id={`toc-item-${slug}`} class="flex flex-col">
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
           <span
             dir="ltr"
             on:click={() =>
@@ -76,4 +77,4 @@
       {/each}
     </ul>
   </nav>
-</aside>
+</aside>
\ No newline at end of file