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() {
@@ -30,11 +31,6 @@ export default class RssPlugin extends plugin {
           permission: 'master',
           priority: 100,
         },
-        {
-          reg: '^#rss列表$',
-          fnc: 'listFeeds',
-          permission: 'master',
-        },
         {
           reg: /(https?:\/\/\S+(?:\.atom|\/feed))/i,
           fnc: 'autoAddFeed',
@@ -44,20 +40,20 @@ export default class RssPlugin extends plugin {
       ],
     });
     if (!global.__rss_job_scheduled) {
-      // 默认每10分钟执行一次
+      if (ConfigControl.get()?.rss) {
         schedule.scheduleJob('*/10 * * * *', () => this.pushFeeds());
         global.__rss_job_scheduled = true;
-      logger.mark('[crystelf-rss] 定时检测任务已启动');
+      }
     }
   }
 
   /**
    * 添加rss
+   * @param e
+   * @returns {Promise<*>}
    */
   async addFeed(e) {
     const url = e.msg.replace(/^#rss添加/, '').trim();
-    if (!url) return e.reply('请输入有效的RSS链接', true);
-
     const feeds = configControl.get('feeds') || [];
     const groupId = e.group_id;
 
@@ -78,9 +74,12 @@ export default class RssPlugin extends plugin {
 
   /**
    * 自动添加
+   * @param e
+   * @returns {Promise<*|boolean>}
    */
   async autoAddFeed(e) {
-    if (!configControl.get()?.config?.rss) {
+    //if (/^#rss/i.test(e.msg.trim())) return false;
+    if (!ConfigControl.get()?.config?.rss) {
       return;
     }
     const url = e.msg.match(/(https?:\/\/\S+(?:\.atom|\/feed))/i)?.[1];
@@ -90,151 +89,87 @@ export default class RssPlugin extends plugin {
   }
 
   /**
-   * 查看当前群组订阅列表
+   * 移除rss
+   * @param e
+   * @returns {Promise<*>}
    */
-  async listFeeds(e) {
+  async removeFeed(e) {
+    const index = parseInt(e.msg.replace(/^#rss移除/, '').trim(), 10);
     const feeds = configControl.get('feeds') || [];
     const groupId = e.group_id;
-    const currentGroupFeeds = feeds
-      .map((feed, index) => ({ index, ...feed }))
-      .filter((feed) => feed.targetGroups.includes(groupId));
 
-    if (currentGroupFeeds.length === 0) {
+    if (index < 0 || index >= feeds.length) return e.reply('索引无效..', true);
-      return e.reply('当前群组暂无任何RSS订阅..', true);
-    }
 
-    const msg = [
+    feeds[index].targetGroups = feeds[index].targetGroups.filter((id) => id !== groupId);
-      `当前群组订阅列表 (${currentGroupFeeds.length})`,
+    await configControl.set('feeds', feeds);
-      ...currentGroupFeeds.map((f) => `[${f.index}] ${f.url}`),
+    return await e.reply('群已移除该订阅');
-      '----------------',
-      '提示: 使用 #rss移除+索引号 取消订阅'
-    ].join('\n');
-
-    return e.reply(msg);
   }
 
   /**
-   * 移除rss
+   * 手动拉取
+   * @param e
+   * @returns {Promise<*>}
    */
-  async removeFeed(e) {
-    const match = e.msg.match(/#rss移除\s*(\d+)/);
-    if (!match || !match[1]) {
-      return e.reply('请指定要移除的订阅索引,例如：#rss移除0', true);
-    }
-
-    const index = parseInt(match[1], 10);
-    const feeds = configControl.get('feeds') || [];
-    const groupId = e.group_id;
-    if (isNaN(index) || index < 0 || index >= feeds.length) {
-      return e.reply('索引无效,请发送 #rss列表 查看正确索引..', true);
-    }
-
-    const targetFeed = feeds[index];
-    if (!targetFeed) return e.reply('未找到该配置..', true);
-    if (!Array.isArray(targetFeed.targetGroups)) {
-      targetFeed.targetGroups = [];
-    }
-    if (!targetFeed.targetGroups.includes(groupId)) {
-      return e.reply('当前群组未订阅此源,无需移除..', true);
-    }
-    targetFeed.targetGroups = targetFeed.targetGroups.filter((id) => id !== groupId);
-    await configControl.set('feeds', feeds);
-
-    return await e.reply(`已取消订阅：${targetFeed.title || targetFeed.url}`);
-  }
-
   async pullFeedNow(e) {
     const url = e.msg.replace(/^#rss拉取/, '').trim();
-    if (!url) return e.reply('请提供RSS链接', true);
+    const latest = await rssTools.fetchFeed(url);
-
+    //logger.info(latest);
-    let latest;
-    try {
-      latest = await rssTools.fetchFeed(url);
-    } catch (err) {
-      logger.error(`[crystelf-rss] 手动拉取失败: ${err.message}`);
-      return await e.reply(`拉取失败: ${err.message}`, true);
-    }
 
     if (!latest || !latest.length) {
-      return await e.reply('拉取成功但无内容..', true);
+      return await e.reply('拉取失败或无内容..', true);
     }
 
     const post = latest[0];
+    //console.log(post);
     const tempPath = path.join(process.cwd(), 'data', `rss-test-${Date.now()}.png`);
-
-    try {
-      await e.reply(`最新文章：${post.title}\n正在生成预览...`);
     await screenshot.generateScreenshot(post, tempPath);
     await e.reply([segment.image(tempPath)]);
-    } catch (err) {
+    fs.unlinkSync(tempPath);
-      logger.error(`[crystelf-rss] 截图失败: ${err}`);
-      await e.reply('生成预览图失败..', true);
-    } finally {
-      if (fs.existsSync(tempPath)) fs.unlinkSync(tempPath);
-    }
   }
+
+  /**
+   * 检查rss更新
+   * @returns {Promise<void>}
+   */
   async pushFeeds() {
     const feeds = configControl.get('feeds') || [];
+    logger.mark(`正在检查rss流更新..`);
 
     for (const feed of feeds) {
-      let latest;
+      const latest = await rssTools.fetchFeed(feed.url);
-      try {
-        latest = await rssTools.fetchFeed(feed.url);
-      } catch (error) {
-        logger.warn(`[RSS] 自动检查 ${feed.url} 失败: ${error.message}，跳过`);
-        continue;
-      }
-
       if (!latest || !latest.length) continue;
-
+      const todayStr = new Date().toISOString().split('T')[0];
       const newItems = [];
-      const checkLimit = Math.min(latest.length, 3);
+      for (const item of latest) {
-
+        const pubDate = item.date;
-      for (let i = 0; i < checkLimit; i++) {
+        if (!pubDate) continue;
-        const item = latest[i];
+        const itemDate = new Date(pubDate).toISOString().split('T')[0];
-        if (!item.link) continue;
+        if (itemDate !== todayStr) continue;
-        const isCached = await rssCache.has(feed.url, item.link);
+        if (!(await rssCache.has(feed.url, item.link))) {
-
-        if (!isCached) {
-          const pubDate = item.date ? new Date(item.date).getTime() : Date.now();
-          if (!item.date || (Date.now() - pubDate < 172800000)) {
           newItems.push(item);
         }
       }
-      }
+      if (newItems.length) {
-
+        await rssCache.set(feed.url, newItems[0].link);
-      if (newItems.length > 0) {
-        newItems.reverse();
-        for (const post of newItems) {
-          // 写入缓存
-          await rssCache.set(feed.url, post.link);
-
         for (const groupId of feed.targetGroups) {
-            await tools.sleep(2000);
+          const post = newItems[0];
-
           const tempPath = path.join(process.cwd(), 'data', `rss-${Date.now()}.png`);
-            try {
           if (feed.screenshot) {
-                logger.info(`[crystelf-rss] 推送更新: ${post.title} -> 群 ${groupId}`);
-                // 先发个文字提示
             await Bot.pickGroup(groupId)?.sendMsg(
-                  `[RSS] ${post.feedTitle || '订阅更新'}\n${post.title}`
+              `${configControl.get('profile')?.nickName}发现了一条新的rss推送!`
+            );
+            await tools.sleep(1000);
+            //await Bot.pickGroup(groupId)?.sendMsg(`让${configControl.get('nickName')}看看内容是什么..`);
+            // TODO 通过人工智能查看内容
+            await Bot.pickGroup(groupId)?.sendMsg(
+              `[标题] ${post.title}\n[作者] ${post.author}\n[来源] ${post.feedTitle}\n正在努力截图..`
             );
-
-                // 再发图片
             await screenshot.generateScreenshot(post, tempPath);
             await Bot.pickGroup(groupId)?.sendMsg([segment.image(tempPath)]);
+            fs.unlinkSync(tempPath);
           } else {
             await Bot.pickGroup(groupId)?.sendMsg(`[RSS推送]\n${post.title}\n${post.link}`);
           }
-            } catch (err) {
-              logger.error(`[crystelf-rss] 推送消息异常: ${err.message}`);
-            } finally {
-              if (fs.existsSync(tempPath)) {
-                fs.unlinkSync(tempPath);
-              }
-            }
-          }
         }
       }
     }