koishi-plugin-githubsth 1.0.1-test1 → 1.0.1-test3

package/lib/services/formatter.d.ts

@@ -1,7 +1,7 @@
 import { Context, Service, h } from 'koishi';
 declare module 'koishi' {
     interface Context {
-        formatter: Formatter;
+        githubsthFormatter: Formatter;
     }
 }
 export declare class Formatter extends Service {

package/lib/services/formatter.js

@@ -4,7 +4,7 @@ exports.Formatter = void 0;
 const koishi_1 = require("koishi");
 class Formatter extends koishi_1.Service {
     constructor(ctx) {
-        super(ctx, 'formatter');
+        super(ctx, 'githubsthFormatter');
     }
     formatPush(payload) {
         const { repository, pusher, commits, compare } = payload;

package/lib/services/notifier.d.ts

@@ -2,7 +2,7 @@ import { Context, Service } from 'koishi';
 import { Config } from '../config';
 declare module 'koishi' {
     interface Context {
-        notifier: Notifier;
+        githubsthNotifier: Notifier;
     }
 }
 export declare class Notifier extends Service {

package/lib/services/notifier.js

@@ -5,7 +5,7 @@ const koishi_1 = require("koishi");
 class Notifier extends koishi_1.Service {
     // @ts-ignore
     constructor(ctx, config) {
-        super(ctx, 'notifier', true);
+        super(ctx, 'githubsthNotifier', true);
         this.config = config;
         this.registerListeners();
     }
@@ -22,9 +22,23 @@ class Notifier extends koishi_1.Service {
         this.ctx.on('github/pull_request_review', (payload) => this.handleEvent('pull_request_review', payload));
     }
     async handleEvent(event, payload) {
-        const repoName = payload.repository?.full_name;
-        if (!repoName)
+        let repoName = payload.repository?.full_name;
+        // Try to fallback if repoName is missing
+        if (!repoName && payload.issue?.repository_url) {
+            const parts = payload.issue.repository_url.split('/');
+            if (parts.length >= 2) {
+                repoName = `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
+            }
+        }
+        if (!repoName && payload.pull_request?.base?.repo?.full_name) {
+            repoName = payload.pull_request.base.repo.full_name;
+        }
+        if (!repoName) {
+            if (this.config.debug) {
+                this.ctx.logger('notifier').warn(`Event ${event} missing repository info. Keys: ${Object.keys(payload).join(', ')}`);
+            }
             return;
+        }
         if (this.config.debug) {
             this.ctx.logger('notifier').info(`Received event ${event} for ${repoName}`);
             this.ctx.logger('notifier').debug(JSON.stringify(payload, null, 2));
@@ -56,40 +70,40 @@ class Notifier extends koishi_1.Service {
         }
         let message = null;
         // Ensure formatter is loaded
-        if (!this.ctx.formatter) {
+        if (!this.ctx.githubsthFormatter) {
             this.ctx.logger('notifier').warn('Formatter service not available');
             return;
         }
         switch (event) {
             case 'push':
-                message = this.ctx.formatter.formatPush(payload);
+                message = this.ctx.githubsthFormatter.formatPush(payload);
                 break;
             case 'issues':
-                message = this.ctx.formatter.formatIssue(payload);
+                message = this.ctx.githubsthFormatter.formatIssue(payload);
                 break;
             case 'pull_request':
-                message = this.ctx.formatter.formatPullRequest(payload);
+                message = this.ctx.githubsthFormatter.formatPullRequest(payload);
                 break;
             case 'star':
-                message = this.ctx.formatter.formatStar(payload);
+                message = this.ctx.githubsthFormatter.formatStar(payload);
                 break;
             case 'fork':
-                message = this.ctx.formatter.formatFork(payload);
+                message = this.ctx.githubsthFormatter.formatFork(payload);
                 break;
             case 'release':
-                message = this.ctx.formatter.formatRelease(payload);
+                message = this.ctx.githubsthFormatter.formatRelease(payload);
                 break;
             case 'discussion':
-                message = this.ctx.formatter.formatDiscussion(payload);
+                message = this.ctx.githubsthFormatter.formatDiscussion(payload);
                 break;
             case 'workflow_run':
-                message = this.ctx.formatter.formatWorkflowRun(payload);
+                message = this.ctx.githubsthFormatter.formatWorkflowRun(payload);
                 break;
             case 'issue_comment':
-                message = this.ctx.formatter.formatIssueComment(payload);
+                message = this.ctx.githubsthFormatter.formatIssueComment(payload);
                 break;
             case 'pull_request_review':
-                message = this.ctx.formatter.formatPullRequestReview(payload);
+                message = this.ctx.githubsthFormatter.formatPullRequestReview(payload);
                 break;
         }
         if (!message) {

package/package.json

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