From f1f803428a42f8fdcb3ca2ec57b17702b90f3c95 Mon Sep 17 00:00:00 2001
From: wjcjttl <wjcjttl9@gmail.com>
Date: Sat, 19 Oct 2024 21:06:59 -0400
Subject: [PATCH] =?UTF-8?q?fe:=20=E5=A6=82=E6=9E=9C=E6=9C=89=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=9A=84=E7=AD=BE=E5=88=B0=EF=BC=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=89=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/i18n/en.json                  |  1 +
 resource/i18n/zh-CN.json               |  1 +
 resource/schemas/NexusPHP/config.json  |  4 ++++
 src/options/views/Home.vue             | 17 +++++++++++++----
 src/options/views/UserDataTimeline.vue |  3 ++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/resource/i18n/en.json b/resource/i18n/en.json
index 93f375816..17c736e17 100644
--- a/resource/i18n/en.json
+++ b/resource/i18n/en.json
@@ -178,6 +178,7 @@
       "selectColumns": "Select Columns",
       "selectedTags": "Selected Tags",
       "week": "Expressed in weeks",
+      "showNotAttended": "Show not attended",
       "timeline": "Time line",
       "settings": "Settings",
       "statistic": "Statistic",
diff --git a/resource/i18n/zh-CN.json b/resource/i18n/zh-CN.json
index c0ebf1909..5a787c913 100644
--- a/resource/i18n/zh-CN.json
+++ b/resource/i18n/zh-CN.json
@@ -175,6 +175,7 @@
       "selectColumns": "过滤列",
       "selectedTags": "标签分组过滤",
       "week": "时间显示为周数",
+      "showNotAttended": "未签到的站点",
       "timeline": "时间轴",
       "settings": "参数",
       "statistic": "数据图表",
diff --git a/resource/schemas/NexusPHP/config.json b/resource/schemas/NexusPHP/config.json
index d5de48c62..4250ffb2f 100644
--- a/resource/schemas/NexusPHP/config.json
+++ b/resource/schemas/NexusPHP/config.json
@@ -81,6 +81,10 @@
         "messageCount": {
           "selector": ["td[style*='background: red'] a[href*='messages.php']", "div[style*='background: red'] a[href*='messages.php']"],
           "filters": ["query.text().match(/(\\d+)/)", "(query && query.length>=2)?parseInt(query[1]):0"]
+        },
+        "notAttended": {
+          "selector": ["a[class*='faqlink']"],
+          "filters": ["query.text().match(/(签到得|簽到得|立即签到)/)", "(query && query.length>=1)?1:0"]
         }
       }
     },
diff --git a/src/options/views/Home.vue b/src/options/views/Home.vue
index 442d8912f..9e36254e4 100644
--- a/src/options/views/Home.vue
+++ b/src/options/views/Home.vue
@@ -51,6 +51,8 @@
                 @change="updateViewOptions"></v-switch>
               <v-switch color="success" v-model="showLastUpdateTimeAsRelativeTime" :label="$t('home.showLastUpdateTimeAsRelativeTime')"
                 @change="updateViewOptions"></v-switch>
+              <v-switch color="success" v-model="showNotAttended" :label="$t('home.showNotAttended')"
+                @change="updateViewOptions"></v-switch>
             </v-container>
           </v-card>
         </v-menu>
@@ -91,12 +93,13 @@
           <!-- 站点 -->
           <td v-if="showColumn('name')" class="center">
             <v-badge color="red messageCount" overlap>
+              <!-- 有未读消息或签到消息。未读消息可以在站点设置里关闭。签到消息可以在本页顶部设置里关闭。 -->
               <template v-slot:badge v-if="
-                !props.item.disableMessageCount &&
-                props.item.user.messageCount > 0
+                (!props.item.disableMessageCount && props.item.user.messageCount > 0 ) || 
+                (showNotAttended && props.item.user.notAttended > 0)
               " :title="$t('home.newMessage')">
                 {{
-                    props.item.user.messageCount > 10
+                    (props.item.user.messageCount > 10 || props.item.user.messageCount == 0)
                       ? ""
                       : props.item.user.messageCount
                 }}
@@ -605,6 +608,7 @@ export default Vue.extend({
       showHnR: true,
       showLastUpdateTimeAsRelativeTime:true,
       showWeek: false,
+      showNotAttended: false,
     };
   },
   created() {
@@ -655,7 +659,10 @@ export default Vue.extend({
     },
     allUnReadMsgSites() {
       // @ts-ignore
-      return this.allSitesSorted.filter((site: Site) => !site.disableMessageCount && ((site.user?.messageCount || 0) > 0))
+      return this.allSitesSorted.filter((site: Site) => 
+        (!site.disableMessageCount && (site.user?.messageCount || 0) > 0) || 
+        (this.showNotAttended && (site.user?.notAttended || 0) > 0)
+      )
     },
     allTaggedSites() {
       // @ts-ignore
@@ -786,6 +793,7 @@ export default Vue.extend({
         showHnR: true,
         showLastUpdateTimeAsRelativeTime:true,
         showWeek: false,
+        showNotAttended: false,
         selectedHeaders: this.selectedHeaders,
       });
       Object.assign(this, viewOptions);
@@ -1329,6 +1337,7 @@ export default Vue.extend({
           showHnR: this.showHnR,
           showLastUpdateTimeAsRelativeTime: this.showLastUpdateTimeAsRelativeTime,
           showWeek: this.showWeek,
+          showNotAttended: this.showNotAttended,
           selectedHeaders: this.selectedHeaders,
           selectedTags: this.selectedTags,
         },
diff --git a/src/options/views/UserDataTimeline.vue b/src/options/views/UserDataTimeline.vue
index a6d07a5cd..4a2a0c27b 100644
--- a/src/options/views/UserDataTimeline.vue
+++ b/src/options/views/UserDataTimeline.vue
@@ -331,7 +331,8 @@ export default Vue.extend({
         res = res.concat(allUnTaggedSites)
       }
       if (tags.includes(ETagType.unReadMsg)) {
-        let allUnReadMsgSites = sites.filter((site: Site) => (site.user?.messageCount || 0) > 0)
+        // 有未读消息或签到消息
+        let allUnReadMsgSites = sites.filter((site: Site) => (site.user?.messageCount || 0) > 0 || (site.user?.notAttended || 0) > 0)
         res = res.concat(allUnReadMsgSites)
       }
       if (tags.includes(ETagType.statusError)) {