From 2dc0ae6a299e2a21b4a1b22bda1684257a94a8ab Mon Sep 17 00:00:00 2001
From: sevichecc <91365763+Sevichecc@users.noreply.github.com>
Date: Fri, 27 Jan 2023 17:39:56 +0800
Subject: [PATCH] merge with upsteam
 https://github.com/importantimport/urara/commit/89d8512758073904372e86ae2475713d23893083

---
 src/lib/components/comments/waline.svelte | 117 ----------------------
 src/lib/components/prose/img.svelte       |  34 +++----
 src/lib/config/site.ts                    |   2 +-
 3 files changed, 17 insertions(+), 136 deletions(-)
 delete mode 100644 src/lib/components/comments/waline.svelte

diff --git a/src/lib/components/comments/waline.svelte b/src/lib/components/comments/waline.svelte
deleted file mode 100644
index 71764e6d..00000000
--- a/src/lib/components/comments/waline.svelte
+++ /dev/null
@@ -1,117 +0,0 @@
-<!-- <script lang="ts">
-  import { onMount } from 'svelte'
-  import { site } from '$lib/config/site'
-  import type { WalineConfig } from '$lib/types/post'
-
-  export let post: Urara.Post
-  export let config: WalineConfig
-
-  onMount(() => {
-    const waline = document.createElement('script')
-    const [c, s] = [document.createElement('script'), document.createElement('script')]
-    c.id = 'disqus_config'
-    c.type = 'application/javascript'
-    console.log(waline)
-    Object.entries({
-      src: 'https://unpkg.com/@waline/client@v2/dist/waline.js',
-      serverURL: config.serverURL,
-      path: config.path ?? post.path ?? window.location.pathname,
-      lang: config.lang ?? 'en',
-      emoji: config.emoji ?? ['//unpkg.com/@waline/emojis@1.0.1/weibo'],
-      dark: config.dark ?? false,
-      meta: config.meta ?? ['nick', 'mail', 'link'],
-      requiredMeta: config.requiredMeta ?? [],
-      login: config.login ?? 'enable',
-      wordLimit: config.wordLimit ?? 0,
-      pageSize: config.pageSize ?? 10,
-      imageUploader: config.imageUploader,
-      highlighter: config.highlighter,
-      texRender: config.texRender,
-      copyright: config.copyright ?? true,
-      crossorigin: 'anonymous',
-      async: ''
-    }).forEach(([key, value]) => waline.setAttribute(key, value))
-    setTimeout(() => {
-      const observer = new MutationObserver(() => {
-        document.getElementById('giscus-loading').remove()
-        observer.disconnect()
-      })
-      observer.observe(document.getElementById('giscus'), {
-        childList: true
-      })
-      document.getElementById('giscus-container').appendChild(waline)
-    }, 1000)
-  })
-</script>
-
-<link rel="stylesheet" href="https://unpkg.com/@waline/client@v2/dist/waline.css" />
-<div id="waline" class="waline-container" />
-
-<style>
-  .waline-container {
-    background-color: var(--card-background);
-    border-radius: var(--card-border-radius);
-    box-shadow: var(--shadow-l1);
-    padding: 2%;
-  }
-  .waline-container .vcount {
-    color: var(--card-text-color-main);
-  }
-  .v[data-class='v'] .vcard {
-    flex: 1;
-    width: 0;
-    padding-bottom: 0.5em;
-    border-bottom: 0; /*删掉回复下面的线*/
-  }
-  .v[data-class='v'] .vcard .vquote {
-    border-left: 1px solid rgba(237, 237, 237, 0.5);
-  }
-  @media (max-width: 580px) {
-    .v[data-class='v'] .vheader .vheader-item:not(:last-child) {
-      border-bottom: 1px solid rgba(237, 237, 237, 0.8); /*输入框分割线*/
-    }
-  }
-  /*日间模式*/
-  :root {
-    --waline-theme-color: #34495e; /*主题色，提交按钮*/
-    --waline-active-color: #246bb1; /*鼠标移到提交按钮上的颜色*/
-    /* 徽章 */
-    --waline-badge-color: #34495e; /*博主徽章色*/
-    --waline-avatar-radius: 5px;
-    --waline-avatar-size: 6rem;
-    --waline-dark-grey: #34495e; /*ID颜色*/
-    --waline-text-color: #34495e; /*字体颜色*/
-    --waline-font-size: 1.7rem; /*字体大小颜色*/
-  }
-  /*夜间模式*/
-  :root[data-scheme='dark'] {
-    --waline-theme-color: #acc6e0;
-    --waline-white: #34495e; /*按键字体颜色*/
-    --waline-active-color: #8ab1d8;
-    --waline-light-grey: #666;
-    --waline-dark-grey: #acc6e0; /*ID颜色*/
-    --waline-badge-color: #acc6e0;
-    /* 布局颜色 */
-    --waline-text-color: rgba(255, 255, 255, 0.7);
-    --waline-bgcolor: #515151;
-    --waline-bgcolor-light: #66696b; /*行内代码块颜色*/
-    --waline-border-color: #9b9c9c;
-    --waline-disable-bgcolor: #444;
-    --waline-disable-color: #272727;
-    /* 特殊颜色 */
-    --waline-bq-color: #9b9c9c; /*quote*/
-    /* 其他颜色 */
-    --waline-info-bgcolor: #acc6e0;
-    --waline-info-color: #9b9c9c;
-  }
-  .v[data-class='v'] .vcontent .vemoji {
-    width: 2.2em; /*表情包大小修改*/
-    margin: 0.25em;
-  }
-  .v[data-class='v'] .vheader {
-    border-bottom: 1px solid rgba(237, 237, 237, 0.8); /*输入框分割线*/
-  }
-  .v[data-class='v'] .vpanel {
-    border-radius: 8px; /*输入框圆角*/
-  }
-</style> -->
diff --git a/src/lib/components/prose/img.svelte b/src/lib/components/prose/img.svelte
index 75129101..63b9ab4d 100644
--- a/src/lib/components/prose/img.svelte
+++ b/src/lib/components/prose/img.svelte
@@ -1,13 +1,15 @@
 <script lang="ts">
   /* @see {@link https://github.com/sveltejs/kit/issues/241#issuecomment-1363621896} */
 
-  const images = import.meta.glob(['/static/**/*.{jpg,jpeg,png,webp,avif}', '!/static/assets'], {
-    import: 'default',
-    eager: true
-  })
+  type Image = {
+    src: string
+    w: number
+    h: number
+  }
 
-  const sources = import.meta.glob(['/static/**/*.{jpg,jpeg,png,webp,avif}', '!/static/assets'], {
+  const sources = import.meta.glob<Image[]>(['/static/**/*.{jpg,jpeg,png,webp,avif}', '!/static/assets'], {
     query: {
+      format: 'avif',
       quality: '80',
       width: '736',
       source: ''
@@ -22,18 +24,14 @@
   export let alt: string = src
   export let loading: 'eager' | 'lazy' = 'lazy'
   export let decoding: 'async' | 'sync' | 'auto' = 'async'
-
-  type Image = {
-    src: string
-    w: number
-    h: number
-  }
-
-  const image: Image = images[`/static${src}`] as any
-  const source: Image[] = sources[`/static${src}`] as any
+  let source: Image[] | undefined = sources[`/static${src}`]
 </script>
 
-<picture>
-  <source srcset={source.map(({ src, w }) => `${src} ${w}w`).join(', ')} type="image/avif" />
-  <img src={image.src} {alt} class={className ?? 'rounded-lg my-2'} {loading} {decoding} />
-</picture>
\ No newline at end of file
+{#if source}
+  <picture>
+    <source srcset={source.map(({ src, w }) => `${src} ${w}w`).join(', ')} type="image/avif" />
+    <img {src} {alt} class={className ?? 'rounded-lg my-2'} {loading} {decoding} />
+  </picture>
+{:else}
+  <img {src} {alt} class={className ?? 'rounded-lg my-2'} {loading} {decoding} />
+{/if}
\ No newline at end of file
diff --git a/src/lib/config/site.ts b/src/lib/config/site.ts
index 15a9f349..803cd4ca 100644
--- a/src/lib/config/site.ts
+++ b/src/lib/config/site.ts
@@ -1,7 +1,7 @@
 import type { SiteConfig } from '$lib/types/site'
 
 export const site: SiteConfig = {
-  protocol: import.meta.env.URARA_SITE_PROTOCOL ?? 'https://',
+  protocol: import.meta.env.URARA_SITE_PROTOCOL ?? import.meta.env.DEV ? 'http://' : 'https://',
   domain: 'seviche.cc',
   title: 'Seviche.cc',
   subtitle: 'Tech / Code / Random Life',