koishi-plugin-githubsth 1.0.4 → 1.0.5-alpha.1

package/lib/commands/render.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 const modes = ['text', 'image', 'auto'];
-const themes = ['compact', 'card', 'terminal'];
 const events = ['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'star', 'fork', 'release', 'discussion', 'workflow_run'];
 function apply(ctx, config) {
     ctx.command('githubsth.render', '通知渲染设置（文本/图片）', { authority: 3 })
@@ -13,7 +12,7 @@ function apply(ctx, config) {
         return [
             `mode: ${status.mode} (configured: ${status.configuredMode})`,
             `fallback: ${status.fallback}`,
-            `theme: ${status.theme}`,
+            `theme(default): ${status.theme}`,
             `width: ${status.width}`,
             `timeout: ${status.timeoutMs}ms`,
             `puppeteer: ${status.hasPuppeteer ? 'ready' : 'missing'}`,
@@ -27,13 +26,14 @@ function apply(ctx, config) {
         ctx.githubsthNotifier.setRenderMode(mode);
         return `已切换运行时渲染模式为 ${mode}（重启后恢复配置值 ${config.renderMode}）。`;
     });
-    ctx.command('githubsth.render.theme <theme:string>', '切换图片主题（compact/card/terminal）', { authority: 3 })
+    ctx.command('githubsth.render.theme <theme:string>', '设置全局默认主题', { authority: 3 })
         .action(async (_, theme) => {
-        if (!theme || !themes.includes(theme)) {
-            return `无效主题。可选：${themes.join(', ')}`;
+        const normalized = ctx.githubsthNotifier.normalizeTheme(theme);
+        if (!normalized) {
+            return `无效主题。请使用 githubsth.render.themes 查看可用主题。`;
         }
-        config.renderTheme = theme;
-        return `已切换图片主题为 ${theme}（当前进程生效）。`;
+        config.renderTheme = normalized;
+        return `已设置全局默认主题为 ${normalized}（当前进程生效）。`;
     });
     ctx.command('githubsth.render.width <width:number>', '设置图片宽度', { authority: 3 })
         .action(async (_, width) => {
@@ -43,13 +43,72 @@ function apply(ctx, config) {
         config.renderWidth = normalized;
         return `已设置图片宽度为 ${normalized}px（当前进程生效）。`;
     });
-    ctx.command('githubsth.render.preview [event:string]', '预览通知渲染', { authority: 3 })
-        .action(async ({ session }, event) => {
-        const selected = event && events.includes(event) ? event : 'issue_comment';
+    ctx.command('githubsth.render.themes', '查看主题列表', { authority: 3 })
+        .action(async () => {
+        const themes = ctx.githubsthNotifier.listThemes();
+        return `可用主题:\n- ${themes.join('\n- ')}`;
+    });
+    ctx.command('githubsth.render.preview [event:string] [theme:string]', '预览通知渲染', { authority: 3 })
+        .action(async ({ session }, event, theme) => {
+        const selectedEvent = event && events.includes(event) ? event : 'issue_comment';
         if (event && !events.includes(event)) {
             await session?.send(`未知事件 ${event}，已改用默认事件 issue_comment。`);
         }
-        const preview = await ctx.githubsthNotifier.renderPreview(selected);
+        const normalizedTheme = theme ? ctx.githubsthNotifier.normalizeTheme(theme) : null;
+        if (theme && !normalizedTheme) {
+            await session?.send(`未知主题 ${theme}，将使用默认主题。`);
+        }
+        const preview = await ctx.githubsthNotifier.renderPreview(selectedEvent, normalizedTheme || undefined);
         return preview || '预览失败：请检查 puppeteer 或渲染配置。';
     });
+    ctx.command('githubsth.render.repo-theme <repo:string> <theme:string>', '为当前频道某订阅设置单独主题', { authority: 3 })
+        .action(async ({ session }, repo, theme) => {
+        if (!repo)
+            return '请提供仓库（owner/repo）。';
+        if (!session?.channelId)
+            return '请在群聊/频道中执行该命令。';
+        const normalized = ctx.githubsthNotifier.normalizeTheme(theme);
+        if (!normalized)
+            return '主题不存在，请先执行 githubsth.render.themes。';
+        const target = await ctx.database.get('github_subscription', {
+            repo,
+            channelId: session.channelId,
+            platform: session.platform || 'unknown',
+        });
+        if (!target.length)
+            return '当前频道没有该仓库订阅。';
+        await ctx.database.set('github_subscription', { id: target[0].id }, { renderTheme: normalized });
+        return `已为 ${repo} 设置专属主题：${normalized}`;
+    });
+    ctx.command('githubsth.render.repo-theme.clear <repo:string>', '清除当前频道某订阅的专属主题', { authority: 3 })
+        .action(async ({ session }, repo) => {
+        if (!repo)
+            return '请提供仓库（owner/repo）。';
+        if (!session?.channelId)
+            return '请在群聊/频道中执行该命令。';
+        const target = await ctx.database.get('github_subscription', {
+            repo,
+            channelId: session.channelId,
+            platform: session.platform || 'unknown',
+        });
+        if (!target.length)
+            return '当前频道没有该仓库订阅。';
+        await ctx.database.set('github_subscription', { id: target[0].id }, { renderTheme: null });
+        return `已清除 ${repo} 的专属主题，回退到全局主题。`;
+    });
+    ctx.command('githubsth.render.repo-theme.list [repo:string]', '查看当前频道订阅的专属主题', { authority: 3 })
+        .action(async ({ session }, repo) => {
+        if (!session?.channelId)
+            return '请在群聊/频道中执行该命令。';
+        const query = {
+            channelId: session.channelId,
+            platform: session.platform || 'unknown',
+        };
+        if (repo)
+            query.repo = repo;
+        const subs = await ctx.database.get('github_subscription', query);
+        if (!subs.length)
+            return '当前频道没有匹配订阅。';
+        return subs.map((sub) => `${sub.repo} => ${sub.renderTheme || '(default)'}`).join('\n');
+    });
 }

package/lib/commands/subscribe.js

@@ -3,101 +3,73 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = apply;
 function apply(ctx, config) {
     const logger = ctx.logger('githubsth');
-    const repoRegex = /^[\w-]+\/[\w-\.]+$/;
+    const repoRegex = /^[\w-]+\/[\w-.]+$/;
     const validEvents = [
         'push', 'issues', 'issue_comment', 'pull_request',
         'pull_request_review', 'star', 'fork', 'release',
-        'discussion', 'workflow_run'
+        'discussion', 'workflow_run',
     ];
     const defaultConfigEvents = config.defaultEvents || ['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'];
-    ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库')
+    ctx.command('githubsth.subscribe <repo> [events:text]', '订阅 GitHub 仓库事件')
         .alias('gh.sub')
         .usage(`
-订阅 GitHub 仓库通知。
-如果不指定事件，默认订阅: ${defaultConfigEvents.join(', ')}
+订阅 GitHub 仓库通知。若不指定事件，默认订阅：${defaultConfigEvents.join(', ')}
 
-可选事件:
-- push: 代码推送
-- issues: Issue 创建/关闭/重开
-- issue_comment: Issue 评论
-- pull_request: PR 创建/关闭/重开
-- pull_request_review: PR 审查
-- star: 标星
-- fork: 仓库 Fork
-- release: 发布新版本
-- discussion: 讨论区更新
-- workflow_run: Workflow 运行
-
-示例:
-gh.sub koishijs/koishi
-gh.sub koishijs/koishi push,issues,star
+示例：
+- gh.sub koishijs/koishi
+- gh.sub koishijs/koishi push,issues,star
 `)
         .action(async ({ session }, repo, eventsStr) => {
         if (!repo)
-            return '请指定仓库名称 (owner/repo)。';
+            return '请指定仓库（owner/repo）。';
         if (!repoRegex.test(repo))
-            return '仓库名称格式不正确 (应为 owner/repo)。';
+            return '仓库格式错误，应为 owner/repo。';
         if (!session?.channelId)
-            return '请在群组中使用此命令。';
-        // Check trusted repo
+            return '请在群聊/频道中执行该命令。';
         const trusted = await ctx.database.get('github_trusted_repo', { repo, enabled: true });
-        if (trusted.length === 0) {
-            return '该仓库不在信任列表中，无法订阅。请联系管理员添加。';
-        }
-        // Parse events
+        if (trusted.length === 0)
+            return '该仓库不在信任列表中，请先由管理员添加。';
         let events;
         if (eventsStr) {
-            // Split by comma, Chinese comma, or whitespace
-            events = eventsStr.split(/[,，\s]+/).map(e => e.trim()).filter(Boolean);
-            // Normalize events (kebab-case to snake_case)
-            events = events.map(e => e.replace(/-/g, '_'));
-            // Validate events
-            const invalidEvents = events.filter(e => !validEvents.includes(e) && e !== '*');
-            if (invalidEvents.length > 0) {
-                return `无效的事件类型: ${invalidEvents.join(', ')}。\n可选事件: ${validEvents.join(', ')}`;
+            events = eventsStr.split(/[,，\s]+/).map((e) => e.trim()).filter(Boolean).map((e) => e.replace(/-/g, '_'));
+            const invalidEvents = events.filter((e) => !validEvents.includes(e) && e !== '*');
+            if (invalidEvents.length) {
+                return `无效事件：${invalidEvents.join(', ')}\n可选事件：${validEvents.join(', ')}`;
             }
         }
         else {
-            // Default events
             events = [...defaultConfigEvents];
         }
         try {
-            // Check if subscription exists
             const existing = await ctx.database.get('github_subscription', {
                 repo,
                 channelId: session.channelId,
                 platform: session.platform || 'unknown',
             });
             if (existing.length > 0) {
-                // Update existing subscription
-                await ctx.database.set('github_subscription', { id: existing[0].id }, {
-                    events,
-                });
-                return `已更新 ${repo} 的订阅，当前监听事件: ${events.join(', ')}。`;
-            }
-            else {
-                // Create new subscription
-                await ctx.database.create('github_subscription', {
-                    repo,
-                    channelId: session.channelId,
-                    platform: session.platform || 'unknown',
-                    events,
-                });
-                return `已订阅 ${repo} 的 ${events.join(', ')} 事件。`;
+                await ctx.database.set('github_subscription', { id: existing[0].id }, { events });
+                return `已更新订阅：${repo}\n事件：${events.join(', ')}`;
             }
+            await ctx.database.create('github_subscription', {
+                repo,
+                channelId: session.channelId,
+                platform: session.platform || 'unknown',
+                events,
+            });
+            return `已订阅 ${repo}\n事件：${events.join(', ')}`;
         }
-        catch (e) {
-            logger.warn(e);
-            return '订阅失败。';
+        catch (error) {
+            logger.warn(error);
+            return '订阅失败，请稍后重试。';
         }
     });
     ctx.command('githubsth.unsubscribe <repo>', '取消订阅 GitHub 仓库')
         .alias('gh.unsub')
         .action(async ({ session }, repo) => {
         if (!repo)
-            return '请指定仓库名称 (owner/repo)。';
+            return '请指定仓库（owner/repo）。';
         if (!session?.channelId)
-            return '请在群组中使用此命令。';
+            return '请在群聊/频道中执行该命令。';
         const result = await ctx.database.remove('github_subscription', {
             repo,
             channelId: session.channelId,
@@ -105,19 +77,19 @@ gh.sub koishijs/koishi push,issues,star
         });
         if (result.matched === 0)
             return '未找到该订阅。';
-        return `已取消订阅 ${repo}。`;
+        return `已取消订阅 ${repo}`;
     });
-    ctx.command('githubsth.list', '查看当前频道的订阅')
+    ctx.command('githubsth.list', '查看当前频道订阅')
         .alias('gh.list')
         .action(async ({ session }) => {
         if (!session?.channelId)
-            return '请在群组中使用此命令。';
+            return '请在群聊/频道中执行该命令。';
         const subs = await ctx.database.get('github_subscription', {
             channelId: session.channelId,
             platform: session.platform || 'unknown',
         });
         if (subs.length === 0)
             return '当前频道没有订阅。';
-        return subs.map(s => `${s.repo} [${s.events.join(', ')}]`).join('\n');
+        return subs.map((sub) => `${sub.repo} [${sub.events.join(', ')}] theme=${sub.renderTheme || '(default)'}`).join('\n');
     });
 }

package/lib/config.d.ts

@@ -1,13 +1,14 @@
 import { Schema } from 'koishi';
+export type RenderMode = 'text' | 'image' | 'auto';
+export type RenderFallback = 'text' | 'drop';
+export type RenderTheme = 'github-light' | 'github-dark' | 'aurora' | 'sunset' | 'matrix' | 'compact' | 'card' | 'terminal';
 export interface Rule {
     repo: string;
     channelId: string;
     platform?: string;
     events: string[];
+    renderTheme?: RenderTheme;
 }
-export type RenderMode = 'text' | 'image' | 'auto';
-export type RenderFallback = 'text' | 'drop';
-export type RenderTheme = 'compact' | 'card' | 'terminal';
 export interface Config {
     defaultOwner?: string;
     defaultRepo?: string;

package/lib/config.js

@@ -25,11 +25,16 @@ exports.Config = koishi_1.Schema.object({
         koishi_1.Schema.const('drop').description('图片失败则丢弃'),
     ]).default('text').description('图片渲染失败时的回退策略。'),
     renderTheme: koishi_1.Schema.union([
-        koishi_1.Schema.const('compact').description('紧凑样式'),
-        koishi_1.Schema.const('card').description('卡片样式'),
-        koishi_1.Schema.const('terminal').description('终端样式'),
-    ]).default('compact').description('图片通知主题。'),
-    renderWidth: koishi_1.Schema.number().min(480).max(1600).default(840).description('图片宽度（像素）。'),
+        koishi_1.Schema.const('github-light').description('GitHub Light'),
+        koishi_1.Schema.const('github-dark').description('GitHub Dark'),
+        koishi_1.Schema.const('aurora').description('Aurora'),
+        koishi_1.Schema.const('sunset').description('Sunset'),
+        koishi_1.Schema.const('matrix').description('Matrix'),
+        koishi_1.Schema.const('compact').description('兼容: compact'),
+        koishi_1.Schema.const('card').description('兼容: card'),
+        koishi_1.Schema.const('terminal').description('兼容: terminal'),
+    ]).default('github-dark').description('图片通知主题。'),
+    renderWidth: koishi_1.Schema.number().min(480).max(1600).default(860).description('图片宽度（像素）。'),
     renderTimeoutMs: koishi_1.Schema.number().min(1000).max(60000).default(12000).description('单次图片渲染超时（毫秒）。'),
     defaultEvents: koishi_1.Schema.array(koishi_1.Schema.string())
         .default(['push', 'issues', 'issue_comment', 'pull_request', 'pull_request_review', 'release', 'star', 'fork'])
@@ -39,5 +44,15 @@ exports.Config = koishi_1.Schema.object({
         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', 'issue_comment', 'pull_request_review']),
+        renderTheme: koishi_1.Schema.union([
+            koishi_1.Schema.const('github-light'),
+            koishi_1.Schema.const('github-dark'),
+            koishi_1.Schema.const('aurora'),
+            koishi_1.Schema.const('sunset'),
+            koishi_1.Schema.const('matrix'),
+            koishi_1.Schema.const('compact'),
+            koishi_1.Schema.const('card'),
+            koishi_1.Schema.const('terminal'),
+        ]),
     })).hidden().description('已废弃，仅保留兼容。建议改用数据库订阅管理。'),
 });

package/lib/database.d.ts

@@ -1,4 +1,5 @@
 import { Context } from 'koishi';
+import type { RenderTheme } from './config';
 declare module 'koishi' {
     interface Tables {
         github_subscription: GithubSubscription;
@@ -12,6 +13,7 @@ export interface GithubSubscription {
     channelId: string;
     platform: string;
     events: string[];
+    renderTheme?: RenderTheme;
 }
 export interface GithubTrustedRepo {
     id: number;

package/lib/database.js

@@ -8,6 +8,7 @@ function apply(ctx) {
         channelId: 'string',
         platform: 'string',
         events: 'list',
+        renderTheme: 'string',
     }, {
         autoInc: true,
         unique: ['repo', 'channelId', 'platform'],

package/lib/services/notifier.d.ts

@@ -1,5 +1,5 @@
-import { Context, Service, h } from 'koishi';
-import { Config, RenderMode } from '../config';
+import { Context, Service } from 'koishi';
+import { Config, RenderMode, RenderTheme } from '../config';
 declare module 'koishi' {
     interface Context {
         githubsthNotifier: Notifier;
@@ -13,24 +13,32 @@ export declare class Notifier extends Service {
     private dedupWriteCounter;
     private runtimeRenderMode;
     constructor(ctx: Context, config: Config);
+    listThemes(): RenderTheme[];
+    normalizeTheme(theme?: string | null): RenderTheme | null;
     setRenderMode(mode: RenderMode): void;
     getRenderMode(): RenderMode;
     getRenderStatus(): {
         mode: RenderMode;
         configuredMode: RenderMode;
         fallback: import("../config").RenderFallback;
-        theme: import("../config").RenderTheme;
+        theme: RenderTheme;
         width: number;
         timeoutMs: number;
         hasPuppeteer: boolean;
     };
-    renderPreview(event?: string): Promise<string | h | null>;
+    renderPreview(event?: string, theme?: RenderTheme | null): Promise<any>;
     private registerListeners;
     private handleEvent;
+    private resolveRuleTheme;
     private formatByEvent;
     private prepareOutboundMessage;
     private renderTextAsImage;
+    private normalizeRenderedImage;
     private buildImageHtml;
+    private getEventTitle;
+    private buildStatusPills;
+    private buildCommitBlock;
+    private pickCommitIcon;
     private escapeHtml;
     private extractRepoName;
     private patchPayloadForEvent;

package/lib/services/notifier.js

@@ -1,7 +1,118 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Notifier = void 0;
+const node_buffer_1 = require("node:buffer");
 const koishi_1 = require("koishi");
+const THEME_PRESETS = {
+    'github-light': {
+        key: 'github-light',
+        title: 'GitHub Light',
+        background: 'linear-gradient(145deg, #f6f8fa, #eef2f7)',
+        card: '#ffffff',
+        border: '#d0d7de',
+        text: '#24292f',
+        muted: '#57606a',
+        accent: '#0969da',
+        pillText: '#0969da',
+        pillBg: '#ddf4ff',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    'github-dark': {
+        key: 'github-dark',
+        title: 'GitHub Dark',
+        background: 'linear-gradient(145deg, #0d1117, #161b22)',
+        card: '#161b22',
+        border: '#30363d',
+        text: '#c9d1d9',
+        muted: '#8b949e',
+        accent: '#58a6ff',
+        pillText: '#58a6ff',
+        pillBg: 'rgba(56,139,253,0.15)',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    aurora: {
+        key: 'aurora',
+        title: 'Aurora',
+        background: 'linear-gradient(155deg, #07203f, #2b5876)',
+        card: 'rgba(12, 24, 42, 0.88)',
+        border: 'rgba(143, 211, 244, 0.35)',
+        text: '#e8f5ff',
+        muted: '#b7d7ef',
+        accent: '#7dd3fc',
+        pillText: '#7dd3fc',
+        pillBg: 'rgba(125,211,252,0.16)',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    sunset: {
+        key: 'sunset',
+        title: 'Sunset',
+        background: 'linear-gradient(155deg, #3f2b96, #a83279)',
+        card: 'rgba(46, 16, 57, 0.88)',
+        border: 'rgba(255, 183, 197, 0.34)',
+        text: '#fff1f6',
+        muted: '#ffd2e4',
+        accent: '#fda4af',
+        pillText: '#fecdd3',
+        pillBg: 'rgba(253,164,175,0.18)',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    matrix: {
+        key: 'matrix',
+        title: 'Matrix',
+        background: '#07140d',
+        card: '#0a1e13',
+        border: '#1f5136',
+        text: '#b8f7cc',
+        muted: '#7fd79f',
+        accent: '#34d399',
+        pillText: '#34d399',
+        pillBg: 'rgba(52,211,153,0.16)',
+        font: "'Consolas', 'Courier New', monospace",
+    },
+    compact: {
+        key: 'compact',
+        title: 'Compact',
+        background: 'linear-gradient(145deg, #1f2937, #111827)',
+        card: 'rgba(17,24,39,0.92)',
+        border: 'rgba(148,163,184,0.30)',
+        text: '#e5e7eb',
+        muted: '#94a3b8',
+        accent: '#22d3ee',
+        pillText: '#22d3ee',
+        pillBg: 'rgba(34,211,238,0.15)',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    card: {
+        key: 'card',
+        title: 'Card',
+        background: 'linear-gradient(145deg, #0f172a, #1e293b)',
+        card: 'rgba(15,23,42,0.92)',
+        border: 'rgba(148,163,184,0.30)',
+        text: '#e2e8f0',
+        muted: '#94a3b8',
+        accent: '#60a5fa',
+        pillText: '#60a5fa',
+        pillBg: 'rgba(96,165,250,0.16)',
+        font: "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif",
+    },
+    terminal: {
+        key: 'terminal',
+        title: 'Terminal',
+        background: '#0b1020',
+        card: '#0b1220',
+        border: '#1f2a44',
+        text: '#d1fae5',
+        muted: '#6ee7b7',
+        accent: '#34d399',
+        pillText: '#34d399',
+        pillBg: 'rgba(52,211,153,0.18)',
+        font: "'Consolas', 'Courier New', monospace",
+    },
+};
+const THEME_ALIASES = {
+    'gh-light': 'github-light',
+    'gh-dark': 'github-dark',
+};
 class Notifier extends koishi_1.Service {
     // @ts-ignore
     constructor(ctx, config) {
@@ -14,6 +125,18 @@ class Notifier extends koishi_1.Service {
         this.ctx.logger('githubsth').info('Notifier service initialized');
         this.registerListeners();
     }
+    listThemes() {
+        return Object.keys(THEME_PRESETS);
+    }
+    normalizeTheme(theme) {
+        if (!theme)
+            return null;
+        const key = theme.trim().toLowerCase();
+        const direct = this.listThemes().find((item) => item === key);
+        if (direct)
+            return direct;
+        return THEME_ALIASES[key] || null;
+    }
     setRenderMode(mode) {
         this.runtimeRenderMode = mode;
     }
@@ -32,10 +155,13 @@ class Notifier extends koishi_1.Service {
             hasPuppeteer: Boolean(puppeteer?.render),
         };
     }
-    async renderPreview(event = 'issue_comment') {
+    async renderPreview(event = 'issue_comment', theme) {
         const payload = this.getPreviewPayload(event);
-        const text = this.formatByEvent(event, payload) || this.formatByEvent('issue_comment', this.getPreviewPayload('issue_comment')) || 'Preview unavailable.';
-        return this.prepareOutboundMessage(text);
+        const text = this.formatByEvent(event, payload)
+            || this.formatByEvent('issue_comment', this.getPreviewPayload('issue_comment'))
+            || 'Preview unavailable.';
+        const preview = await this.prepareOutboundMessage(text, event, payload, theme || this.config.renderTheme);
+        return preview?.message || null;
     }
     registerListeners() {
         const bind = (name, event) => {
@@ -51,7 +177,6 @@ class Notifier extends koishi_1.Service {
         bind('github/fork', 'fork');
         bind('github/release', 'release');
         bind('github/discussion', 'discussion');
-        // legacy aliases
         bind('github/issues', 'issues');
         bind('github/pull_request', 'pull_request');
         bind('github/workflow_run', 'workflow_run');
@@ -63,9 +188,6 @@ class Notifier extends koishi_1.Service {
                 const payload = session.payload || session.extra || session.data;
                 if (!payload)
                     return;
-                if (this.config.debug) {
-                    this.ctx.logger('githubsth').info('Found payload in session, attempting to handle');
-                }
                 const realPayload = payload.payload || payload;
                 let eventType = 'unknown';
                 if (realPayload.issue && realPayload.comment)
@@ -90,12 +212,8 @@ class Notifier extends koishi_1.Service {
                     eventType = 'workflow_run';
                 else if (realPayload.repository && (realPayload.action === 'created' || realPayload.action === 'started'))
                     eventType = 'star';
-                if (eventType !== 'unknown') {
+                if (eventType !== 'unknown')
                     void this.handleEvent(eventType, payload);
-                }
-                else if (this.config.logUnhandledEvents) {
-                    this.ctx.logger('githubsth').info(`Unhandled payload structure. Keys: ${Object.keys(realPayload).join(', ')}`);
-                }
             });
         }
     }
@@ -109,46 +227,28 @@ class Notifier extends koishi_1.Service {
             realPayload.repository = payload.repository;
         }
         let repoName = this.extractRepoName(payload, realPayload, event);
-        if (!realPayload.repository) {
+        if (!realPayload.repository)
             realPayload.repository = { full_name: repoName || 'Unknown/Repo' };
-        }
-        else if (!realPayload.repository.full_name) {
+        else if (!realPayload.repository.full_name)
             realPayload.repository.full_name = repoName || 'Unknown/Repo';
-        }
         if (!realPayload.sender) {
-            if (realPayload.issue?.user) {
+            if (realPayload.issue?.user)
                 realPayload.sender = realPayload.issue.user;
-            }
-            else if (realPayload.pull_request?.user) {
+            else if (realPayload.pull_request?.user)
                 realPayload.sender = realPayload.pull_request.user;
-            }
-            else if (realPayload.discussion?.user) {
+            else if (realPayload.discussion?.user)
                 realPayload.sender = realPayload.discussion.user;
-            }
-            else if (realPayload.pusher) {
+            else if (realPayload.pusher)
                 realPayload.sender = { login: realPayload.pusher.name || 'Pusher' };
-            }
-            else {
+            else
                 realPayload.sender = { login: 'GitHub' };
-            }
         }
-        if (!(await this.shouldProcessEvent(event, payload, realPayload, repoName))) {
-            if (this.config.debug) {
-                this.ctx.logger('githubsth').info(`Skip duplicated event: ${event} (${repoName || 'unknown'})`);
-            }
+        if (!(await this.shouldProcessEvent(event, payload, realPayload, repoName)))
             return;
-        }
-        try {
-            this.patchPayloadForEvent(event, realPayload, repoName || 'Unknown/Repo');
-            repoName = repoName || realPayload.repository?.full_name;
-        }
-        catch (error) {
-            this.ctx.logger('githubsth').warn(`Failed to patch payload for ${event}:`, error);
-        }
-        if (!repoName) {
-            this.ctx.logger('githubsth').warn('Cannot query rules: repoName is missing');
+        this.patchPayloadForEvent(event, realPayload, repoName || 'Unknown/Repo');
+        repoName = repoName || realPayload.repository?.full_name;
+        if (!repoName)
             return;
-        }
         const repoNames = [repoName];
         if (repoName !== repoName.toLowerCase())
             repoNames.push(repoName.toLowerCase());
@@ -161,144 +261,235 @@ class Notifier extends koishi_1.Service {
         const matchedRules = allRules.filter((rule) => rule.events.includes('*') || rule.events.includes(event));
         if (!matchedRules.length)
             return;
-        // De-duplicate same delivery target to avoid double push caused by duplicated rules.
         const uniqueRules = Array.from(new Map(matchedRules.map((rule) => [`${repoName}|${rule.channelId}`, rule])).values());
         const textMessage = this.formatByEvent(event, realPayload);
         if (!textMessage)
             return;
-        const outbound = await this.prepareOutboundMessage(textMessage);
-        if (!outbound) {
-            if (this.config.debug)
-                this.ctx.logger('githubsth').warn(`Drop message because render failed and fallback=drop (${event}, ${repoName})`);
-            return;
-        }
         for (const rule of uniqueRules) {
+            const theme = this.resolveRuleTheme(rule);
+            const outbound = await this.prepareOutboundMessage(textMessage, event, realPayload, theme);
+            if (!outbound)
+                continue;
             await this.sendMessage(rule, outbound);
         }
     }
+    resolveRuleTheme(rule) {
+        return this.normalizeTheme(rule.renderTheme) || this.normalizeTheme(this.config.renderTheme) || 'github-dark';
+    }
     formatByEvent(event, payload) {
         switch (event) {
-            case 'push':
-                return this.ctx.githubsthFormatter.formatPush(payload);
-            case 'issues':
-                return this.ctx.githubsthFormatter.formatIssue(payload);
-            case 'pull_request':
-                return this.ctx.githubsthFormatter.formatPullRequest(payload);
-            case 'star':
-                return this.ctx.githubsthFormatter.formatStar(payload);
-            case 'fork':
-                return this.ctx.githubsthFormatter.formatFork(payload);
-            case 'release':
-                return this.ctx.githubsthFormatter.formatRelease(payload);
-            case 'discussion':
-                return this.ctx.githubsthFormatter.formatDiscussion(payload);
-            case 'workflow_run':
-                return this.ctx.githubsthFormatter.formatWorkflowRun(payload);
-            case 'issue_comment':
-                return this.ctx.githubsthFormatter.formatIssueComment(payload);
-            case 'pull_request_review':
-                return this.ctx.githubsthFormatter.formatPullRequestReview(payload);
-            default:
-                return null;
+            case 'push': return this.ctx.githubsthFormatter.formatPush(payload);
+            case 'issues': return this.ctx.githubsthFormatter.formatIssue(payload);
+            case 'pull_request': return this.ctx.githubsthFormatter.formatPullRequest(payload);
+            case 'star': return this.ctx.githubsthFormatter.formatStar(payload);
+            case 'fork': return this.ctx.githubsthFormatter.formatFork(payload);
+            case 'release': return this.ctx.githubsthFormatter.formatRelease(payload);
+            case 'discussion': return this.ctx.githubsthFormatter.formatDiscussion(payload);
+            case 'workflow_run': return this.ctx.githubsthFormatter.formatWorkflowRun(payload);
+            case 'issue_comment': return this.ctx.githubsthFormatter.formatIssueComment(payload);
+            case 'pull_request_review': return this.ctx.githubsthFormatter.formatPullRequestReview(payload);
+            default: return null;
         }
     }
-    async prepareOutboundMessage(textMessage) {
+    async prepareOutboundMessage(textMessage, event, payload, theme) {
         const mode = this.getRenderMode();
         if (mode === 'text')
-            return textMessage;
-        const image = await this.renderTextAsImage(textMessage);
-        if (image)
-            return image;
+            return { message: textMessage, text: textMessage, isImage: false };
+        const imageMessage = await this.renderTextAsImage(textMessage, event, payload, theme);
+        if (imageMessage)
+            return { message: imageMessage, text: textMessage, isImage: true };
         if (mode === 'image' && this.config.renderFallback === 'drop')
             return null;
-        return textMessage;
+        return { message: textMessage, text: textMessage, isImage: false };
     }
-    async renderTextAsImage(textMessage) {
+    async renderTextAsImage(textMessage, event, payload, theme) {
         const puppeteer = this.ctx.puppeteer;
         if (!puppeteer || typeof puppeteer.render !== 'function')
             return null;
         try {
-            const html = this.buildImageHtml(textMessage);
+            const html = this.buildImageHtml(textMessage, event, payload, theme);
             const task = puppeteer.render(html);
             const timeout = this.config.renderTimeoutMs || 12000;
-            const buffer = await Promise.race([
+            const rendered = await Promise.race([
                 task,
                 new Promise((resolve) => setTimeout(() => resolve(null), timeout)),
             ]);
-            if (!buffer)
+            if (!rendered)
                 return null;
-            return koishi_1.h.image(buffer, 'image/png');
+            return this.normalizeRenderedImage(rendered);
         }
         catch (error) {
             this.ctx.logger('githubsth').warn('Image render failed:', error);
             return null;
         }
     }
-    buildImageHtml(textMessage) {
-        const escaped = this.escapeHtml(textMessage).replace(/\n/g, '<br/>');
-        const width = this.config.renderWidth || 840;
-        let bg = 'linear-gradient(135deg, #1f2937, #111827)';
-        let card = 'rgba(17, 24, 39, 0.92)';
-        let accent = '#22d3ee';
-        let font = "'Segoe UI', 'PingFang SC', 'Microsoft YaHei', sans-serif";
-        if (this.config.renderTheme === 'card') {
-            bg = 'linear-gradient(140deg, #0f172a, #1e293b)';
-            card = 'rgba(15, 23, 42, 0.9)';
-            accent = '#60a5fa';
-        }
-        else if (this.config.renderTheme === 'terminal') {
-            bg = '#0b1020';
-            card = '#0b1220';
-            accent = '#34d399';
-            font = "'Consolas', 'Courier New', monospace";
+    normalizeRenderedImage(rendered) {
+        if (!rendered)
+            return null;
+        if (typeof rendered === 'string') {
+            const trimmed = rendered.trim();
+            if (trimmed.startsWith('<img'))
+                return trimmed;
+            if (trimmed.startsWith('data:image/'))
+                return koishi_1.h.image(trimmed);
+            return null;
         }
-        return `<!doctype html>
-<html>
-<head>
-<meta charset="utf-8" />
-<style>
-  * { box-sizing: border-box; }
-  body {
-    margin: 0;
-    width: ${width}px;
-    background: ${bg};
-    color: #e5e7eb;
-    font-family: ${font};
-  }
-  .wrap {
-    padding: 20px;
-  }
-  .card {
-    border-radius: 14px;
-    border: 1px solid rgba(148, 163, 184, 0.28);
-    background: ${card};
-    overflow: hidden;
-  }
-  .head {
-    padding: 12px 16px;
-    border-bottom: 1px solid rgba(148, 163, 184, 0.24);
-    font-weight: 700;
-    color: ${accent};
-    letter-spacing: .3px;
-  }
-  .content {
-    padding: 14px 16px;
-    line-height: 1.55;
-    word-break: break-word;
-    font-size: 14px;
-  }
-</style>
-</head>
-<body>
-  <div class="wrap">
-    <div class="card">
-      <div class="head">GitHub Notification</div>
-      <div class="content">${escaped}</div>
-    </div>
-  </div>
-</body>
+        if (node_buffer_1.Buffer.isBuffer(rendered))
+            return koishi_1.h.image(rendered, 'image/png');
+        if (rendered instanceof Uint8Array)
+            return koishi_1.h.image(node_buffer_1.Buffer.from(rendered), 'image/png');
+        return null;
+    }
+    buildImageHtml(textMessage, event, payload, theme) {
+        const preset = THEME_PRESETS[theme] || THEME_PRESETS['github-dark'];
+        const escapedContent = this.escapeHtml(textMessage).replace(/\n/g, '<br/>');
+        const width = this.config.renderWidth || 860;
+        const repo = this.escapeHtml(payload?.repository?.full_name || 'unknown/repo');
+        const actor = this.escapeHtml(payload?.sender?.login || payload?.pusher?.name || 'github');
+        const action = this.escapeHtml(payload?.action || 'updated');
+        const title = this.escapeHtml(this.getEventTitle(event, payload));
+        const statusPills = this.buildStatusPills(event, payload, preset);
+        const commitBlock = this.buildCommitBlock(event, payload, preset);
+        return `<!doctype html>
+<html>
+<head>
+<meta charset="utf-8" />
+<style>
+  * { box-sizing: border-box; }
+  body {
+    margin: 0;
+    width: ${width}px;
+    background: ${preset.background};
+    color: ${preset.text};
+    font-family: ${preset.font};
+  }
+  .wrap { padding: 18px; }
+  .card {
+    border-radius: 14px;
+    border: 1px solid ${preset.border};
+    background: ${preset.card};
+    overflow: hidden;
+    box-shadow: 0 10px 30px rgba(0,0,0,0.25);
+  }
+  .head {
+    padding: 12px 16px;
+    border-bottom: 1px solid ${preset.border};
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+  }
+  .head-left { display: flex; align-items: center; gap: 8px; min-width: 0; }
+  .dot { width: 10px; height: 10px; border-radius: 999px; background: ${preset.accent}; box-shadow: 0 0 0 3px ${preset.pillBg}; }
+  .repo { font-weight: 700; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  .meta { color: ${preset.muted}; font-size: 12px; }
+  .pill {
+    display: inline-flex;
+    align-items: center;
+    padding: 2px 9px;
+    border-radius: 999px;
+    font-size: 12px;
+    border: 1px solid ${preset.border};
+    color: ${preset.pillText};
+    background: ${preset.pillBg};
+    margin-left: 6px;
+  }
+  .body { padding: 14px 16px 16px; }
+  .title { font-size: 18px; font-weight: 700; margin-bottom: 6px; }
+  .sub { color: ${preset.muted}; margin-bottom: 12px; }
+  .content {
+    border: 1px dashed ${preset.border};
+    border-radius: 10px;
+    padding: 10px 12px;
+    line-height: 1.6;
+    font-size: 14px;
+    word-break: break-word;
+    margin-top: 8px;
+  }
+  .commit-list { margin-top: 10px; border-top: 1px solid ${preset.border}; padding-top: 10px; }
+  .commit-item { font-size: 13px; margin-bottom: 6px; }
+</style>
+</head>
+<body>
+  <div class="wrap">
+    <div class="card">
+      <div class="head">
+        <div class="head-left">
+          <span class="dot"></span>
+          <span class="repo">${repo}</span>
+        </div>
+        <div class="meta">${this.escapeHtml(preset.title)}</div>
+      </div>
+      <div class="body">
+        <div class="title">${title}</div>
+        <div class="sub">by ${actor}<span class="pill">${action}</span>${statusPills}</div>
+        <div class="content">${escapedContent}</div>
+        ${commitBlock}
+      </div>
+    </div>
+  </div>
+</body>
 </html>`;
     }
+    getEventTitle(event, payload) {
+        switch (event) {
+            case 'push': return '🚀 Push Event';
+            case 'issues': return '🐞 Issue Update';
+            case 'issue_comment': return payload?.issue?.pull_request ? '💬 Pull Request Comment' : '💬 Issue Comment';
+            case 'pull_request': return '🔀 Pull Request Update';
+            case 'pull_request_review': return '✅ Pull Request Review';
+            case 'release': return '📦 Release Published';
+            case 'workflow_run': return '⚙️ Workflow Completed';
+            case 'discussion': return '🧵 Discussion Update';
+            case 'star': return '⭐ New Star';
+            case 'fork': return '🍴 Repository Forked';
+            default: return '🔔 GitHub Notification';
+        }
+    }
+    buildStatusPills(event, payload, preset) {
+        const pills = [];
+        if (event === 'pull_request' && payload?.pull_request?.state) {
+            pills.push(payload.pull_request.state);
+        }
+        if (event === 'workflow_run' && payload?.workflow_run?.conclusion) {
+            pills.push(payload.workflow_run.conclusion);
+        }
+        if (event === 'release' && payload?.release?.tag_name) {
+            pills.push(payload.release.tag_name);
+        }
+        return pills
+            .slice(0, 3)
+            .map((item) => `<span class="pill" style="margin-left:6px;background:${preset.pillBg};">${this.escapeHtml(String(item))}</span>`)
+            .join('');
+    }
+    buildCommitBlock(event, payload, preset) {
+        if (event !== 'push' || !Array.isArray(payload?.commits) || payload.commits.length === 0)
+            return '';
+        const rows = payload.commits.slice(0, 6).map((commit) => {
+            const hash = this.escapeHtml((commit.id || '0000000').slice(0, 7));
+            const message = String(commit.message || '').split('\n')[0];
+            const icon = this.pickCommitIcon(message);
+            const author = this.escapeHtml(commit.author?.name || 'unknown');
+            return `<div class="commit-item">${icon} <strong>${hash}</strong> ${this.escapeHtml(message)} <span style="color:${preset.muted}">- ${author}</span></div>`;
+        }).join('');
+        return `<div class="commit-list">${rows}</div>`;
+    }
+    pickCommitIcon(message) {
+        const lower = (message || '').toLowerCase();
+        if (lower.startsWith('feat'))
+            return '✨';
+        if (lower.startsWith('fix'))
+            return '🐛';
+        if (lower.startsWith('docs'))
+            return '📝';
+        if (lower.startsWith('refactor'))
+            return '♻️';
+        if (lower.startsWith('test'))
+            return '✅';
+        if (lower.startsWith('chore'))
+            return '🧹';
+        return '📌';
+    }
     escapeHtml(input) {
         return String(input)
             .replace(/&/g, '&amp;')
@@ -314,9 +505,8 @@ class Notifier extends koishi_1.Service {
             if (parts.length >= 2)
                 repoName = `${parts[parts.length - 2]}/${parts[parts.length - 1]}`;
         }
-        if (!repoName && realPayload.pull_request?.base?.repo?.full_name) {
+        if (!repoName && realPayload.pull_request?.base?.repo?.full_name)
             repoName = realPayload.pull_request.base.repo.full_name;
-        }
         if (!repoName && typeof payload.repoKey === 'string' && payload.repoKey.includes('/'))
             repoName = payload.repoKey;
         if (!repoName && typeof payload.owner === 'string' && typeof payload.repo === 'string')
@@ -458,45 +648,41 @@ class Notifier extends koishi_1.Service {
                 createdAt: new Date(),
             });
             this.dedupWriteCounter += 1;
-            if (this.dedupWriteCounter % 200 === 0) {
+            if (this.dedupWriteCounter % 200 === 0)
                 void this.cleanupDedupTable();
-            }
         }
         catch (error) {
             if (error?.code === 'SQLITE_CONSTRAINT')
                 return false;
-            this.ctx.logger('githubsth').warn('Failed to write dedup record, fallback to in-memory dedup only:', error);
         }
         return true;
     }
     async cleanupDedupTable() {
         const cutoff = new Date(Date.now() - this.config.dedupRetentionHours * 60 * 60 * 1000);
         try {
-            await this.ctx.database.remove('github_event_dedup', {
-                createdAt: { $lt: cutoff },
-            });
-        }
-        catch (error) {
-            if (this.config.debug) {
-                this.ctx.logger('githubsth').warn('Failed to cleanup dedup table:', error);
-            }
+            await this.ctx.database.remove('github_event_dedup', { createdAt: { $lt: cutoff } });
         }
+        catch { }
     }
-    async sendMessage(rule, message) {
+    async sendMessage(rule, outbound) {
         const bots = this.ctx.bots.filter((bot) => !rule.platform || bot.platform === rule.platform);
         if (!bots.length)
             return;
         for (const bot of bots) {
             try {
-                await this.sendWithRetry(bot, rule.channelId, message);
-                if (this.config.debug) {
+                await this.sendWithRetry(bot, rule.channelId, outbound.message);
+                if (this.config.debug)
                     this.ctx.logger('notifier').info(`Sent message to ${rule.channelId} via ${bot.platform}:${bot.selfId}`);
-                }
                 return;
             }
             catch (error) {
-                if (this.config.debug) {
-                    this.ctx.logger('notifier').warn(`Bot ${bot.sid} failed to send message with retries: ${error}`);
+                if (outbound.isImage && this.config.renderFallback === 'text') {
+                    try {
+                        await this.sendWithRetry(bot, rule.channelId, outbound.text);
+                        this.ctx.logger('notifier').warn(`Image failed on ${bot.platform}:${bot.selfId}, fallback to text succeeded.`);
+                        return;
+                    }
+                    catch { }
                 }
             }
         }
@@ -515,8 +701,7 @@ class Notifier extends koishi_1.Service {
                 lastError = error;
                 if (attempt >= retryCount)
                     break;
-                const delay = baseDelay * Math.pow(2, attempt);
-                await this.sleep(delay);
+                await this.sleep(baseDelay * Math.pow(2, attempt));
             }
         }
         throw lastError;
@@ -525,21 +710,17 @@ class Notifier extends koishi_1.Service {
         return new Promise((resolve) => setTimeout(resolve, ms));
     }
     getPreviewPayload(event) {
-        const baseRepo = { full_name: 'acmuhan/JackalClientDocs', stargazers_count: 128 };
-        const baseUser = { login: 'acmuhan' };
         const payload = {
             action: 'created',
-            repository: baseRepo,
-            sender: baseUser,
+            repository: { full_name: 'acmuhan/JackalClientDocs', stargazers_count: 128 },
+            sender: { login: 'vercel[bot]' },
             issue: {
                 number: 29,
                 title: 'Delete demobot',
                 html_url: 'https://github.com/acmuhan/JackalClientDocs/issues/29',
                 pull_request: { html_url: 'https://github.com/acmuhan/JackalClientDocs/pull/29' },
             },
-            comment: {
-                body: '[vc]: #gOsUN...=eyJpc01vbm9yZXBvIjp0cnVl...'
-            },
+            comment: { body: '[vc]: #gOsUN...=eyJpc01vbm9yZXBvIjp0cnVl...' },
             pull_request: {
                 number: 29,
                 title: 'Delete demobot',
@@ -552,9 +733,7 @@ class Notifier extends koishi_1.Service {
                 head_branch: 'main',
                 html_url: 'https://github.com/acmuhan/JackalClientDocs/actions/runs/1',
             },
-            commits: [
-                { id: 'ea5eaddca38f25ce013ee50d70addb49c8d28844', message: 'Delete demobot', author: { name: 'MuHan' } },
-            ],
+            commits: [{ id: 'ea5eaddca38f25ce013ee50d70addb49c8d28844', message: 'feat: delete demobot', author: { name: 'MuHan' } }],
             ref: 'refs/heads/main',
             compare: 'https://github.com/acmuhan/JackalClientDocs/compare/old...new',
             pusher: { name: 'acmuhan' },
@@ -563,8 +742,6 @@ class Notifier extends koishi_1.Service {
             discussion: { number: 7, title: 'Roadmap', html_url: 'https://github.com/acmuhan/JackalClientDocs/discussions/7' },
             review: { state: 'approved', html_url: 'https://github.com/acmuhan/JackalClientDocs/pull/29#pullrequestreview-1' },
         };
-        if (event === 'star')
-            payload.action = 'created';
         if (event === 'workflow_run')
             payload.action = 'completed';
         if (event === 'pull_request_review')

package/package.json

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