yz-yuki-plugin 1.0.2-rc.3 → 1.0.2-rc.5

package/README.md

@@ -31,19 +31,13 @@ export default defineConfig({
 2. 旧的方式安装：
 >gitee仓库：
 >```
->git clone https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
+>git clone --branch main https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
 >```
 
 >github仓库：
 >```
->git clone https://github.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
+>git clone --branch main https://github.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
 >```
-> [!NOTE]
-> 如果你的网络环境较差，无法连接到 Github，可以使用 [GitHub Proxy](https://mirror.ghproxy.com/) 提供的文件代理加速下载服务
->
-> ```
-> git clone https://mirror.ghproxy.com/https://github.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
-> ```
 
 ##### ```Yunzai-V3：```
 >gitee仓库：
@@ -129,8 +123,8 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 | --------- | ----------- | ------------ |
 ||||
 | **B站功能** | ------------------------- | ---------- |
-| 添加B站推送 | 检测up的B站动态进行推送，权限：Master。可选分类：直播、视频、图文、文章，不加分类则默认全部 | `#订阅B站推送uid` `#订阅B站图文推送uid` |
-| 取消B站推送 | 删除对应up的B站对应类型的动态推送，权限：Master，可选分类：直播、视频、图文、文章，不加分类则默认全部 | `#取消B站推送uid` `#取消B站图文推送uid` |
+| 添加B站推送 | 检测up的B站动态进行推送，权限：Master。可选分类：直播、视频、图文、文章，不加分类则默认全部 | `#订阅B站推送uid` `#订阅B站推送 图文 uid` |
+| 取消B站推送 | 删除对应up的B站对应类型的动态推送，权限：Master，可选分类：直播、视频、图文、文章，不加分类则默认全部 | `#取消B站推送uid` `#取消B站推送 图文 uid` |
 | 查看B站订阅列表 | 查看本Bot所有的B站订阅列表，权限：Bot的Master | `#B站全部订阅列表` |
 | 查看本群/私聊B站订阅列表 | 查看 本群/私聊 添加的B站订阅列表 | `#B站订阅列表` |
 | 手动推送B站订阅 | 手动触发定时推送任务，权限：Bot的Master | `#执行B站任务` |
@@ -145,8 +139,8 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 | 刷新B站临时ck | 重新获取并刷新redis缓存的未绑定自己的B站ck而自动获取的 临时B站cookie | `#刷新B站临时ck` |
 ||||
 | **微博功能** | ------------------------- | ---------- |
-| 添加微博推送 | 检测博主的微博动态进行推送，权限：Master，可选分类：视频、图文、文章，不加分类则默认全部 | `#订阅微博推送uid` `#订阅微博图文推送uid` |
-| 取消微博推送 | 删除对应博主的微博对应类型的动态推送，权限：Master，可选分类：视频、图文、文章，不加分类则默认全部 | `#取消微博推送uid` `#取消B站图文推送uid` |
+| 添加微博推送 | 检测博主的微博动态进行推送，权限：Master，可选分类：视频、图文、文章，不加分类则默认全部 | `#订阅微博推送uid` `#订阅微博推送 图文 uid` |
+| 取消微博推送 | 删除对应博主的微博对应类型的动态推送，权限：Master，可选分类：视频、图文、文章，不加分类则默认全部 | `#取消微博推送uid` `#取消B站推送 图文 uid` |
 | 查看微博订阅列表 | 查看本Bot所有的B站订阅列表，权限：Bot的Master | `#微博全部订阅列表` |
 | 查看本群/私聊微博订阅列表 | 查看 本群/私聊 添加的微博订阅列表 | `#微博订阅列表` |
 | 手动推送微博订阅 | 手动触发定时推送任务，权限：Bot的Master | `#执行微博任务` |
@@ -155,8 +149,8 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 ||||
 | **其他指令** |  |  |
 | 查看版本信息 | 查看版本信息 | `#优纪版本` |
-| 更新yuki插件 | 系统指令更新yuki插件，v4需安装yz-system | `#更新yuki-plugin` |
-| 强制更新yuki插件 | 强制更新yuki插件，v4需安装yz-system| `#强制更新yuki-plugin` |
+| 更新yuki插件 | 系统指令更新yuki插件，yunzai-next需安装yz-system | `#更新yuki-plugin` |
+| 强制更新yuki插件 | 强制更新yuki插件，yunzai-next需安装yz-system| `#强制更新yuki-plugin` |
 
 </details>
 

package/defaultConfig/help/help.yaml

@@ -60,7 +60,7 @@
       desc: "#取消微博推送(视频|文章|图文|转发)UID"
     - icon: restaurant_smoothie
       title: "#微博全部订阅列表"
-      desc: "查看本Bot所有的B站订阅列表"
+      desc: "查看本Bot所有的微博订阅列表"
     - icon: archaic_stone
       title: "#微博订阅列表"
       desc: "查看 本群/私聊 添加的微博订阅列表"
@@ -80,7 +80,7 @@
       desc: 查看版本信息
     - icon: 钓鱼
       title: "#更新yuki-plugin"
-      desc: "系统指令更新yuki插件,v4需安装yz-system"
+      desc: "系统指令更新yuki插件,yz-next需安装yz-system"
     - icon: pluie_lotus
       title: "#强制更新yuki-plugin"
-      desc: "强制更新yuki插件,v4需安装yz-system"
+      desc: "强制更新yuki插件,yz-next需安装yz-system"

package/lib/models/bilibili/bilibili.models.js

@@ -62,7 +62,7 @@ async function pollLoginQRCode(e, qrcodeKey) {
         }
         else if (data.data.code === 86101) {
             await new Promise((resolve) => setTimeout(resolve, 2000));
-            (logger ?? Bot.logger)?.mark(`yuki-yuki插件：扫码B站登录：未扫码，轮询中...`);
+            (logger ?? Bot.logger)?.mark(`优纪插件：扫码B站登录：未扫码，轮询中...`);
             return pollLoginQRCode(e, qrcodeKey);
         }
         else if (data.data.code === 86090) {
@@ -91,7 +91,7 @@ async function checkBiliLogin(e) {
         redirect: "follow",
     });
     const resData = await res.json();
-    Bot.logger?.mark(`B站动态请求code:${JSON.stringify(resData)}`);
+    Bot.logger?.debug(`B站验证登录状态:${JSON.stringify(resData)}`);
     if (resData.code === 0) {
         let uname = resData.data?.uname;
         let mid = resData.data?.mid;

package/lib/models/bilibili/bilibili.query.js

@@ -233,13 +233,13 @@ class BiliQuery {
                     desc = data?.modules?.module_dynamic?.major?.opus || {};
                     pics = desc?.pics;
                     pics = pics.map((item) => { return item?.url; }) || [];
-                    content = this.parseRichTextNodes(desc?.summary?.text) || "";
+                    content = desc?.summary?.text || "";
                 }
                 else {
                     desc = data?.modules?.module_dynamic?.desc || {};
                     pics = data?.modules?.module_dynamic?.major?.draw?.items;
                     pics = [];
-                    content = this.parseRichTextNodes(desc?.text);
+                    content = desc?.text;
                 }
                 if (!desc && !author)
                     return;
@@ -261,13 +261,13 @@ class BiliQuery {
                     pics = pics.map((item) => {
                         return item.url;
                     });
-                    content = this.parseRichTextNodes(desc?.summary?.text) || "";
+                    content = desc?.summary?.text || "";
                 }
                 else {
                     desc = data?.modules?.module_dynamic?.desc;
                     pics = data?.modules?.module_dynamic?.major?.draw?.items;
                     pics = pics.map((item) => { return item?.src; });
-                    content = this.parseRichTextNodes(desc?.text);
+                    content = desc?.text;
                 }
                 if (!desc && !pics && !author)
                     return;
@@ -296,7 +296,7 @@ class BiliQuery {
                     pics = desc?.pics;
                     pics = pics.map((item) => { return item.url; }) || [];
                     dynamicTitle = desc?.title;
-                    content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text) || "";
+                    content = desc?.summary?.text || "";
                 }
                 else {
                     desc = data?.modules?.module_dynamic?.major?.article || {};
@@ -325,7 +325,7 @@ class BiliQuery {
             case "DYNAMIC_TYPE_FORWARD":
                 author = data?.modules?.module_author;
                 desc = data?.modules?.module_dynamic?.desc || {};
-                content = this.parseRichTextNodes(desc?.text);
+                content = desc?.text;
                 if (!desc && !author)
                     return;
                 if (!data.orig)

package/lib/models/bilibili/bilibili.task.js

@@ -88,19 +88,24 @@ class BiliTask {
         for (let [key, value] of uidMap) {
             const tempDynamicList = dynamicList[key] || [];
             const willPushDynamicList = [];
+            const printedList = new Set();
             for (let dynamicItem of tempDynamicList) {
                 let author = dynamicItem?.modules?.module_author || {};
-                logger.info(`正在检测B站动态 [ ${author?.name} : ${author?.mid} ]`);
+                if (!printedList.has(author?.mid)) {
+                    logger.info(`正在检测B站动态 [ ${author?.name} : ${author?.mid} ]`);
+                    printedList.add(author?.mid);
+                }
                 if (!author?.pub_ts)
                     continue;
                 if (Number(now - author.pub_ts) > interval) {
-                    logger.info(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
+                    logger.debug(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
                     continue;
                 }
                 if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !biliConfigData.pushTransmit)
                     continue;
                 willPushDynamicList.push(dynamicItem);
             }
+            printedList.clear();
             const pushMapInfo = value || {};
             const { chatIds, bot_id, upName, type, chatType } = pushMapInfo;
             for (let pushDynamicData of willPushDynamicList) {

package/lib/models/weibo/weibo.task.js

@@ -46,20 +46,25 @@ class WeiboTask {
         for (let [key, value] of uidMap) {
             const tempDynamicList = dynamicList[key] || [];
             const willPushDynamicList = [];
+            const printedList = new Set();
             for (let dynamicItem of tempDynamicList) {
                 let raw_post = dynamicItem || {};
                 let user = raw_post?.mblog?.user || {};
-                logger.info(`正在检测微博动态 [ ${user?.screen_name} : ${user?.id} ]`);
+                if (!printedList.has(user?.id)) {
+                    logger.info(`正在检测微博动态 [ ${user?.screen_name} : ${user?.id} ]`);
+                    printedList.add(user?.id);
+                }
                 if (!raw_post?.mblog?.created_at)
                     continue;
                 if (Number(now - (WeiboQuery.getDynamicCreatetDate(raw_post) / 1000)) > interval) {
-                    logger.info(`超过间隔，跳过   [ ${user?.screen_name} : ${user?.id} ] ${raw_post?.mblog?.created_at} 的动态`);
+                    logger.debug(`超过间隔，跳过   [ ${user?.screen_name} : ${user?.id} ] ${raw_post?.mblog?.created_at} 的动态`);
                     continue;
                 }
                 if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !weiboConfigData.pushTransmit)
                     continue;
                 willPushDynamicList.push(dynamicItem);
             }
+            printedList.clear();
             const pushMapInfo = value || {};
             const { chatIds, bot_id, upName, type, chatType } = pushMapInfo;
             for (let pushDynamicData of willPushDynamicList) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.2-rc.3",
+  "version": "1.0.2-rc.5",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -23,16 +23,16 @@
   "dependencies": {
     "axios": "^1.7.3",
     "chokidar": "^3.6.0",
-    "jsdom": "^24.1.0",
+    "jsdom": "^24.1.1",
     "json5": "^2.2.3",
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
-    "puppeteer": "^22.15.0",
+    "puppeteer": "^23.0.2",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.1",
+    "react-puppeteer": "1.0.2",
     "redis": "^4.7.0",
     "yaml": "^2.5.0",
     "yarn": "^1.19.1"
@@ -44,12 +44,12 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-replace": "^5.0.7",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.3",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@types/rollup-plugin-auto-external": "^2.0.5",
     "@types/jsdom": "^21.1.7",
     "@types/lodash": "^4.17.7",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.8.5",
+    "@types/node": "^22.2.0",
     "@types/node-fetch": "^2.6.11",
     "@types/qrcode": "^1.5.5",
     "@types/react": "^18.3.3",
@@ -57,28 +57,28 @@
     "@types/yaml": "1.9.7",
     "axios": "^1.7.3",
     "chokidar": "^3.6.0",
-    "jsdom": "^24.1.0",
+    "jsdom": "^24.1.1",
     "json5": "^2.2.3",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2",
-    "nodemon": "^3.0.1",
-    "prettier": "^3.2.5",
-    "puppeteer": "^22.15.0",
+    "nodemon": "^3.1.4",
+    "prettier": "^3.3.3",
+    "puppeteer": "^23.0.2",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.1",
+    "react-puppeteer": "1.0.2",
     "redis": "^4.7.0",
     "rollup": "^4.20.0",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-ignore": "^1.0.10",
-    "tailwindcss": "^3.4.3",
+    "tailwindcss": "^3.4.9",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5",
-    "yunzai": "^1.0.1-rc.2",
-    "yunzai-mys": "^1.0.0-rc.0"
+    "typescript": "^5.5.4",
+    "yunzai": "^1.0.1-rc.5",
+    "yunzai-mys": "^1.0.0-rc.1"
   },
   "files": [
     "public",

package/resources/css/dynamic/Content.css

@@ -1,10 +1,3 @@
-@font-face {
-  font-family: "iconfont";
-  src: url("./../../fonts/iconfont.16acc2.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
-
 .content-text-title {
   margin-top: 10px;
 }
@@ -17,10 +10,6 @@
   padding-right: 20px;
 }
 
-.content-text {
-  font-family: "iconfont", Arial, sans-serif;
-}
-
 .content img {
   max-width: 100%;
   height: auto;

package/resources/css/dynamic/Footer.css

@@ -1,10 +1,3 @@
-@font-face {
-  font-family: "iconfont";
-  src: url("./../../fonts/iconfont.16acc2.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
-
 .footer {
   display: flex;
   justify-content: space-between;
@@ -31,7 +24,6 @@
   flex-direction: column;
   align-items: flex-start;
   font-size: 20px;
-  font-family: "iconfont", Arial, sans-serif;
 }
 
 .bili-logo-0 {

package/resources/css/dynamic/MainPage.css

@@ -19,14 +19,14 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "iconfont";
-  src: url("./../../fonts/iconfont.16acc2.ttf");
+  font-family: "OPSans";
+  src: url("./../../fonts/OPSans.woff2");
   font-weight: normal;
   font-style: normal;
 }
 
 body {
-  font-family: "iconfont", Arial, sans-serif;
+  font-family: "OPSans", Arial, sans-serif;
   background-color: #f9f9f9;
   margin: 0;
   padding: 0;

package/resources/css/help/help.css

@@ -19,8 +19,8 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "iconfont";
-  src: url("./../../fonts/iconfont.16acc2.ttf");
+  font-family: "OPSans";
+  src: url("./../../fonts/OPSans.woff2");
   font-weight: normal;
   font-style: normal;
 }
@@ -33,7 +33,7 @@ body::-webkit-scrollbar {
 }
 
 body {
-  font-family: "iconfont";
+  font-family: "OPSans";
   font-size: 16px;
   color: #1e1f20;
   transform: scale(1.5);
@@ -50,7 +50,7 @@ body {
 }
 
 .head_box {
-  font-family: "iconfont";
+  font-family: "OPSans";
   border-radius: 10px;
   padding: 10px 20px;
   position: relative;
@@ -178,5 +178,5 @@ body {
   text-align: center;
   font-size: 14px;
   color: rgb(0, 0, 0);
-  font-family: "iconfont";
+  font-family: "OPSans";
 }

package/resources/css/loginQrcode/Page.css

@@ -1,5 +1,13 @@
+@font-face {
+  font-family: "OPSans";
+  src: url("./../../fonts/OPSans.woff2");
+  font-weight: normal;
+  font-style: normal;
+}
+
 body {
   width: 563px !important;
+  font-family: "OPSans", Arial, sans-serif;
 }
 
 .container {

package/resources/css/version/version.css

@@ -19,8 +19,8 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "iconfont";
-  src: url("./../../fonts/iconfont.16acc2.ttf");
+  font-family: "OPSans";
+  src: url("./../../fonts/OPSans.woff2");
   font-weight: normal;
   font-style: normal;
 }
@@ -34,7 +34,7 @@ body::-webkit-scrollbar {
 
 body {
   font-size: 16px;
-  font-family: "iconfont";
+  font-family: "OPSans", Arial, sans-serif;
   transform: scale(1.5);
   transform-origin: 0 0;
   color: white;
@@ -112,5 +112,5 @@ body {
   text-align: center;
   font-size: 14px;
   color: rgb(15, 15, 15);
-  font-family: 'iconfont';
-}
+  font-family: 'OPSans';
+}