yz-yuki-plugin 2.0.1 → 2.0.2

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.0.2
+* 优化Task加载
+
 # 2.0.1
 * 规范版本号
 * 调整渲染出图类型为webp格式，减小发送图片消息带宽压力

package/README.md

@@ -21,12 +21,12 @@
 >```
 接着修改 `yunzaijs/yunzai.config.js`，按版本选择修改方式：
 
-Yunzai-Next v4.1.28+及以上版本：
+Yunzai-Next v4.1.33+及以上版本：
 ```js
 import { defineConfig } from 'yunzai'
 export default defineConfig({
   applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
-  middlewares: ['yz-mw-runtime', 'yunzai-mys/mw']
+  middlewares: ['yunzai-mys/runtime', 'yunzai-mys/message']
 })
 ```
 

package/lib/apps/bilibili.js

@@ -1,6 +1,6 @@
 import JSON from 'json5';
 import lodash from 'lodash';
-import { Messages, setBotTask, Bot, Redis } from 'yunzai';
+import { Messages, Bot, Redis } from 'yunzai';
 import { BiliQuery } from '../models/bilibili/bilibili.query.js';
 import { BiliTask } from '../models/bilibili/bilibili.task.js';
 import Config from '../utils/config.js';
@@ -8,24 +8,12 @@ import { BiliGetWebData } from '../models/bilibili/bilibili.get.web.data.js';
 import { applyLoginQRCode, pollLoginQRCode, saveLoginCookie, postGateway, exitBiliLogin, checkBiliLogin, readSavedCookieItems, saveLocalBiliCk, readSyncCookie, getNewTempCk, readTempCk } from '../models/bilibili/bilibili.models.js';
 
 const message = new Messages('message');
-let biliConfigData = Config.getConfigData("config", "bilibili", "config");
 let biliPushData = Config.getConfigData("config", "bilibili", "push");
-setBotTask(async (Bot) => {
-    try {
-        newPushTask();
-        if (biliConfigData.pushTaskLog) {
-            Bot.logger.mark("yuki插件---B站动态推送定时任务");
-        }
-    }
-    catch (err) {
-        console.error('B站动态推送定时任务', err);
-    }
-}, biliConfigData.pushStatus ? biliConfigData.pushTime : "");
-async function newPushTask(e) {
+async function biliNewPushTask(e) {
     await new BiliTask(e).runTask();
 }
 message.use(async (e) => {
-    await newPushTask(e);
+    await biliNewPushTask(e);
 }, [/^(#|\/)(yuki|优纪)?执行(b站|B站|bili|bilibili|哔哩|哔哩哔哩)任务$/]);
 message.use(async (e) => {
     if (!e.isMaster) {

package/lib/apps/weibo.js

@@ -1,28 +1,16 @@
-import { Messages, setBotTask } from 'yunzai';
+import { Messages } from 'yunzai';
 import { WeiboQuery } from '../models/weibo/weibo.query.js';
 import { WeiboTask } from '../models/weibo/weibo.task.js';
 import Config from '../utils/config.js';
 import { WeiboGetWebData } from '../models/weibo/weibo.get.web.data.js';
 
 const message = new Messages('message');
-let weiboConfigData = Config.getConfigData("config", "weibo", "config");
 let weiboPushData = Config.getConfigData("config", "weibo", "push");
-setBotTask(async (Bot) => {
-    try {
-        await newPushTask();
-        if (weiboConfigData.pushTaskLog) {
-            Bot.logger.mark("yuki插件---微博动态推送定时任务");
-        }
-    }
-    catch (err) {
-        console.error('微博动态推送定时任务', err);
-    }
-}, weiboConfigData.pushStatus ? weiboConfigData.pushTime : "");
-async function newPushTask(e) {
+async function weiboNewPushTask(e) {
     await new WeiboTask(e).runTask();
 }
 message.use(async (e) => {
-    await newPushTask(e);
+    await weiboNewPushTask(e);
 }, [/^(#|\/)(yuki|优纪)?执行(微博|weibo|WEIBO)任务$/]);
 message.use(async (e) => {
     if (!e.isMaster) {

package/lib/index.js

@@ -1,8 +1,18 @@
 import chalk from 'chalk';
-import { applicationOptions, useEvent } from 'yunzai';
+import { applicationOptions, setBotTask, useEvent } from 'yunzai';
 import Config from './utils/config.js';
 import * as index$1 from './apps/index.js';
+import { BiliTask } from './models/bilibili/bilibili.task.js';
+import { WeiboTask } from './models/weibo/weibo.task.js';
 
+let biliConfigData = Config.getConfigData("config", "bilibili", "config");
+let weiboConfigData = Config.getConfigData("config", "weibo", "config");
+async function biliNewPushTask(e) {
+    await new BiliTask(e).runTask();
+}
+async function weiboNewPushTask(e) {
+    await new WeiboTask(e).runTask();
+}
 var index = () => {
     const rules = [];
     return applicationOptions({
@@ -23,6 +33,28 @@ var index = () => {
             logger.info(chalk.rgb(255, 245, 255)(`https://github.com/snowtafir/yuki-plugin`));
             logger.info(chalk.rgb(0, 190, 255)(`-----------------------------------------`));
             logger.info(chalk.rgb(0, 190, 255)(`★ 优纪插件加载完成了喵~`));
+            setBotTask(async (Bot) => {
+                try {
+                    biliNewPushTask();
+                    if (biliConfigData.pushTaskLog) {
+                        Bot.logger.mark("yuki插件---B站动态推送定时任务");
+                    }
+                }
+                catch (err) {
+                    console.error('B站动态推送定时任务', err);
+                }
+            }, biliConfigData.pushStatus ? biliConfigData.pushTime : "");
+            setBotTask(async (Bot) => {
+                try {
+                    await weiboNewPushTask();
+                    if (weiboConfigData.pushTaskLog) {
+                        Bot.logger.mark("yuki插件---微博动态推送定时任务");
+                    }
+                }
+                catch (err) {
+                    console.error('微博动态推送定时任务', err);
+                }
+            }, weiboConfigData.pushStatus ? weiboConfigData.pushTime : "");
         },
         async mounted(e) {
             const data = [];

package/lib/models/version/version.js

@@ -54,7 +54,7 @@ class VersionData {
             }
             return 0;
         });
-        this.cache[key] = result.slice(0, 5);
+        this.cache[key] = result.slice(0, 10);
         return this.cache[key];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",