From ed5ba1d5a91290d26aae672848c74f51078083f7 Mon Sep 17 00:00:00 2001
From: kifuan <kifuan@foxmail.com>
Date: Sun, 14 May 2023 17:56:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9D=9E=20`random`=20=E6=97=B6?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/includes/page/flink.pug | 119 ++++++++++++++++++++-------------
 1 file changed, 74 insertions(+), 45 deletions(-)

diff --git a/layout/includes/page/flink.pug b/layout/includes/page/flink.pug
index ee4e1a2..e34f158 100644
--- a/layout/includes/page/flink.pug
+++ b/layout/includes/page/flink.pug
@@ -1,50 +1,79 @@
 #article-container
   .flink
-    script.
-      (()=>{
-        const replaceSymbol = (str) => {
-          return str.replace(/[\p{P}\p{S}]/gu, "-")
-        }
-
-        let result = ""
-        function add(str) {
-          for(let i = 0; i < str.length; i++){
-            const replaceClassName = replaceSymbol(str[i].class_name)
-            const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
-            const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
-
-            let listResult = ""
-            const lists = str[i].link_list
-            if (!{page.random === true}) {
-              lists.sort(() => Math.random() - 0.5)
-            }
-            for(let j = 0; j < lists.length; j++){
-              listResult += `
-                <div class="flink-list-item">
-                  <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
-                    <div class="flink-item-icon">
-                      <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
-                    </div>
-                    <div class="flink-item-name">${lists[j].name}</div> 
-                    <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
-                  </a>
-                </div>`
-            }
-
-            result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+    - let pageContent = page.content
+    if page.flink_url || page.random
+      script.
+        (()=>{
+                    const replaceSymbol = (str) => {
+            return str.replace(/[\p{P}\p{S}]/gu, "-")
           }
 
-          document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
-          window.lazyLoadInstance && window.lazyLoadInstance.update()
-        }
+          let result = ""
+          const add = (str) => {
+            for(let i = 0; i < str.length; i++){
+              const replaceClassName = replaceSymbol(str[i].class_name)
+              const className = str[i].class_name ? `<h2 id="${replaceClassName}"><a href="#${replaceClassName}" class="headerlink" title="${str[i].class_name}"></a>${str[i].class_name}</h2>` : ""
+              const classDesc = str[i].class_desc ? `<div class="flink-desc">${str[i].class_desc}</div>` : ""
 
-        const linkData = !{JSON.stringify(site.data.link)}
-        if ("!{page.flink_url}") {
-          fetch("!{url_for(page.flink_url)}")
-            .then(response => response.json())
-            .then(add)
-        } else if (linkData) {
-          add(linkData)
-        }
-      })()
-    != page.content
+              let listResult = ""
+              const lists = str[i].link_list
+              if (!{page.random === true}) {
+                lists.sort(() => Math.random() - 0.5)
+              }
+              for(let j = 0; j < lists.length; j++){
+                listResult += `
+                  <div class="flink-list-item">
+                    <a href="${lists[j].link}" title="${lists[j].name}" target="_blank">
+                      <div class="flink-item-icon">
+                        <img class="no-lightbox" src="${lists[j].avatar}" onerror='this.onerror=null;this.src="!{url_for(theme.error_img.flink)}"' alt="${lists[j].name}" />
+                      </div>
+                      <div class="flink-item-name">${lists[j].name}</div> 
+                      <div class="flink-item-desc" title="${lists[j].descr}">${lists[j].descr}</div>
+                    </a>
+                  </div>`
+              }
+
+              result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+            }
+
+            document.querySelector(".flink").insertAdjacentHTML("afterbegin", result)
+            window.lazyLoadInstance && window.lazyLoadInstance.update()
+          }
+
+          const linkData = !{JSON.stringify(site.data.link)}
+          if ("!{page.flink_url}") {
+            fetch("!{url_for(page.flink_url)}")
+              .then(response => response.json())
+              .then(add)
+          } else if (linkData) {
+            add(linkData)
+          }
+        })()
+
+    else
+      if site.data.link
+        - let result = ""
+        each i in site.data.link
+          - let className = i.class_name ? markdown(`## ${i.class_name}`) : ""
+          - let classDesc = i.class_desc ? `<div class="flink-desc">${i.class_desc}</div>` : ""
+
+          - let listResult = ""
+
+          each j in i.link_list
+            - 
+              listResult += `
+                <div class="flink-list-item">
+                  <a href="${j.link}" title="${j.name}" target="_blank">
+                    <div class="flink-item-icon">
+                      <img class="no-lightbox" src="${j.avatar}" onerror='this.onerror=null;this.src="${url_for(theme.error_img.flink)}"' alt="${j.name}" />
+                    </div>
+                    <div class="flink-item-name">${j.name}</div> 
+                    <div class="flink-item-desc" title="${j.descr}">${j.descr}</div>
+                  </a>
+                </div>`
+            -
+
+          - result += `${className}${classDesc} <div class="flink-list">${listResult}</div>`
+
+        - pageContent = result + pageContent
+    != pageContent