yz-yuki-plugin 1.0.2 → 1.0.3-rc.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.3
+* 修复群组与好友动态推送混淆问题
+* 更新获取B站up信息api
+* 优化动态字体样式
+* 优化文字动态内容排版
+* 修复转发动态内容缺失
+
 # 1.0.2
 * 新增支持获取完整文章动态内容
 * 修复宫格样式

package/README.md

@@ -2,7 +2,7 @@
 
 # YUKI-PLUGIN
 
-- 一个适用于 [Yunzai-V4 系列机器人框架](https://github.com/yunzai-org/yunzaijs/) 的B站动态和微博动态订阅推送的插件
+- 一个适用于 `Yunzai 系列机器人框架` 的B站动态和微博动态订阅推送的插件
 
 - 支持 群聊/私聊 订阅B站动态和微博动态，支持定时推送，支持手动触发推送，支持简单查询B站/微博用户信息。
 
@@ -10,12 +10,12 @@
 
 ## 🌰安装插件
 
-#### 1. 克隆仓库
-按照网络情况或个人喜好，选择克隆仓库到本地。
+#### 1. 安装方式选择
+按照网络情况或个人喜好，选择安装方式。
 
-```yunzai-v4：```
+##### ```Yunzai-Next：```
 
-1. V4 npm包 方式 安装：
+1. yunzai-next npm包 方式 安装插件：
 >```
 > yarn add yz-yuki-plugin -W
 >```
@@ -31,21 +31,15 @@ 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：```
+
+##### ```Yunzai-V3：```
 >gitee仓库：
 >```
 >git clone --branch main3 https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
@@ -57,12 +51,12 @@ export default defineConfig({
 >```
 
 #### 2. 安装依赖
-* yunzai-v4:
+* Yunzai-Next:
 ```
 yarn install
 ```
 
-* yunzai-v3:
+* Yunzai-V3:
 ```
 pnpm install --filter=yuki-plugin
 ```
@@ -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>
 
@@ -185,9 +179,9 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 
 |                              Nickname                               | Contribution            |
 | :-----------------------------------------------------------------: | ----------------------- |
-|Yunzai-V4||
-| [yunzai-org文档](https://yunzai-org.github.io/docs/)               | Yunzai Next 文档      |
-| [Yunzai-V4 仓库](https://github.com/yunzai-org/yunzaijs/)           |  Yunzai Next       |
+|Yunzai-Next||
+| [Yunzai-org文档](https://yunzai-org.github.io/docs/)               | Yunzai Next 文档      |
+| [Yunzai-Next 仓库](https://github.com/yunzai-org/yunzaijs/)           |  Yunzai Next       |
 |Yunzai-V3||
 | [功能/插件库](https://gitee.com/yhArcadia/Yunzai-Bot-plugins-index) | Yunzai-Bot 相关内容索引 |
 |       [TRSS-Yunzai](https://gitee.com/TimeRainStarSky/Yunzai)       | 时雨🌌星空的 TRSS-Yunzai |

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/apps/bilibili.js

@@ -56,14 +56,26 @@ message.use(async (e) => {
             e.reply("出了点网络问题，等会再试试吧~");
             return false;
         }
-        const resData = res.data || {};
-        if (resData.code !== 0) {
-            e.reply(`订阅校验失败~\nup主uid：${uid} 可能是无效的，或遭遇了风控，请稍后再试~`);
-            logger.mark(`yuki-plugin addDynamicSub Failed：${JSON.stringify(resData)}`);
+        const { code, data } = res.data || {};
+        if (code === -352) {
+            e.reply(`遭遇风控，订阅校验失败~\n请检查Cookie配置后再试~`);
+            logger.mark(`yuki-plugin addDynamicSub Failed：${JSON.stringify(res.data)}`);
             return true;
         }
-        const { items } = resData.data || {};
-        let name = items.length > 0 ? (items[0].modules.module_author?.name || uid) : uid;
+        const { has_more, items } = data || {};
+        if ((code === 0) && (has_more === false)) {
+            e.reply(`订阅校验失败~\nup主uid：${uid} 无效，请核对uid后再试~`);
+            return;
+        }
+        let name;
+        if (Array.isArray(items)) {
+            if (items.length > 0) {
+                name = items[0].modules?.module_author?.name || uid;
+            }
+        }
+        else {
+            name = uid;
+        }
         subData[chatType][chatId].push({
             bot_id: e.self_id,
             uid,
@@ -358,12 +370,16 @@ message.use(async (e) => {
         return;
     }
     const { code, data } = res.data || {};
-    if (code === -799) {
-        e.reply("遭遇风控：请求过于频繁，请稍后再试。");
+    if (code === -400) {
+        e.reply("获取请求错误~");
+        return;
+    }
+    else if (code === -403) {
+        e.reply("可能是Cookie过期或api参数错误，\n访问权限不足，获取失败。");
         return;
     }
     else if (code === -404) {
-        e.reply("输入的uid无效。");
+        e.reply("用户不存在，输入的uid无效。");
         return;
     }
     const message = [
@@ -372,7 +388,8 @@ message.use(async (e) => {
         `\n等级：${data?.level}`,
     ];
     if (data.live_room) {
-        message.push(`\n***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? "直播中" : "未开播"}`, `\n直播链接：${data?.live_room?.url}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
+        message.push(`***********\n---直播信息---`, `\n直播标题：${data?.live_room?.title}`, `\n直播房间：${data?.live_room?.roomid}`, `\n直播状态：${data?.live_room?.liveStatus ? "直播中" : "未开播"}`, `\n观看人数：${data?.live_room?.watched_show?.num}人`);
+        e.reply(`直播链接：${data?.live_room?.url}`);
     }
     e.reply(message);
 }, [/^(#|\/)(yuki|优纪)?(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主.*$/]);
@@ -384,17 +401,27 @@ message.use(async (e) => {
         return;
     }
     const { code, data } = await res.data || {};
-    if (code !== 0 || !data.result) {
-        e.reply("哦豁~没有搜索到该用户捏，请换个关键词试试吧~");
+    if (code === -400) {
+        e.reply("搜索请求错误~");
+        return;
+    }
+    else if (code === -412) {
+        e.reply("未配置可用Cookie，请求被拦截，请配置Cookie后再试吧~");
+        return;
+    }
+    if (!data.result) {
+        e.reply("哦豁~没有搜索到该关键词相关的up主信息，请换个关键词试试吧~");
+        return;
+    }
+    if (!Array.isArray(data.result) || !data.result.every(item => typeof item === 'object' && 'uname' in item && 'mid' in item && 'fans' in item)) {
+        e.reply("哦豁~数据格式有误，请检查后重试！");
         return;
     }
     const messages = [];
-    data.result.map((item, index) => {
-        if (index < 5) {
-            messages.push(`${item.uname}\nUID：${item.mid}\n粉丝数：${item.fans}${index < 4 ? "\n" : ""}`);
-        }
-        return item;
-    });
+    for (let index = 0; index < Math.min((data.result).length, 5); index++) {
+        const item = data.result[index];
+        messages.push(`${item.uname}\nUID：${item.mid}\n粉丝数：${item.fans}${index < 4 ? "\n" : ""}`);
+    }
     e.reply(messages.join("\n"));
 }, [/^(#|\/)(yuki|优纪)?搜索(b站|B站|bili|bilibili|哔哩|哔哩哔哩)(up|UP)主.*$/]);
 const YukiBli = message.ok;

package/lib/components/dynamic/Account.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import LogoText from './LogoText.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 const bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');

package/lib/components/dynamic/Content.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 const Content = ({ data }) => {

package/lib/components/dynamic/Footer.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ConfigController, BOT_NAME } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const botVersion = ConfigController.package?.version;
 const require = createRequire(import.meta.url);

package/lib/components/dynamic/ForwardContent.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Account from './Account.js';
 import Content from './Content.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 const ForwardContent = ({ data }) => (React.createElement(React.Fragment, null,

package/lib/components/dynamic/LogoText.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 const LogoText = ({ data }) => (React.createElement(React.Fragment, null,

package/lib/components/dynamic/MainPage.js

@@ -3,7 +3,7 @@ import Account from './Account.js';
 import Content from './Content.js';
 import ForwardContent from './ForwardContent.js';
 import Footer from './Footer.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 function App({ data }) {

package/lib/components/help/Help.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const botVersion = ConfigController.package?.version;
 const require = createRequire(import.meta.url);

package/lib/components/loginQrcode/Page.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const require = createRequire(import.meta.url);
 function App({ data }) {

package/lib/components/version/Version.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'module';
+import { createRequire } from 'react-puppeteer';
 
 const botVersion = ConfigController.package?.version;
 const require = createRequire(import.meta.url);

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

@@ -5,6 +5,7 @@ class BiliApi {
         biliSpaceUserInfo: `https://api.bilibili.com/x/space/acc/info`,
         biliSpaceUserInfoWbi: `https://api.bilibili.com/x/space/wbi/acc/info`,
         biliSearchUp: `https://api.bilibili.com/x/web-interface/search/type`,
+        biliSearchUpWbi: `https://api.bilibili.com/x/web-interface/wbi/search/type`,
         biliLiveStatus: 'https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids',
         biliCard: "https://api.bilibili.com/x/web-interface/card",
         biliStat: "https://api.bilibili.com/x/relation/stat",

package/lib/models/bilibili/bilibili.get.web.data.js

@@ -56,17 +56,20 @@ class BiliGetWebData {
         return res;
     }
     async searchBiliUserInfoByKeyword(keyword) {
-        const url = BiliApi.BILIBIL_API.biliSearchUp;
+        const url = BiliApi.BILIBIL_API.biliSearchUpWbi;
         let { cookie } = await readSyncCookie();
         const data = {
             keyword: keyword,
             page: 1,
             search_type: 'bili_user',
             order: 'totalrank',
-            pagesize: 5
         };
+        let signCookie = await readSavedCookieItems(cookie, ["SESSDATA"], false) || await readSavedCookieOtherItems(cookie, ["SESSDATA"]);
+        const { w_rid, time_stamp } = await getWbiSign(data, BiliApi.BILIBILI_HEADERS, signCookie);
         const params = {
-            ...data
+            ...data,
+            w_rid: w_rid,
+            wts: time_stamp
         };
         const res = await axios.get(url, {
             params,

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

@@ -111,7 +111,7 @@ class BiliQuery {
                 formatData.data.pubTs = moment(author.pub_ts * 1000).format("YYYY年MM月DD日 HH:mm:ss");
                 formatData.data.url = `${BiliDrawDynamicLinkUrl}${data.id_str}`;
                 formatData.data.pics = [data?.cover];
-                formatData.data.orig = this.formatDynamicData(data.orig);
+                formatData.data.orig = await this.formatDynamicData(data.orig);
                 formatData.data.category = "转发动态";
                 break;
             case "DYNAMIC_TYPE_LIVE_RCMD":
@@ -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

@@ -8,11 +8,13 @@ import { BiliQuery } from './bilibili.query.js';
 
 class BiliTask {
     taskName;
-    key;
+    groupKey;
+    privateKey;
     e;
     constructor(e) {
         this.taskName = "biliTask";
-        this.key = "Yz:yuki:bili:upPush:";
+        this.groupKey = "Yz:yuki:bili:upPush:group:";
+        this.privateKey = "Yz:yuki:bili:upPush:private:";
     }
     async hendleEventDynamicData(uid, count = 0) {
         const resp = await new BiliGetWebData().getBiliDynamicListDataByUid(uid);
@@ -50,6 +52,10 @@ class BiliTask {
     }
     async processBiliData(biliPushData, uidMap, dynamicList, lastLiveStatus) {
         for (let chatType in biliPushData) {
+            if (!uidMap.has(chatType)) {
+                uidMap.set(chatType, new Map());
+            }
+            const chatTypeMap = uidMap.get(chatType);
             for (let chatId in biliPushData[chatType]) {
                 const subUpsOfChat = biliPushData[chatType][chatId] || [];
                 for (let subInfoOfup of subUpsOfChat) {
@@ -75,41 +81,48 @@ class BiliTask {
                         logger.error(`获取 ${subInfoOfup.uid} 动态失败，resp 为空`);
                         return;
                     }
-                    const chatIds = Array.from(new Set([...Object((uidMap.get(subInfoOfup.uid) && uidMap.get(subInfoOfup.uid).chatIds) || []), chatId]));
+                    const chatIds = Array.from(new Set([...Object((chatTypeMap.get(subInfoOfup.uid) && chatTypeMap.get(subInfoOfup.uid).chatIds) || []), chatId]));
                     const bot_id = subInfoOfup.bot_id || [];
                     const { name, type } = subInfoOfup;
-                    uidMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type, chatType });
-                    await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (4000 - 1000 + 1) + 1000)));
+                    chatTypeMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type });
+                    await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (8000 - 2000 + 1) + 2000)));
                 }
             }
         }
     }
     async pushDynamicMessages(uidMap, dynamicList, now, interval, biliConfigData) {
-        for (let [key, value] of uidMap) {
-            const tempDynamicList = dynamicList[key] || [];
-            const willPushDynamicList = [];
-            for (let dynamicItem of tempDynamicList) {
-                let author = dynamicItem?.modules?.module_author || {};
-                logger.info(`正在检测B站动态 [ ${author?.name} : ${author?.mid} ]`);
-                if (!author?.pub_ts)
-                    continue;
-                if (Number(now - author.pub_ts) > interval) {
-                    logger.info(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
-                    continue;
+        for (let [chatType, chatTypeMap] of uidMap) {
+            for (let [key, value] of chatTypeMap) {
+                const tempDynamicList = dynamicList[key] || [];
+                const willPushDynamicList = [];
+                const printedList = new Set();
+                for (let dynamicItem of tempDynamicList) {
+                    let author = dynamicItem?.modules?.module_author || {};
+                    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.debug(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
+                        continue;
+                    }
+                    if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !biliConfigData.pushTransmit)
+                        continue;
+                    willPushDynamicList.push(dynamicItem);
                 }
-                if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !biliConfigData.pushTransmit)
-                    continue;
-                willPushDynamicList.push(dynamicItem);
-            }
-            const pushMapInfo = value || {};
-            const { chatIds, bot_id, upName, type, chatType } = pushMapInfo;
-            for (let pushDynamicData of willPushDynamicList) {
-                if (chatIds && chatIds.length) {
-                    for (let chatId of chatIds) {
-                        if (type && type.length && !type.includes(pushDynamicData.type))
-                            continue;
-                        await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType);
-                        await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (6500 - 2000 + 1) + 2000)));
+                printedList.clear();
+                const pushMapInfo = value || {};
+                const { chatIds, bot_id, upName, type } = pushMapInfo;
+                for (let pushDynamicData of willPushDynamicList) {
+                    if (chatIds && chatIds.length) {
+                        for (let chatId of chatIds) {
+                            if (type && type.length && !type.includes(pushDynamicData.type))
+                                continue;
+                            await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType);
+                            await new Promise((resolve) => setTimeout(resolve, Math.floor(Math.random() * (6500 - 2000 + 1) + 2000)));
+                        }
                     }
                 }
             }
@@ -117,7 +130,15 @@ class BiliTask {
     }
     async sendDynamic(chatId, bot_id, upName, pushDynamicData, biliConfigData, chatType) {
         const id_str = pushDynamicData.id_str;
-        let sended = await Redis.get(`${this.key}${chatId}:${id_str}`);
+        let sended, markKey;
+        if (chatType === "group") {
+            markKey = this.groupKey;
+            sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
+        }
+        else if (chatType === "private") {
+            markKey = this.privateKey;
+            sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
+        }
         if (sended)
             return;
         if (!!biliConfigData.pushMsgMode) {
@@ -147,7 +168,7 @@ class BiliTask {
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)
                 return;
-            Redis.set(`${this.key}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
+            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
             (logger ?? Bot.logger)?.mark("优纪插件：B站动态执行推送");
             for (let i = 0; i < imgs.length; i++) {
                 const image = imgs[i];
@@ -158,7 +179,7 @@ class BiliTask {
         }
         else {
             const dynamicMsg = await BiliQuery.formatTextDynamicData(upName, pushDynamicData, false, biliConfigData);
-            Redis.set(`${this.key}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
+            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
             if (dynamicMsg == "continue") {
                 return "return";
             }
@@ -242,7 +263,7 @@ class BiliTask {
             });
         }
         else if (chatType === "private") {
-            await (Bot[bot_id] ?? Bot)?.pickUser(String(chatId)).sendMsg(message)
+            await (Bot[bot_id] ?? Bot)?.pickFriend(String(chatId)).sendMsg(message)
                 .catch((error) => {
                 (logger ?? Bot.logger)?.error(`用户[${chatId}]推送失败：${JSON.stringify(error)}`);
             });

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

@@ -7,11 +7,13 @@ import { WeiboQuery } from './weibo.query.js';
 
 class WeiboTask {
     taskName;
-    key;
+    groupKey;
+    privateKey;
     e;
     constructor(e) {
         this.taskName = "weiboTask";
-        this.key = "Yz:yuki:weibo:upPush:";
+        this.groupKey = "Yz:yuki:weibo:upPush:group:";
+        this.privateKey = "Yz:yuki:weibo:upPush:private:";
     }
     async runTask() {
         let weiboConfigData = await Config.getUserConfig("weibo", "config");
@@ -25,6 +27,10 @@ class WeiboTask {
     }
     async processWeiboData(weiboPushData, uidMap, dynamicList) {
         for (let chatType in weiboPushData) {
+            if (!uidMap.has(chatType)) {
+                uidMap.set(chatType, new Map());
+            }
+            const chatTypeMap = uidMap.get(chatType);
             for (let chatId in weiboPushData[chatType]) {
                 const subUpsOfChat = weiboPushData[chatType][chatId] || [];
                 for (let subInfoOfup of subUpsOfChat) {
@@ -33,42 +39,49 @@ class WeiboTask {
                         const dynamicData = resp || [];
                         dynamicList[subInfoOfup.uid] = dynamicData;
                     }
-                    const chatIds = Array.from(new Set([...Object((uidMap.get(subInfoOfup.uid) && uidMap.get(subInfoOfup.uid).chatIds) || []), chatId]));
+                    const chatIds = Array.from(new Set([...Object((chatTypeMap.get(subInfoOfup.uid) && chatTypeMap.get(subInfoOfup.uid).chatIds) || []), chatId]));
                     const bot_id = subInfoOfup.bot_id || [];
                     const { name, type } = subInfoOfup;
-                    uidMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type, chatType });
+                    chatTypeMap.set(subInfoOfup.uid, { chatIds, bot_id, upName: name, type });
                     await this.randomDelay(1000, 4000);
                 }
             }
         }
     }
     async pushDynamicMessages(uidMap, dynamicList, now, interval, weiboConfigData) {
-        for (let [key, value] of uidMap) {
-            const tempDynamicList = dynamicList[key] || [];
-            const willPushDynamicList = [];
-            for (let dynamicItem of tempDynamicList) {
-                let raw_post = dynamicItem || {};
-                let user = raw_post?.mblog?.user || {};
-                logger.info(`正在检测微博动态 [ ${user?.screen_name} : ${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} 的动态`);
-                    continue;
+        for (let [chatType, chatTypeMap] of uidMap) {
+            for (let [key, value] of chatTypeMap) {
+                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 || {};
+                    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.debug(`超过间隔，跳过   [ ${user?.screen_name} : ${user?.id} ] ${raw_post?.mblog?.created_at} 的动态`);
+                        continue;
+                    }
+                    if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !weiboConfigData.pushTransmit)
+                        continue;
+                    willPushDynamicList.push(dynamicItem);
                 }
-                if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !weiboConfigData.pushTransmit)
-                    continue;
-                willPushDynamicList.push(dynamicItem);
-            }
-            const pushMapInfo = value || {};
-            const { chatIds, bot_id, upName, type, chatType } = pushMapInfo;
-            for (let pushDynamicData of willPushDynamicList) {
-                if (chatIds && chatIds.length) {
-                    for (let chatId of chatIds) {
-                        if (type && type.length && !type.includes(pushDynamicData.type))
-                            continue;
-                        await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, weiboConfigData, chatType);
-                        await this.randomDelay(2000, 10500);
+                printedList.clear();
+                const pushMapInfo = value || {};
+                const { chatIds, bot_id, upName, type } = pushMapInfo;
+                for (let pushDynamicData of willPushDynamicList) {
+                    if (chatIds && chatIds.length) {
+                        for (let chatId of chatIds) {
+                            if (type && type.length && !type.includes(pushDynamicData.type))
+                                continue;
+                            await this.sendDynamic(chatId, bot_id, upName, pushDynamicData, weiboConfigData, chatType);
+                            await this.randomDelay(2000, 10500);
+                        }
                     }
                 }
             }
@@ -76,7 +89,15 @@ class WeiboTask {
     }
     async sendDynamic(chatId, bot_id, upName, pushDynamicData, weiboConfigData, chatType) {
         const id_str = WeiboQuery.getDynamicId(pushDynamicData);
-        let sended = await Redis.get(`${this.key}${chatId}:${id_str}`);
+        let sended, markKey;
+        if (chatType === "group") {
+            markKey = this.groupKey;
+            sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
+        }
+        else if (chatType === "private") {
+            markKey = this.privateKey;
+            sended = await Redis.get(`${markKey}${chatId}:${id_str}`);
+        }
         if (sended)
             return;
         if (!!weiboConfigData.pushMsgMode) {
@@ -106,7 +127,7 @@ class WeiboTask {
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)
                 return;
-            Redis.set(`${this.key}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
+            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
             (logger ?? Bot.logger)?.mark("优纪插件：B站动态执行推送");
             for (let i = 0; i < imgs.length; i++) {
                 const image = imgs[i];
@@ -117,7 +138,7 @@ class WeiboTask {
         }
         else {
             const dynamicMsg = await WeiboQuery.formatTextDynamicData(upName, pushDynamicData, false, weiboConfigData);
-            Redis.set(`${this.key}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
+            Redis.set(`${markKey}${chatId}:${id_str}`, "1", { EX: 3600 * 10 });
             if (dynamicMsg == "continue" || dynamicMsg == false) {
                 return "return";
             }
@@ -201,7 +222,7 @@ class WeiboTask {
             });
         }
         else if (chatType === "private") {
-            await (Bot[bot_id] ?? Bot)?.pickUser(String(chatId)).sendMsg(message)
+            await (Bot[bot_id] ?? Bot)?.pickFriend(String(chatId)).sendMsg(message)
                 .catch((error) => {
                 (logger ?? Bot.logger)?.error(`用户[${chatId}]推送失败：${JSON.stringify(error)}`);
             });

package/lib/types/models/bilibili/bilibili.api.d.ts

@@ -5,6 +5,7 @@ export declare class BiliApi {
         biliSpaceUserInfo: string;
         biliSpaceUserInfoWbi: string;
         biliSearchUp: string;
+        biliSearchUpWbi: string;
         biliLiveStatus: string;
         biliCard: string;
         biliStat: string;

package/lib/types/models/bilibili/bilibili.task.d.ts

@@ -3,13 +3,14 @@ import { MainProps } from "../../components/dynamic/MainPage";
 import { ScreenshotOptions } from './../../utils/puppeteer.render';
 export declare class BiliTask {
     taskName: string;
-    key: string;
+    groupKey: string;
+    privateKey: string;
     e?: EventType;
     constructor(e?: EventType);
     hendleEventDynamicData(uid: string | number, count?: number): Promise<any>;
     runTask(): Promise<void>;
-    processBiliData(biliPushData: any, uidMap: Map<any, any>, dynamicList: any, lastLiveStatus: any): Promise<void>;
-    pushDynamicMessages(uidMap: Map<any, any>, dynamicList: any, now: number, interval: number, biliConfigData: any): Promise<void>;
+    processBiliData(biliPushData: any, uidMap: Map<any, Map<string, any>>, dynamicList: any, lastLiveStatus: any): Promise<void>;
+    pushDynamicMessages(uidMap: Map<any, Map<string, any>>, dynamicList: any, now: number, interval: number, biliConfigData: any): Promise<void>;
     sendDynamic(chatId: string | number, bot_id: string | number, upName: string, pushDynamicData: any, biliConfigData: any, chatType: string): Promise<string>;
     buildRenderData(extentData: any, urlQrcodeData: string, boxGrid: boolean): MainProps;
     renderDynamicCard(uid: string, renderData: MainProps, ScreenshotOptionsData: ScreenshotOptions): Promise<Buffer[] | null>;

package/lib/types/models/weibo/weibo.task.d.ts

@@ -3,12 +3,13 @@ import { MainProps } from "../../components/dynamic/MainPage";
 import { ScreenshotOptions } from '../../utils/puppeteer.render';
 export declare class WeiboTask {
     taskName: string;
-    key: string;
+    groupKey: string;
+    privateKey: string;
     e?: EventType;
     constructor(e?: any);
     runTask(): Promise<void>;
-    processWeiboData(weiboPushData: any, uidMap: Map<any, any>, dynamicList: any): Promise<void>;
-    pushDynamicMessages(uidMap: Map<any, any>, dynamicList: any, now: number, interval: number, weiboConfigData: any): Promise<void>;
+    processWeiboData(weiboPushData: any, uidMap: Map<any, Map<string, any>>, dynamicList: any): Promise<void>;
+    pushDynamicMessages(uidMap: Map<any, Map<string, any>>, dynamicList: any, now: number, interval: number, weiboConfigData: any): Promise<void>;
     sendDynamic(chatId: string | number, bot_id: string | number, upName: string, pushDynamicData: any, weiboConfigData: any, chatType: string): Promise<string>;
     buildRenderData(extentData: any, urlQrcodeData: string, boxGrid: boolean): MainProps;
     renderDynamicCard(uid: string | number, renderData: MainProps, ScreenshotOptionsData: ScreenshotOptions): Promise<Buffer[] | null>;

package/lib/utils/puppeteer.render.js

@@ -22,7 +22,7 @@ class YukiPuppeteerRender extends Puppeteer {
             if (Options?.header) {
                 await page.setExtraHTTPHeaders(Options.header);
             }
-            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle2"] });
+            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle0"] });
             const body = await page.$(Options?.tab ?? 'body');
             if (!body)
                 return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.2",
+  "version": "1.0.3-rc.1",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -21,19 +21,19 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "axios": "^1.7.2",
+    "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.14.0",
-    "qrcode": "^1.5.3",
+    "puppeteer": "^23.0.2",
+    "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.0-rc.7",
-    "redis": "^4.6.13",
+    "react-puppeteer": "1.0.2",
+    "redis": "^4.7.0",
     "yaml": "^2.5.0",
     "yarn": "^1.19.1"
   },
@@ -44,41 +44,41 @@
     "@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",
     "@types/react-dom": "^18.3.0",
-    "@types/rollup-plugin-auto-external": "^2.0.5",
     "@types/yaml": "1.9.7",
-    "axios": "^1.7.2",
+    "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.14.0",
-    "qrcode": "^1.5.3",
+    "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.0-rc.7",
-    "redis": "^4.6.13",
-    "rollup": "^4.16.4",
+    "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/public/output.css

@@ -1 +1 @@
-/*! tailwindcss v3.4.7 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.m-auto{margin:auto}.mb-3{margin-bottom:.75rem}.ml-7{margin-left:1.75rem}.mt-3{margin-top:.75rem}.h-10{height:2.5rem}.h-12{height:3rem}.h-72{height:18rem}.max-h-96{max-height:24rem}.w-32{width:8rem}.w-72{width:18rem}.w-96{width:24rem}.p-1{padding:.25rem}.p-5{padding:1.25rem}.text-center{text-align:center}.text-lg{font-size:1.125rem;line-height:1.75rem}.italic{font-style:italic}.text-blue-500{--tw-text-opacity:1;color:rgb(59 130 246/var(--tw-text-opacity))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity))}
+/*! tailwindcss v3.4.10 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-variation-settings:normal;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.m-auto{margin:auto}.mb-3{margin-bottom:.75rem}.ml-7{margin-left:1.75rem}.mt-3{margin-top:.75rem}.h-10{height:2.5rem}.h-12{height:3rem}.h-72{height:18rem}.max-h-96{max-height:24rem}.w-32{width:8rem}.w-72{width:18rem}.w-96{width:24rem}.p-1{padding:.25rem}.p-5{padding:1.25rem}.text-center{text-align:center}.text-lg{font-size:1.125rem;line-height:1.75rem}.italic{font-style:italic}.text-blue-500{--tw-text-opacity:1;color:rgb(59 130 246/var(--tw-text-opacity))}.text-red-600{--tw-text-opacity:1;color:rgb(220 38 38/var(--tw-text-opacity))}

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;
@@ -78,7 +78,7 @@ body {
   padding: 10px 15px;
   font-size: 12px;
   font-weight: normal;
-  font-family: "iconfont";
+  font-family: "OPSans";
   background: transparent;
   color: rgba(0, 0, 0);
 }
@@ -112,5 +112,5 @@ body {
   text-align: center;
   font-size: 14px;
   color: rgb(15, 15, 15);
-  font-family: 'iconfont';
-}
+  font-family: 'OPSans';
+}