koishi-plugin-wordpress-notifier 1.9.0 → 2.0.0

package/lib/index.d.ts

@@ -4,6 +4,9 @@ export declare const name = "wordpress-notifier";
 declare module 'koishi' {
     interface Tables {
         wordpress_posts: WordPressPostRecord;
+        wordpress_post_updates: WordPressPostUpdateRecord;
+        wordpress_user_registrations: WordPressUserRegistrationRecord;
+        wordpress_group_pushes: WordPressGroupPushRecord;
     }
 }
 export interface Config {
@@ -11,6 +14,8 @@ export interface Config {
     interval: number;
     targets: string[];
     enableAutoPush: boolean;
+    enableUpdatePush: boolean;
+    enableUserPush: boolean;
     mentionAll: boolean;
     maxArticles: number;
 }
@@ -21,6 +26,7 @@ export interface WordPressPost {
     };
     link: string;
     date: string;
+    modified: string;
     excerpt: {
         rendered: string;
     };
@@ -31,23 +37,37 @@ export interface WordPressPost {
 export interface WordPressUser {
     id: number;
     name: string;
-    description: string;
-    link: string;
-    avatar_urls: {
-        '24': string;
-        '48': string;
-        '96': string;
-    };
-    registered_date?: string;
-    roles?: string[];
-    slug?: string;
-    url?: string;
-    meta?: any[];
+    slug: string;
+    date: string;
+    email: string;
+    roles: string[];
 }
 export interface WordPressPostRecord {
     id: number;
     postId: number;
     pushedAt: Date;
 }
+export interface WordPressPostUpdateRecord {
+    id: number;
+    postId: number;
+    lastModified: Date;
+    pushedAt: Date;
+}
+export interface WordPressUserRegistrationRecord {
+    id: number;
+    userId: number;
+    pushedAt: Date;
+}
+export interface WordPressGroupPushRecord {
+    id: number;
+    groupId: string;
+    postId: number;
+    pushedAt: Date;
+    isUpdate: boolean;
+}
+export interface WordPressNotification {
+    type: 'post' | 'update' | 'user';
+    data: any;
+}
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -10,6 +10,8 @@ exports.Config = koishi_1.Schema.object({
     interval: koishi_1.Schema.number().default(3600000).description('检查间隔（毫秒，默认 1 小时）'),
     targets: koishi_1.Schema.array(koishi_1.Schema.string()).description('推送目标（群号或 QQ 号）'),
     enableAutoPush: koishi_1.Schema.boolean().default(true).description('是否启用自动推送'),
+    enableUpdatePush: koishi_1.Schema.boolean().default(false).description('是否启用文章更新推送'),
+    enableUserPush: koishi_1.Schema.boolean().default(false).description('是否启用新用户注册推送'),
     mentionAll: koishi_1.Schema.boolean().default(false).description('是否 @全体成员'),
     maxArticles: koishi_1.Schema.number().default(5).description('每次最多推送的文章数量')
 });
@@ -23,6 +25,36 @@ function apply(ctx, config) {
         primary: ['id'],
         autoInc: true
     });
+    ctx.model.extend('wordpress_post_updates', {
+        id: 'integer',
+        postId: 'integer',
+        lastModified: 'timestamp',
+        pushedAt: 'timestamp'
+    }, {
+        primary: ['id'],
+        autoInc: true,
+        unique: ['postId']
+    });
+    ctx.model.extend('wordpress_user_registrations', {
+        id: 'integer',
+        userId: 'integer',
+        pushedAt: 'timestamp'
+    }, {
+        primary: ['id'],
+        autoInc: true,
+        unique: ['userId']
+    });
+    ctx.model.extend('wordpress_group_pushes', {
+        id: 'integer',
+        groupId: 'string',
+        postId: 'integer',
+        pushedAt: 'timestamp',
+        isUpdate: 'boolean'
+    }, {
+        primary: ['id'],
+        autoInc: true,
+        unique: ['groupId', 'postId']
+    });
     async function fetchLatestPosts() {
         try {
             const url = `${config.wordpressUrl}/wp-json/wp/v2/posts?per_page=${config.maxArticles}&orderby=date&order=desc`;
@@ -36,43 +68,86 @@ function apply(ctx, config) {
             return [];
         }
     }
-    async function fetchUsers() {
+    async function fetchLatestUsers() {
         try {
-            // 添加 per_page=100 以获取更多用户
-            const url = `${config.wordpressUrl}/wp-json/wp/v2/users?per_page=100`;
-            ctx.logger.info(`正在获取用户信息: ${url}`);
+            const url = `${config.wordpressUrl}/wp-json/wp/v2/users?per_page=${config.maxArticles}&orderby=registered_date&order=desc`;
+            ctx.logger.info(`正在获取用户: ${url}`);
             const response = await ctx.http.get(url);
-            ctx.logger.info(`成功获取 ${response.length} 个用户`);
+            ctx.logger.info(`成功获取 ${response.length} 位用户`);
             return response;
         }
         catch (error) {
-            ctx.logger.error(`获取 WordPress 用户信息失败: ${error}`);
+            ctx.logger.error(`获取 WordPress 用户失败: ${error}`);
             return [];
         }
     }
-    async function fetchUserById(userId) {
+    async function fetchUpdatedPosts() {
         try {
-            const url = `${config.wordpressUrl}/wp-json/wp/v2/users/${userId}`;
-            ctx.logger.info(`正在获取用户信息: ${url}`);
+            const url = `${config.wordpressUrl}/wp-json/wp/v2/posts?per_page=${config.maxArticles}&orderby=modified&order=desc`;
+            ctx.logger.info(`正在获取更新文章: ${url}`);
             const response = await ctx.http.get(url);
+            ctx.logger.info(`成功获取 ${response.length} 篇更新文章`);
             return response;
         }
         catch (error) {
-            ctx.logger.error(`获取 WordPress 用户信息失败: ${error}`);
-            return null;
+            ctx.logger.error(`获取 WordPress 更新文章失败: ${error}`);
+            return [];
         }
     }
     async function isPostPushed(postId) {
         const record = await ctx.database.get('wordpress_posts', { postId });
         return record.length > 0;
     }
+    async function isUserPushed(userId) {
+        const record = await ctx.database.get('wordpress_user_registrations', { userId });
+        return record.length > 0;
+    }
+    async function getPostUpdateRecord(postId) {
+        const records = await ctx.database.get('wordpress_post_updates', { postId });
+        return records.length > 0 ? records[0] : null;
+    }
+    async function isGroupPushed(groupId, postId) {
+        const record = await ctx.database.get('wordpress_group_pushes', { groupId, postId });
+        return record.length > 0;
+    }
     async function markPostAsPushed(postId) {
         await ctx.database.create('wordpress_posts', {
             postId,
             pushedAt: new Date()
         });
     }
-    function formatPostMessage(post, mention = false) {
+    async function markUserAsPushed(userId) {
+        await ctx.database.create('wordpress_user_registrations', {
+            userId,
+            pushedAt: new Date()
+        });
+    }
+    async function updatePostUpdateRecord(postId, modifiedDate) {
+        const record = await getPostUpdateRecord(postId);
+        if (record) {
+            // Koishi database API 不支持 update 方法，使用 remove + create 代替
+            await ctx.database.remove('wordpress_post_updates', { postId });
+        }
+        await ctx.database.create('wordpress_post_updates', {
+            postId,
+            lastModified: modifiedDate,
+            pushedAt: new Date()
+        });
+    }
+    async function markGroupAsPushed(groupId, postId, isUpdate) {
+        const record = await ctx.database.get('wordpress_group_pushes', { groupId, postId });
+        if (record) {
+            // Koishi database API 不支持 update 方法，使用 remove + create 代替
+            await ctx.database.remove('wordpress_group_pushes', { groupId, postId });
+        }
+        await ctx.database.create('wordpress_group_pushes', {
+            groupId,
+            postId,
+            pushedAt: new Date(),
+            isUpdate
+        });
+    }
+    function formatPostMessage(post, mention = false, isUpdate = false) {
         // 彻底过滤 HTML 标签和非法字符，只保留安全文本
         const sanitizeText = (text) => {
             return text
@@ -84,25 +159,39 @@ function apply(ctx, config) {
         const title = sanitizeText(post.title.rendered);
         const excerpt = sanitizeText(post.excerpt.rendered).substring(0, 100);
         const date = new Date(post.date).toLocaleString('zh-CN');
+        const modifiedDate = new Date(post.modified).toLocaleString('zh-CN');
         const segments = [];
         if (mention && config.mentionAll) {
             segments.push(koishi_1.h.at('all'));
         }
         // 合并为单段文本，提升适配器兼容性
-        const message = `📝 ${title}\n📅 ${date}\n📄 ${excerpt}...\n🔗 ${post.link}`;
+        const messageType = isUpdate ? '📝 文章更新' : '📝 新文章';
+        const messageDate = isUpdate ? `📅 发布: ${date}\n� 更新: ${modifiedDate}` : `� ${date}`;
+        const message = `${messageType}\n${messageDate}\n📄 ${excerpt}...\n🔗 ${post.link}`;
         segments.push(koishi_1.h.text(message));
         return segments;
     }
-    async function pushNewPosts() {
-        if (!config.enableAutoPush) {
-            ctx.logger.info('自动推送已关闭，跳过推送');
-            return;
-        }
-        const posts = await fetchLatestPosts();
-        if (posts.length === 0) {
-            ctx.logger.info('没有获取到新文章，跳过推送');
-            return;
+    function formatUserMessage(user, mention = false) {
+        // 彻底过滤 HTML 标签和非法字符，只保留安全文本
+        const sanitizeText = (text) => {
+            return text
+                .replace(/<[^>]*>/g, '') // 移除所有 HTML 标签
+                .replace(/[\x00-\x1F\x7F]/g, '') // 移除控制字符
+                .replace(/[\s\r\n]+/g, ' ') // 标准化空白字符
+                .trim();
+        };
+        const username = sanitizeText(user.name);
+        const registerDate = new Date(user.date).toLocaleString('zh-CN');
+        const segments = [];
+        if (mention && config.mentionAll) {
+            segments.push(koishi_1.h.at('all'));
         }
+        // 合并为单段文本，提升适配器兼容性
+        const message = `👤 新用户注册\n📛 用户名: ${username}\n📅 注册时间: ${registerDate}`;
+        segments.push(koishi_1.h.text(message));
+        return segments;
+    }
+    async function pushNewPosts() {
         // 健壮获取 QQ Bot 实例，兼容多种适配器
         const getValidBot = () => {
             // 支持的 QQ 相关适配器列表
@@ -124,30 +213,113 @@ function apply(ctx, config) {
             return;
         }
         ctx.logger.info(`使用 bot ${bot.platform}:${bot.selfId} 进行推送`);
-        for (const post of posts) {
-            if (!(await isPostPushed(post.id))) {
-                const segments = formatPostMessage(post, true);
-                for (const target of config.targets) {
-                    try {
-                        // 验证目标格式，确保是有效的数字字符串
-                        const numericTarget = Number(target);
-                        if (isNaN(numericTarget)) {
-                            ctx.logger.error(`无效的目标 ${target}，必须是数字类型`);
-                            continue;
+        // 推送新文章
+        if (config.enableAutoPush) {
+            const posts = await fetchLatestPosts();
+            if (posts.length > 0) {
+                for (const post of posts) {
+                    for (const target of config.targets) {
+                        try {
+                            // 验证目标格式，确保是有效的数字字符串
+                            const numericTarget = Number(target);
+                            if (isNaN(numericTarget)) {
+                                ctx.logger.error(`无效的目标 ${target}，必须是数字类型`);
+                                continue;
+                            }
+                            // 保持字符串类型，但确保内容是有效的数字格式
+                            const stringTarget = numericTarget.toString();
+                            // 检查该群是否已推送过此文章
+                            if (!(await isGroupPushed(stringTarget, post.id))) {
+                                const segments = formatPostMessage(post, true, false);
+                                ctx.logger.info(`准备推送新文章到目标: ${stringTarget}`);
+                                await bot.sendMessage(stringTarget, segments);
+                                ctx.logger.info(`已推送新文章到 ${stringTarget}: ${post.title.rendered}`);
+                                // 标记该群已推送此文章
+                                await markGroupAsPushed(stringTarget, post.id, false);
+                            }
                         }
-                        // 保持字符串类型，但确保内容是有效的数字格式
-                        const stringTarget = numericTarget.toString();
-                        ctx.logger.info(`准备推送文章到目标: ${stringTarget}`);
-                        // 使用标准 Segment 构造兼容消息，支持多种适配器
-                        await bot.sendMessage(stringTarget, segments);
-                        ctx.logger.info(`已推送文章到 ${stringTarget}: ${post.title.rendered}`);
+                        catch (error) {
+                            ctx.logger.error(`推送新文章到 ${target} 失败: ${error}`);
+                            ctx.logger.error(`错误详情: ${JSON.stringify(error)}`);
+                        }
+                    }
+                    // 标记文章已推送（全局记录）
+                    if (!(await isPostPushed(post.id))) {
+                        await markPostAsPushed(post.id);
                     }
-                    catch (error) {
-                        ctx.logger.error(`推送文章到 ${target} 失败: ${error}`);
-                        ctx.logger.error(`错误详情: ${JSON.stringify(error)}`);
+                }
+            }
+        }
+        // 推送文章更新
+        if (config.enableUpdatePush) {
+            const posts = await fetchUpdatedPosts();
+            if (posts.length > 0) {
+                for (const post of posts) {
+                    const updateRecord = await getPostUpdateRecord(post.id);
+                    const postModifiedDate = new Date(post.modified);
+                    // 检查文章是否有更新
+                    if (!updateRecord || postModifiedDate > new Date(updateRecord.lastModified)) {
+                        for (const target of config.targets) {
+                            try {
+                                // 验证目标格式，确保是有效的数字字符串
+                                const numericTarget = Number(target);
+                                if (isNaN(numericTarget)) {
+                                    ctx.logger.error(`无效的目标 ${target}，必须是数字类型`);
+                                    continue;
+                                }
+                                // 保持字符串类型，但确保内容是有效的数字格式
+                                const stringTarget = numericTarget.toString();
+                                // 检查该群是否已推送过此文章
+                                if (await isGroupPushed(stringTarget, post.id)) {
+                                    const segments = formatPostMessage(post, true, true);
+                                    ctx.logger.info(`准备推送文章更新到目标: ${stringTarget}`);
+                                    await bot.sendMessage(stringTarget, segments);
+                                    ctx.logger.info(`已推送文章更新到 ${stringTarget}: ${post.title.rendered}`);
+                                    // 更新该群推送记录
+                                    await markGroupAsPushed(stringTarget, post.id, true);
+                                }
+                            }
+                            catch (error) {
+                                ctx.logger.error(`推送文章更新到 ${target} 失败: ${error}`);
+                                ctx.logger.error(`错误详情: ${JSON.stringify(error)}`);
+                            }
+                        }
+                        // 更新文章更新记录
+                        await updatePostUpdateRecord(post.id, postModifiedDate);
+                    }
+                }
+            }
+        }
+        // 推送新用户注册
+        if (config.enableUserPush) {
+            const users = await fetchLatestUsers();
+            if (users.length > 0) {
+                for (const user of users) {
+                    if (!(await isUserPushed(user.id))) {
+                        for (const target of config.targets) {
+                            try {
+                                // 验证目标格式，确保是有效的数字字符串
+                                const numericTarget = Number(target);
+                                if (isNaN(numericTarget)) {
+                                    ctx.logger.error(`无效的目标 ${target}，必须是数字类型`);
+                                    continue;
+                                }
+                                // 保持字符串类型，但确保内容是有效的数字格式
+                                const stringTarget = numericTarget.toString();
+                                const segments = formatUserMessage(user, true);
+                                ctx.logger.info(`准备推送新用户到目标: ${stringTarget}`);
+                                await bot.sendMessage(stringTarget, segments);
+                                ctx.logger.info(`已推送新用户到 ${stringTarget}: ${user.name}`);
+                            }
+                            catch (error) {
+                                ctx.logger.error(`推送新用户到 ${target} 失败: ${error}`);
+                                ctx.logger.error(`错误详情: ${JSON.stringify(error)}`);
+                            }
+                        }
+                        // 标记用户已推送
+                        await markUserAsPushed(user.id);
                     }
                 }
-                await markPostAsPushed(post.id);
             }
         }
     }
@@ -182,56 +354,6 @@ function apply(ctx, config) {
         }
         return message;
     });
-    ctx.command('wordpress.users', '查看站点用户列表')
-        .action(async () => {
-        ctx.logger.info('命令 wordpress.users 被调用');
-        try {
-            const users = await fetchUsers();
-            if (users.length === 0) {
-                return '暂无用户信息';
-            }
-            let message = '👥 WordPress 站点用户列表：\n\n';
-            for (const user of users) {
-                const roles = user.roles || [];
-                message += `${user.id}. ${user.name}（${roles.join(', ') || '普通用户'}）\n`;
-                message += `🔗 ${user.link}\n\n`;
-            }
-            return message;
-        }
-        catch (error) {
-            ctx.logger.error(`获取用户列表失败: ${error}`);
-            return '获取用户列表失败';
-        }
-    });
-    ctx.command('wordpress.user <id>', '查看特定用户信息')
-        .action(async ({}, userId) => {
-        ctx.logger.info(`命令 wordpress.user 被调用，用户 ID：${userId}`);
-        const id = parseInt(userId);
-        if (isNaN(id)) {
-            return '请输入有效的用户 ID';
-        }
-        try {
-            const user = await fetchUserById(id);
-            if (!user) {
-                return `未找到 ID 为 ${id} 的用户`;
-            }
-            let message = `👤 用户信息：\n\n`;
-            message += `ID: ${user.id}\n`;
-            message += `昵称: ${user.name}\n`;
-            message += `个人主页: ${user.link}\n`;
-            if (user.description) {
-                message += `简介: ${user.description.replace(/<[^>]*>/g, '')}\n`;
-            }
-            if (user.registered_date) {
-                message += `注册时间: ${new Date(user.registered_date).toLocaleString('zh-CN')}\n`;
-            }
-            return message;
-        }
-        catch (error) {
-            ctx.logger.error(`获取用户信息失败: ${error}`);
-            return '获取用户信息失败';
-        }
-    });
     ctx.command('wordpress.push', '手动推送最新文章')
         .action(async () => {
         ctx.logger.info('命令 wordpress.push 被调用');
@@ -239,24 +361,42 @@ function apply(ctx, config) {
         return '已检查并推送最新文章';
     });
     ctx.command('wordpress.status', '查看插件状态')
-        .action(() => {
+        .action(({ session }) => {
         ctx.logger.info('命令 wordpress.status 被调用');
+        // 获取当前群号，如果有的话
+        const currentGroup = session?.channelId || '未知群聊';
+        // 推送目标仅显示本群
+        const targetText = `🎯 推送目标: ${currentGroup}`;
         return `📊 WordPress 推送插件状态：
 🌐 网站地址: ${config.wordpressUrl}
 ⏰ 检查间隔: ${config.interval / 1000} 秒
-🎯 推送目标: ${config.targets.join(', ')}
+${targetText}
 🔔 自动推送: ${config.enableAutoPush ? '开启' : '关闭'}
+🔄 更新推送: ${config.enableUpdatePush ? '开启' : '关闭'}
+👤 用户推送: ${config.enableUserPush ? '开启' : '关闭'}
 📢 @全体成员: ${config.mentionAll ? '开启' : '关闭'}
 📝 最多推送: ${config.maxArticles} 篇`;
     });
+    ctx.command('wordpress.toggle-update', '切换文章更新推送开关')
+        .action(async ({ session }) => {
+        ctx.logger.info('命令 wordpress.toggle-update 被调用');
+        config.enableUpdatePush = !config.enableUpdatePush;
+        return `文章更新推送已${config.enableUpdatePush ? '开启' : '关闭'}`;
+    });
+    ctx.command('wordpress.toggle-user', '切换新用户注册推送开关')
+        .action(async ({ session }) => {
+        ctx.logger.info('命令 wordpress.toggle-user 被调用');
+        config.enableUserPush = !config.enableUserPush;
+        return `新用户注册推送已${config.enableUserPush ? '开启' : '关闭'}`;
+    });
     ctx.command('wordpress.toggle', '切换自动推送开关')
-        .action(async () => {
+        .action(async ({ session }) => {
         ctx.logger.info('命令 wordpress.toggle 被调用');
         config.enableAutoPush = !config.enableAutoPush;
         return `自动推送已${config.enableAutoPush ? '开启' : '关闭'}`;
     });
     ctx.command('wordpress.mention', '切换 @全体成员 开关')
-        .action(async () => {
+        .action(async ({ session }) => {
         ctx.logger.info('命令 wordpress.mention 被调用');
         config.mentionAll = !config.mentionAll;
         return `@全体成员 已${config.mentionAll ? '开启' : '关闭'}`;
@@ -323,13 +463,13 @@ function apply(ctx, config) {
 🔹 /wordpress.status - 查看插件状态
 🔹 /wordpress.latest - 查看最新文章
 🔹 /wordpress.list - 查看文章列表
-🔹 /wordpress.users - 查看站点用户列表
-🔹 /wordpress.user <id> - 查看特定用户信息
 🔹 /wordpress.push - 手动推送最新文章
 🔹 /wordpress.set-url <url> - 修改 WordPress 站点地址
 🔹 /wordpress.pushed - 查看已推送文章列表
 🔹 /wordpress.clean [days] - 清理旧推送记录
 🔹 /wordpress.toggle - 切换自动推送开关
+🔹 /wordpress.toggle-update - 切换文章更新推送开关
+🔹 /wordpress.toggle-user - 切换新用户注册推送开关
 🔹 /wordpress.mention - 切换 @全体成员 开关
 
 💡 提示：所有命令都需要加 / 前缀`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-wordpress-notifier",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "description": "WordPress 文章自动推送到 QQ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",