koishi-plugin-githubsth 1.0.0 → 1.0.1-beta

package/lib/commands/admin.js

@@ -3,13 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 function apply(ctx) {
     const logger = ctx.logger('githubsth');
+    const repoRegex = /^[\w-]+\/[\w-\.]+$/;
     ctx.command('githubsth.trust', '管理信任仓库', { authority: 3 })
         .alias('gh.trust');
     ctx.command('githubsth.trust.add <repo>', '添加信任仓库')
         .action(async ({ session }, repo) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
+        if (!repoRegex.test(repo))
+            return '仓库名称格式不正确 (应为 owner/repo)。';
         try {
+            // Check existence first to avoid UNIQUE constraint error log from driver
+            const existing = await ctx.database.get('github_trusted_repo', { repo });
+            if (existing.length > 0) {
+                return '该仓库已在信任列表中。';
+            }
             await ctx.database.create('github_trusted_repo', {
                 repo,
                 enabled: true,
@@ -19,7 +27,7 @@ function apply(ctx) {
             return `已添加信任仓库: ${repo}`;
         }
         catch (e) {
-            if (e.code === 'SQLITE_CONSTRAINT') { // Or handle duplicate error generically
+            if (e.code === 'SQLITE_CONSTRAINT') {
                 return '该仓库已在信任列表中。';
             }
             logger.warn(e);
@@ -30,6 +38,7 @@ function apply(ctx) {
         .action(async ({ session }, repo) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
+        // No regex check here needed strictly, but good for consistency
         const result = await ctx.database.remove('github_trusted_repo', { repo });
         if (result.matched === 0)
             return '未找到该信任仓库。';

package/lib/commands/subscribe.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 function apply(ctx) {
     const logger = ctx.logger('githubsth');
+    const repoRegex = /^[\w-]+\/[\w-\.]+$/;
     ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库')
         .alias('gh.sub')
         .action(async ({ session }, repo, eventsStr) => {
         if (!repo)
             return '请指定仓库名称 (owner/repo)。';
+        if (!repoRegex.test(repo))
+            return '仓库名称格式不正确 (应为 owner/repo)。';
         if (!session?.channelId)
             return '请在群组中使用此命令。';
         // Check trusted repo

package/lib/config.js

@@ -10,6 +10,6 @@ exports.Config = koishi_1.Schema.object({
         repo: koishi_1.Schema.string().required(),
         channelId: koishi_1.Schema.string().required(),
         platform: koishi_1.Schema.string(),
-        events: koishi_1.Schema.array(koishi_1.Schema.string()).default(['push', 'issues', 'pull_request']),
+        events: koishi_1.Schema.array(koishi_1.Schema.string()).default(['push', 'issues', 'pull_request', 'issue_comment', 'pull_request_review']),
     })).hidden().description('已废弃，请使用数据库管理订阅'),
 });

package/lib/index.d.ts

@@ -3,7 +3,6 @@ import { Config } from './config';
 export declare const name = "githubsth";
 export declare const inject: {
     required: string[];
-    optional: string[];
 };
 export * from './config';
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -50,8 +50,7 @@ const notifier_1 = require("./services/notifier");
 const formatter_1 = require("./services/formatter");
 exports.name = 'githubsth';
 exports.inject = {
-    required: ['database'],
-    optional: ['github']
+    required: ['database', 'github'],
 };
 __exportStar(require("./config"), exports);
 function apply(ctx, config) {
@@ -66,4 +65,6 @@ function apply(ctx, config) {
     ctx.plugin(commands, config);
     ctx.plugin(admin);
     ctx.plugin(subscribe);
+    // 加载成功日志
+    console.log('githubsth plugin loaded');
 }

package/lib/locales/zh-CN.d.ts

@@ -2,6 +2,9 @@ declare const _default: {
     commands: {
         githubsth: {
             description: string;
+        };
+        'githubsth.repo': {
+            description: string;
             messages: {
                 repo_info: string;
                 error: string;
@@ -9,9 +12,6 @@ declare const _default: {
                 not_found: string;
             };
         };
-        'githubsth.repo': {
-            description: string;
-        };
     };
 };
 export default _default;

package/lib/locales/zh-CN.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     commands: {
         githubsth: {
-            description: 'GitHub 交互插件',
+            description: 'GitHub 交互插件'
+        },
+        'githubsth.repo': {
+            description: '获取仓库信息',
             messages: {
                 repo_info: '仓库: {0}/{1}\n描述: {2}\nStars: {3}',
                 error: '获取信息失败: {0}',
                 specify_repo: '请指定仓库名称。',
                 not_found: '未找到仓库或无权限访问。'
             }
-        },
-        'githubsth.repo': {
-            description: '获取仓库信息'
         }
     }
 };

package/lib/services/formatter.d.ts

@@ -14,4 +14,6 @@ export declare class Formatter extends Service {
     formatRelease(payload: any): h | null;
     formatDiscussion(payload: any): h;
     formatWorkflowRun(payload: any): h | null;
+    formatIssueComment(payload: any): h | null;
+    formatPullRequestReview(payload: any): h | null;
 }

package/lib/services/formatter.js

@@ -90,5 +90,29 @@ class Formatter extends koishi_1.Service {
             (0, koishi_1.h)('text', { content: `链接: ${workflow_run.html_url}` })
         ]);
     }
+    formatIssueComment(payload) {
+        const { action, issue, comment, repository, sender } = payload;
+        if (action !== 'created')
+            return null;
+        return (0, koishi_1.h)('message', [
+            (0, koishi_1.h)('text', { content: `[GitHub] ${repository.full_name} Issue 收到新评论\n` }),
+            (0, koishi_1.h)('text', { content: `标题: #${issue.number} ${issue.title}\n` }),
+            (0, koishi_1.h)('text', { content: `评论人: ${sender.login}\n` }),
+            (0, koishi_1.h)('text', { content: `内容: ${comment.body.substring(0, 100)}${comment.body.length > 100 ? '...' : ''}\n` }),
+            (0, koishi_1.h)('text', { content: `链接: ${comment.html_url}` })
+        ]);
+    }
+    formatPullRequestReview(payload) {
+        const { action, pull_request, review, repository, sender } = payload;
+        if (action !== 'submitted')
+            return null;
+        return (0, koishi_1.h)('message', [
+            (0, koishi_1.h)('text', { content: `[GitHub] ${repository.full_name} PR 收到 Review\n` }),
+            (0, koishi_1.h)('text', { content: `标题: #${pull_request.number} ${pull_request.title}\n` }),
+            (0, koishi_1.h)('text', { content: `Reviewer: ${sender.login}\n` }),
+            (0, koishi_1.h)('text', { content: `状态: ${review.state}\n` }),
+            (0, koishi_1.h)('text', { content: `链接: ${review.html_url}` })
+        ]);
+    }
 }
 exports.Formatter = Formatter;

package/lib/services/notifier.js

@@ -18,6 +18,8 @@ class Notifier extends koishi_1.Service {
         this.ctx.on('github/release', (payload) => this.handleEvent('release', payload));
         this.ctx.on('github/discussion', (payload) => this.handleEvent('discussion', payload));
         this.ctx.on('github/workflow_run', (payload) => this.handleEvent('workflow_run', payload));
+        this.ctx.on('github/issue_comment', (payload) => this.handleEvent('issue_comment', payload));
+        this.ctx.on('github/pull_request_review', (payload) => this.handleEvent('pull_request_review', payload));
     }
     async handleEvent(event, payload) {
         const repoName = payload.repository?.full_name;
@@ -76,6 +78,12 @@ class Notifier extends koishi_1.Service {
             case 'workflow_run':
                 message = this.ctx.formatter.formatWorkflowRun(payload);
                 break;
+            case 'issue_comment':
+                message = this.ctx.formatter.formatIssueComment(payload);
+                break;
+            case 'pull_request_review':
+                message = this.ctx.formatter.formatPullRequestReview(payload);
+                break;
         }
         if (!message)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-githubsth",
-  "version": "1.0.0",
+  "version": "1.0.1-beta",
   "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -39,11 +39,10 @@
     },
     "service": {
       "required": [
-        "database"
-      ],
-      "optional": [
+        "database",
         "github"
-      ]
+      ],
+      "optional": []
     }
   }
 }