koishi-plugin-githubsth 1.0.2 → 1.0.3-alpha.1

package/lib/services/notifier.d.ts

@@ -7,6 +7,7 @@ declare module 'koishi' {
 }
 export declare class Notifier extends Service {
     config: Config;
+    static inject: string[];
     constructor(ctx: Context, config: Config);
     private registerListeners;
     private handleEvent;

package/lib/services/notifier.js

@@ -11,16 +11,20 @@ class Notifier extends koishi_1.Service {
         this.registerListeners();
     }
     registerListeners() {
+        // adapter-github canonical event names
+        this.ctx.on('github/issue', (payload) => this.handleEvent('issues', payload));
+        this.ctx.on('github/issue-comment', (payload) => this.handleEvent('issue_comment', payload));
+        this.ctx.on('github/pull-request', (payload) => this.handleEvent('pull_request', payload));
+        this.ctx.on('github/workflow-run', (payload) => this.handleEvent('workflow_run', payload));
+        // Backward compatibility aliases
         this.ctx.on('github/push', (payload) => this.handleEvent('push', payload));
         this.ctx.on('github/issues', (payload) => this.handleEvent('issues', payload));
         this.ctx.on('github/pull_request', (payload) => this.handleEvent('pull_request', payload));
-        this.ctx.on('github/pull-request', (payload) => this.handleEvent('pull_request', payload));
         this.ctx.on('github/star', (payload) => this.handleEvent('star', payload));
         this.ctx.on('github/fork', (payload) => this.handleEvent('fork', payload));
         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/workflow-run', (payload) => this.handleEvent('workflow_run', payload));
         this.ctx.on('github/issue_comment', (payload) => this.handleEvent('issue_comment', 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));
@@ -50,7 +54,7 @@ class Notifier extends koishi_1.Service {
                 else if (realPayload.commits)
                     eventType = 'push';
                 else if (realPayload.starred_at !== undefined || (realPayload.action === 'started'))
-                    eventType = 'star'; // star event usually has action 'created' but check payload structure
+                    eventType = 'star';
                 else if (realPayload.forkee)
                     eventType = 'fork';
                 else if (realPayload.release)
@@ -59,7 +63,6 @@ class Notifier extends koishi_1.Service {
                     eventType = 'discussion';
                 else if (realPayload.workflow_run)
                     eventType = 'workflow_run';
-                // Handle raw star event if it has repository info directly
                 else if (realPayload.repository && (realPayload.action === 'created' || realPayload.action === 'started'))
                     eventType = 'star';
                 if (eventType !== 'unknown') {
@@ -75,19 +78,15 @@ class Notifier extends koishi_1.Service {
         if (this.config.debug) {
             this.ctx.logger('githubsth').info(`Received event: ${event}`);
         }
-        // Check if payload is nested in an 'event' object (common in some adapter versions)
-        // or if the event data is directly in payload
         const realPayload = payload.payload || payload;
-        // Extract sender from wrapper if available (adapter-github often puts it in 'actor')
         if (payload.actor && !realPayload.sender) {
-            realPayload.sender = payload.actor;
+            const actorLogin = payload.actor.login || payload.actor.name || 'GitHub';
+            realPayload.sender = { ...payload.actor, login: actorLogin };
         }
-        // Extract repository from wrapper if available
         if (payload.repository && !realPayload.repository) {
             realPayload.repository = payload.repository;
         }
         let repoName = realPayload.repository?.full_name;
-        // Try to fallback if repoName is missing
         if (!repoName && realPayload.issue?.repository_url) {
             const parts = realPayload.issue.repository_url.split('/');
             if (parts.length >= 2) {
@@ -97,33 +96,38 @@ class Notifier extends koishi_1.Service {
         if (!repoName && realPayload.pull_request?.base?.repo?.full_name) {
             repoName = realPayload.pull_request.base.repo.full_name;
         }
-        // Special handling for 'star' event (which might be 'watch' event with action 'started')
-        // The payload might be missing repository info in the main object but have it in the original session payload
+        // adapter-github eventData fields
+        if (!repoName && typeof payload.repoKey === 'string' && payload.repoKey.includes('/')) {
+            repoName = payload.repoKey;
+        }
+        if (!repoName && typeof payload.owner === 'string' && typeof payload.repo === 'string') {
+            repoName = `${payload.owner}/${payload.repo}`;
+        }
+        if (!repoName && typeof payload.repo === 'string' && payload.repo.includes('/')) {
+            repoName = payload.repo;
+        }
         if (!repoName && event === 'star') {
-            // Sometimes the repository info is at the root of the payload, not inside 'payload' property
             if (payload.repository?.full_name) {
                 repoName = payload.repository.full_name;
             }
         }
+        if (!repoName && payload.repository?.full_name) {
+            repoName = payload.repository.full_name;
+        }
         if (!repoName) {
             if (this.config.debug) {
                 this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
             }
             else if (this.config.logUnhandledEvents) {
-                // Log at warning level if repo info is missing and logUnhandledEvents is on
                 this.ctx.logger('githubsth').warn(`Missing repo info for event: ${event}. Keys: ${Object.keys(realPayload).join(', ')}`);
             }
-            // Do not return here, let patching logic handle it with defaultRepo
         }
-        // Patch realPayload with extracted repo info if missing
-        // This is crucial for formatter to work correctly as it expects repository object
         if (!realPayload.repository) {
             realPayload.repository = { full_name: repoName || 'Unknown/Repo' };
         }
         else if (!realPayload.repository.full_name) {
             realPayload.repository.full_name = repoName || 'Unknown/Repo';
         }
-        // Patch realPayload with sender info if missing (e.g. issues event)
         if (!realPayload.sender) {
             if (realPayload.issue?.user) {
                 realPayload.sender = realPayload.issue.user;
@@ -138,11 +142,9 @@ class Notifier extends koishi_1.Service {
                 realPayload.sender = { login: realPayload.pusher.name || 'Pusher' };
             }
             else {
-                // Fallback sender
                 realPayload.sender = { login: 'GitHub' };
             }
         }
-        // Comprehensive patching for specific events to prevent formatter crashes
         try {
             this.patchPayloadForEvent(event, realPayload, repoName || 'Unknown/Repo');
         }
@@ -154,10 +156,6 @@ class Notifier extends koishi_1.Service {
             this.ctx.logger('notifier').info(`Received event ${event} for ${repoName}`);
             this.ctx.logger('notifier').debug(JSON.stringify(realPayload, null, 2));
         }
-        // Get rules from database
-        // Try to match both exact name and lowercase name to handle case sensitivity
-        // If repoName is missing (undefined), we can't query rules effectively by repo name
-        // But we might want to support global subscriptions or handle it gracefully
         if (!repoName) {
             this.ctx.logger('githubsth').warn('Cannot query rules: repoName is missing');
             return;
@@ -169,8 +167,6 @@ class Notifier extends koishi_1.Service {
         const dbRules = await this.ctx.database.get('github_subscription', {
             repo: repoNames
         });
-        // Combine with config rules (if any, for backward compatibility or static rules)
-        // Also match config rules case-insensitively if needed
         const configRules = (this.config.rules || []).filter((r) => r.repo === repoName ||
             r.repo === repoName.toLowerCase() ||
             r.repo === '*');
@@ -179,7 +175,6 @@ class Notifier extends koishi_1.Service {
             ...configRules
         ];
         const matchedRules = allRules.filter(rule => {
-            // Event match
             if (!rule.events.includes('*') && !rule.events.includes(event))
                 return false;
             return true;
@@ -199,7 +194,6 @@ class Notifier extends koishi_1.Service {
             this.ctx.logger('notifier').debug(`Found ${matchedRules.length} matching rules for ${repoName}`);
         }
         let message = null;
-        // Ensure formatter is loaded
         if (!this.ctx.githubsthFormatter) {
             this.ctx.logger('notifier').warn('Formatter service not available');
             return;
@@ -259,11 +253,9 @@ class Notifier extends koishi_1.Service {
         }
     }
     patchPayloadForEvent(event, payload, repoName) {
-        // Ensure sender exists (handled before, but good for type safety)
         const defaultUser = { login: 'GitHub', id: 0, avatar_url: '' };
         if (!payload.sender)
             payload.sender = defaultUser;
-        // Ensure repository exists (handled before, but good for type safety)
         const defaultRepo = { full_name: repoName, stargazers_count: 0, html_url: `https://github.com/${repoName}` };
         if (!payload.repository)
             payload.repository = defaultRepo;
@@ -277,7 +269,6 @@ class Notifier extends koishi_1.Service {
                     payload.ref = 'refs/heads/unknown';
                 if (!payload.compare)
                     payload.compare = '';
-                // Ensure author exists in commits
                 if (payload.commits.length > 0) {
                     payload.commits.forEach((c) => {
                         if (!c.author)
@@ -294,7 +285,6 @@ class Notifier extends koishi_1.Service {
                     payload.action = 'updated';
                 if (!payload.issue)
                     payload.issue = { number: 0, title: 'Unknown Issue', html_url: '', user: payload.sender };
-                // Ensure user exists in issue
                 if (!payload.issue.user)
                     payload.issue.user = payload.sender;
                 break;
@@ -309,6 +299,8 @@ class Notifier extends koishi_1.Service {
             case 'star':
                 if (!payload.action)
                     payload.action = 'created';
+                if (payload.action === 'started')
+                    payload.action = 'created';
                 if (payload.repository && payload.repository.stargazers_count === undefined) {
                     payload.repository.stargazers_count = '?';
                 }
@@ -360,11 +352,10 @@ class Notifier extends koishi_1.Service {
         }
     }
     async sendMessage(rule, message) {
-        // Find suitable bots
         const bots = this.ctx.bots.filter(bot => {
             if (rule.platform)
                 return bot.platform === rule.platform;
-            return true; // If platform not specified, try all
+            return true;
         });
         if (bots.length === 0) {
             if (this.config.debug) {
@@ -380,7 +371,7 @@ class Notifier extends koishi_1.Service {
                 if (this.config.debug) {
                     this.ctx.logger('notifier').info(`Sent message to ${rule.channelId} via ${bot.platform}:${bot.selfId}`);
                 }
-                break; // Break on first success
+                break;
             }
             catch (e) {
                 if (this.config.debug) {
@@ -394,3 +385,4 @@ class Notifier extends koishi_1.Service {
     }
 }
 exports.Notifier = Notifier;
+Notifier.inject = ['githubsthFormatter'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-githubsth",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha.1",
   "description": "Github Subscriptions Notifications, push notifications for GitHub subscriptions For koishi",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",