feat:添加60s功能

# Conflicts:
#	config/config.json
#	lib/config/configControl.js

apps/60s.js

@@ -0,0 +1,23 @@
+import ConfigControl from '../lib/config/configControl.js';
+
+export default class SixSecond extends plugin {
+  constructor() {
+    super({
+      name: '60s',
+      dsc: '60api,获取天下事',
+      event: 'message',
+      priority: -200,
+      rule: [
+        {
+          reg: '^(#|/)?60s|(#|/)?早报$',
+          fnc: 'six',
+        },
+      ],
+    });
+  }
+
+  async six(e) {
+    const url = `${ConfigControl.get('60s')?.url}/v2/60s?encoding=image`;
+    return e.reply(segment.image(url), true);
+  }
+}

apps/fanqie.js

@@ -117,6 +117,9 @@ export default class FanqiePlugin extends plugin {
    * 解析网页链接中的 book_id
    */
   async handleFanqieLink(e) {
+    if (!ConfigControl.get()?.fanqie) {
+      return;
+    }
     const message = e.msg.trim();
     let bookId = null;
 
@@ -137,6 +140,9 @@ export default class FanqiePlugin extends plugin {
    * 使用 #fq下载 命令下载
    */
   async downloadByBookId(e) {
+    if (!ConfigControl.get()?.fanqie) {
+      return;
+    }
     const bookId = e.msg.replace(/^#?fq下载/, '').trim();
     return this.downloadFanqieBook(e, bookId);
   }

apps/poke.js

@@ -2,9 +2,7 @@ import cfg from '../../../lib/config/config.js';
 import tool from '../components/tool.js';
 import axios from 'axios';
 import configControl from '../lib/config/configControl.js';
-
+import ConfigControl from '../lib/config/configControl.js';
-const replyPoke = configControl.get('poke')?.replyPoke;
-const nickName = configControl.get('profile')?.nickName;
 
 export default class ChuochuoPlugin extends plugin {
   constructor() {
@@ -22,6 +20,10 @@ export default class ChuochuoPlugin extends plugin {
   }
 
   async chuoyichuo(e) {
+    if (!ConfigControl.get()?.poke) {
+      return;
+    }
+
     if (cfg.masterQQ.includes(e.target_id) && e.operator_id !== e.target_id) {
       return await pokeMaster(e);
     }
@@ -60,6 +62,8 @@ async function masterPoke(e) {
 
 async function handleBotPoke(e) {
   try {
+    const replyPoke = configControl.get('poke')?.replyPoke;
+    const nickName = configControl.get('profile')?.nickName;
     const coreUrl = configControl.get(`coreConfig`)?.coreUrl;
     const targetUrl = `${coreUrl}/api/words/getText`;
     const res = await axios.post(targetUrl, {

apps/rssPush.js

@@ -6,6 +6,7 @@ import fs from 'fs';
 import rssCache from '../lib/rss/rssCache.js';
 import schedule from 'node-schedule';
 import tools from '../components/tool.js';
+import ConfigControl from '../lib/config/configControl.js';
 
 export default class RssPlugin extends plugin {
   constructor() {
@@ -39,8 +40,10 @@ export default class RssPlugin extends plugin {
       ],
     });
     if (!global.__rss_job_scheduled) {
-      schedule.scheduleJob('*/10 * * * *', () => this.pushFeeds());
+      if (ConfigControl.get()?.rss) {
-      global.__rss_job_scheduled = true;
+        schedule.scheduleJob('*/10 * * * *', () => this.pushFeeds());
+        global.__rss_job_scheduled = true;
+      }
     }
   }
 
@@ -76,6 +79,9 @@ export default class RssPlugin extends plugin {
    */
   async autoAddFeed(e) {
     //if (/^#rss/i.test(e.msg.trim())) return false;
+    if (!ConfigControl.get()?.rss) {
+      return;
+    }
     const url = e.msg.match(/(https?:\/\/\S+(?:\.atom|\/feed))/i)?.[1];
     if (!url) return false;
     e.msg = `#rss添加 ${url}`;

apps/zwa.js

@@ -13,6 +13,7 @@ import {
 } from '../constants/zwa/wordlist.js';
 import configControl from '../lib/config/configControl.js';
 import axios from 'axios';
+import ConfigControl from '../lib/config/configControl.js';
 
 const path = process.cwd();
 const getCurrentHour = () => new Date().getHours();
@@ -44,6 +45,9 @@ export class ZWA extends plugin {
   }
 
   async www(e) {
+    if (!ConfigControl.get()?.zwa) {
+      return;
+    }
     const currentHour = getCurrentHour();
     if (currentHour >= 20 && currentHour <= 23) {
       if (e.isMaster) {
@@ -104,6 +108,11 @@ export class ZWA extends plugin {
   }
 
   async zzz(e) {
+    logger.info(ConfigControl.get());
+    if (!ConfigControl.get()?.zwa) {
+      return;
+    }
+
     const currentHour = getCurrentHour();
     if (currentHour >= 0 && currentHour <= 4) {
       let text_number = Math.ceil(Math.random() * word4_list['length']);
@@ -149,6 +158,9 @@ export class ZWA extends plugin {
     }
   }
   async wuan(e) {
+    if (!ConfigControl.get()?.zwa) {
+      return;
+    }
     if (e.isMaster) {
       setTimeout(async () => {
         e.reply(['主人中午好好休息哦', segment.image(wa)], true);

config/60s.json

@@ -0,0 +1,3 @@
+{
+  "url": "https://60s.crystelf.top"
+}

config/ai.json

@@ -9,16 +9,9 @@
   "checkChat": {
     "rdNum": 2,
     "masterReply": true,
-    "userId": [
+    "userId": [],
-      114514
+    "blackGroups": [],
-    ],
+    "enableGroups": []
-    "blackGroups": [
-      114,
-      514
-    ],
-    "enableGroups": [
-      11115
-    ]
   },
   "maxMessageLength": 100
 }

config/config.json

@@ -2,5 +2,12 @@
   "debug": true,
   "core": true,
   "maxFeed": 10,
-  "adapter": "lgr"
+  "adapter": "lgr",
+  "poke": true,
+  "60s": true,
+  "fanqie": true,
+  "zwa": true,
+  "rss": true,
+  "help": true,
+  "welcome": true
 }

config/coreConfig.json

@@ -1,4 +1,4 @@
 {
-  "coreUrl": "",
+  "coreUrl": "https://core.crystelf.top",
   "token": ""
 }

lib/config/configControl.js

@@ -69,9 +69,6 @@ async function init() {
         logger.warn(`[crystelf-plugin] 读取配置文件 ${file} 失败:`, e);
       }
     }
-    if (!Array.isArray(configCache)) {
-      configCache = fc.mergeConfig(configCache, configCache.config || {});
-    }
     if (configCache.debug) {
       logger.info('[crystelf-plugin] 配置模块初始化成功..');
     }