From 21d30e041ad951f9aaf14710aaeac7832893c899 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Mon, 14 Oct 2024 21:01:16 +0800
Subject: [PATCH 1/5] test1

---
 reader/src/ASTRv2/content/nameline.vue | 55 +++++++++++++++-----------
 reader/src/ASTRv2/source.js            |  3 ++
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/reader/src/ASTRv2/content/nameline.vue b/reader/src/ASTRv2/content/nameline.vue
index 5ee19ce..db6374f 100644
--- a/reader/src/ASTRv2/content/nameline.vue
+++ b/reader/src/ASTRv2/content/nameline.vue
@@ -1,26 +1,19 @@
 <template>
-  <div
-    class="textblock"
-    @mousemove="showLink = true"
-    @mouseout="showLink = false"
-  >
-    <span :class="{ nameblock: true, figure: line.figure_art }">{{
-      line.attributes.name
-    }}</span>
-    <span
-      class="contentblock"
-      v-html="parseContent(line.attributes.content)"
-    ></span>
+  <div class="textblock" @mousemove="showLink = true" @mouseout="showLink = false">
+    <n-tooltip trigger="hover" :disabled="!line.figure_art">
+      <template #trigger>
+        <span :class="{ nameblock: true, figure: line.figure_art }">{{
+          line.attributes.name
+        }}</span>
+      </template>
+      <n-image :src="getCharAvgUrl()" width="100"></n-image>
+    </n-tooltip>
+
+    <span class="contentblock" v-html="parseContent(line.attributes.content)"></span>
     <n-popover trigger="manual" :show-arrow="false" :show="copied">
       <template #trigger>
-        <n-icon-wrapper
-          :size="32"
-          color="#00000000"
-          icon-color="#7f7f7f"
-          class="link"
-          v-show="showLink"
-          @click="hyperlink2line(line.id)"
-        >
+        <n-icon-wrapper :size="32" color="#00000000" icon-color="#7f7f7f" class="link" v-show="showLink"
+          @click="hyperlink2line(line.id)">
           <n-icon size="24">
             <LinkOutlined />
           </n-icon>
@@ -33,6 +26,7 @@
 
 <script>
 import func from "../func";
+import source from "../source";
 import { LinkOutlined } from "@vicons/material";
 
 export default {
@@ -96,6 +90,10 @@ export default {
         }, 1000);
       });
     },
+    getCharAvgUrl() {
+      console.log(source.getCharAvgUrl("fexli", this.line.figure_art));
+      return source.getCharAvgUrl("fexli", this.line.figure_art);
+    },
   },
 };
 </script>
@@ -105,6 +103,7 @@ export default {
   margin: 4px;
   display: flex;
 }
+
 .textblock .nameblock {
   display: flex;
   flex: 1.5 70px;
@@ -117,6 +116,7 @@ export default {
   font-weight: bold;
   color: #7f7f7f;
 }
+
 .textblock .contentblock {
   display: block;
   flex: 6 300px;
@@ -124,14 +124,20 @@ export default {
 
   margin: 2px;
 }
+
 .textblock .hideName {
   color: rgba(0, 0, 0, 0);
 }
+
 .textblock .link {
-  -webkit-user-select: none; /* Safari */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* Internet Explorer/Edge */
-  user-select: none; /* Generic */
+  -webkit-user-select: none;
+  /* Safari */
+  -moz-user-select: none;
+  /* Firefox */
+  -ms-user-select: none;
+  /* Internet Explorer/Edge */
+  user-select: none;
+  /* Generic */
 
   position: absolute;
   margin-left: -40px;
@@ -139,6 +145,7 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 .textblock .link:hover {
   color: yellow !important;
 }
diff --git a/reader/src/ASTRv2/source.js b/reader/src/ASTRv2/source.js
index 2134d78..935b489 100644
--- a/reader/src/ASTRv2/source.js
+++ b/reader/src/ASTRv2/source.js
@@ -30,4 +30,7 @@ export default {
       return `${IMAGES_SRC_REPOS[repo]}/avatar/ASSISTANT/${charId}.png`;
     }
   },
+  getCharAvgUrl(repo, charId){
+    return `${IMAGES_SRC_REPOS['Aceship']}/avg/characters/${charId}.png`;
+  }
 };

From 0299ffcad245b2317cd899189d0d346b980ae528 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Thu, 24 Oct 2024 14:43:41 +0800
Subject: [PATCH 2/5] Rewrite getCharAvgUrl

---
 reader/src/ASTRv2/content/nameline.vue  | 15 +++++++++++++--
 reader/src/ASTRv2/menupage/homepage.vue |  3 ---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/reader/src/ASTRv2/content/nameline.vue b/reader/src/ASTRv2/content/nameline.vue
index db6374f..40ddb81 100644
--- a/reader/src/ASTRv2/content/nameline.vue
+++ b/reader/src/ASTRv2/content/nameline.vue
@@ -91,8 +91,19 @@ export default {
       });
     },
     getCharAvgUrl() {
-      console.log(source.getCharAvgUrl("fexli", this.line.figure_art));
-      return source.getCharAvgUrl("fexli", this.line.figure_art);
+      // console.log(source.getCharAvgUrl("fexli", this.line.figure_art));
+      // return source.getCharAvgUrl("fexli", this.line.figure_art);
+      const match_charId_re = /([\w]+)(#\w+)?(\$?\w+)?/;
+      const charId = this.line.figure_art.match(match_charId_re)[1];
+      if (charId) {
+        // replace the '#' and '$' in figure_art with %23 and %24
+        let artId = this.line.figure_art.replace("#", "%23").replace("$", "%24");
+        let url = `https://raw.githubusercontent.com/ArknightsAssets/ArknightsAssets/refs/heads/cn/assets/torappu/dynamicassets/avg/characters/${charId}/${artId}.png`;
+        console.log(url);
+        return url;
+      } else {
+        return "https://r2.m31ns.top/img/icons/404.png";
+      }
     },
   },
 };
diff --git a/reader/src/ASTRv2/menupage/homepage.vue b/reader/src/ASTRv2/menupage/homepage.vue
index aa56ecc..629f0b8 100644
--- a/reader/src/ASTRv2/menupage/homepage.vue
+++ b/reader/src/ASTRv2/menupage/homepage.vue
@@ -257,12 +257,9 @@ export default {
       console.log(this.latestEvents);
     },
     async loadFriendLinksData() {
-      var myHeaders = new Headers();
-      myHeaders.append("User-Agent", "Apifox/1.0.0 (https://apifox.com)");
 
       var requestOptions = {
         method: 'GET',
-        headers: myHeaders,
         redirect: 'follow'
       };
 

From d8f0287156e0fd03638bc385118af11e5de61f10 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Thu, 24 Oct 2024 14:56:22 +0800
Subject: [PATCH 3/5] Update pr_test.yml

---
 .github/workflows/pr_test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 86071c4..6104692 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -4,9 +4,10 @@
 name: ASTR Webpage PR Test
 
 on:
-  pull_request:
-    branches: [ master ]
-
+  # pull_request:
+  #   branches: [ master ]
+  workflow_dispatch:
+  
 jobs:
   build:
 

From 7e4fa9b7c0b0c35ebfa428127977287a05488fa9 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Thu, 24 Oct 2024 14:58:01 +0800
Subject: [PATCH 4/5] Update pr_test.yml

---
 .github/workflows/pr_test.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
index 86071c4..6104692 100644
--- a/.github/workflows/pr_test.yml
+++ b/.github/workflows/pr_test.yml
@@ -4,9 +4,10 @@
 name: ASTR Webpage PR Test
 
 on:
-  pull_request:
-    branches: [ master ]
-
+  # pull_request:
+  #   branches: [ master ]
+  workflow_dispatch:
+  
 jobs:
   build:
 

From b2d1dfbd54c525cbd29a1222e52ff19195db7fe6 Mon Sep 17 00:00:00 2001
From: Nightsky <050644zf@outlook.com>
Date: Sun, 27 Oct 2024 16:23:31 +0800
Subject: [PATCH 5/5] Update nameline.vue

---
 reader/src/ASTRv2/content/nameline.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/reader/src/ASTRv2/content/nameline.vue b/reader/src/ASTRv2/content/nameline.vue
index 40ddb81..7e2e071 100644
--- a/reader/src/ASTRv2/content/nameline.vue
+++ b/reader/src/ASTRv2/content/nameline.vue
@@ -6,7 +6,7 @@
           line.attributes.name
         }}</span>
       </template>
-      <n-image :src="getCharAvgUrl()" width="100"></n-image>
+      <n-image :src="getCharAvgUrl()" width="100" @error="is_in_folder=false"></n-image>
     </n-tooltip>
 
     <span class="contentblock" v-html="parseContent(line.attributes.content)"></span>
@@ -37,6 +37,7 @@ export default {
       showLink: false,
       currentLang: func.l,
       copied: false,
+      is_in_folder: true,
     };
   },
   // mounted(){
@@ -98,7 +99,11 @@ export default {
       if (charId) {
         // replace the '#' and '$' in figure_art with %23 and %24
         let artId = this.line.figure_art.replace("#", "%23").replace("$", "%24");
-        let url = `https://raw.githubusercontent.com/ArknightsAssets/ArknightsAssets/refs/heads/cn/assets/torappu/dynamicassets/avg/characters/${charId}/${artId}.png`;
+        let url = "";
+        if(this.is_in_folder)
+          url = `https://raw.githubusercontent.com/ArknightsAssets/ArknightsAssets/refs/heads/cn/assets/torappu/dynamicassets/avg/characters/${charId}/${artId}.png`;
+        else
+          url = `https://raw.githubusercontent.com/ArknightsAssets/ArknightsAssets/refs/heads/cn/assets/torappu/dynamicassets/avg/characters/${artId}.png`;
         console.log(url);
         return url;
       } else {
@@ -160,4 +165,8 @@ export default {
 .textblock .link:hover {
   color: yellow !important;
 }
+
+.textblock .figure{
+  text-decoration: underline;
+}
 </style>