koishi-plugin-jrys-plus 1.0.0 → 1.0.2

package/lib/index.d.ts

@@ -1,12 +1,12 @@
 /**
  * koishi-plugin-jrys-plus
- * 今日运势签到 + 排行榜（精简版）
+ * 今日运势签到 + 签到天数排行榜（精简版）
  *
  * 改动：
  * - 移除金币/经验值展示和进度条
  * - 🍀 替换为 ⭐
  * - 日期问候模块移除半透明背景
- * - 整合排名功能
+ * - 仅保留签到天数排行榜
  */
 import { Context, Schema } from 'koishi';
 import * as si from './signin';
@@ -18,12 +18,10 @@ export interface Config {
     levelSet: si.LevelInfo[];
     fortuneSet: si.FortuneInfo[];
     event: RollEvent[];
-    expCommand: string;
     signCommand: string;
     imageMode: boolean;
     limit: number;
     borderwidth: number;
-    next_ExpDisplay: boolean;
     pre_next_LevelDisplay: boolean;
 }
 export declare const Config: Schema<Schemastery.ObjectS<{
@@ -58,12 +56,10 @@ export declare const Config: Schema<Schemastery.ObjectS<{
         bad: Schema<string, string>;
     }>[]>;
 }> | Schemastery.ObjectS<{
-    expCommand: Schema<string, string>;
     signCommand: Schema<string, string>;
     imageMode: Schema<boolean, boolean>;
     limit: Schema<number, number>;
     borderwidth: Schema<number, number>;
-    next_ExpDisplay: Schema<boolean, boolean>;
     pre_next_LevelDisplay: Schema<boolean, boolean>;
 }>, {
     imgUrl: string;
@@ -85,12 +81,10 @@ export declare const Config: Schema<Schemastery.ObjectS<{
         bad: Schema<string, string>;
     }>[];
 } & {
-    expCommand: string;
     signCommand: string;
     imageMode: boolean;
     limit: number;
     borderwidth: number;
-    next_ExpDisplay: boolean;
     pre_next_LevelDisplay: boolean;
 }>;
 export declare const inject: {
@@ -133,12 +127,10 @@ declare const _default: {
             bad: Schema<string, string>;
         }>[]>;
     }> | Schemastery.ObjectS<{
-        expCommand: Schema<string, string>;
         signCommand: Schema<string, string>;
         imageMode: Schema<boolean, boolean>;
         limit: Schema<number, number>;
         borderwidth: Schema<number, number>;
-        next_ExpDisplay: Schema<boolean, boolean>;
         pre_next_LevelDisplay: Schema<boolean, boolean>;
     }>, {
         imgUrl: string;
@@ -160,12 +152,10 @@ declare const _default: {
             bad: Schema<string, string>;
         }>[];
     } & {
-        expCommand: string;
         signCommand: string;
         imageMode: boolean;
         limit: number;
         borderwidth: number;
-        next_ExpDisplay: boolean;
         pre_next_LevelDisplay: boolean;
     }>;
 };

package/lib/index.js

@@ -40,13 +40,13 @@ exports.inject = exports.Config = exports.name = void 0;
 exports.apply = apply;
 /**
  * koishi-plugin-jrys-plus
- * 今日运势签到 + 排行榜（精简版）
+ * 今日运势签到 + 签到天数排行榜（精简版）
  *
  * 改动：
  * - 移除金币/经验值展示和进度条
  * - 🍀 替换为 ⭐
  * - 日期问候模块移除半透明背景
- * - 整合排名功能
+ * - 仅保留签到天数排行榜
  */
 const koishi_1 = require("koishi");
 const url_1 = require("url");
@@ -88,12 +88,10 @@ exports.Config = koishi_1.Schema.intersect([
             .description('自定义黄历事件'),
     }).description('签到/运势设置'),
     koishi_1.Schema.object({
-        expCommand: koishi_1.Schema.string().description('经验排行榜命令').default('jrysranks'),
         signCommand: koishi_1.Schema.string().description('签到天数排行榜命令').default('jrysranksign'),
         imageMode: koishi_1.Schema.boolean().description('排行榜是否使用图片模式（需要 puppeteer）').default(true),
         limit: koishi_1.Schema.number().description('排行榜显示的最大条目数').min(1).max(100).default(10),
         borderwidth: koishi_1.Schema.number().description('文本模式边框宽度').default(14),
-        next_ExpDisplay: koishi_1.Schema.boolean().description('排行榜中显示升级所需经验').default(true),
         pre_next_LevelDisplay: koishi_1.Schema.boolean().description('排行榜中显示前后等级信息').default(true),
     }).description('排行榜设置'),
 ]);
@@ -130,12 +128,14 @@ async function fetchHitokoto() {
 /* ── 主入口 ── */
 function apply(ctx, config) {
     si.initDatabase(ctx);
-    const signin = new si.Signin(ctx, config);
+    const db = ctx.database;
+    const puppeteer = ctx.puppeteer;
+    const signin = new si.Signin(db, config);
     const jrys = new roll_1.Jrys();
     // 合并事件
     const eventJson = [...event_1.defaultEventJson, ...config.event];
     // 注册排行榜
-    (0, ranks_1.registerRanks)(ctx, config, () => config.levelSet);
+    (0, ranks_1.registerRanks)(ctx, db, config, () => config.levelSet);
     /* ── 运势签到命令 ── */
     ctx.command('jrys', '今日运势')
         .userFields(['id', 'name'])
@@ -186,7 +186,7 @@ function apply(ctx, config) {
                 .replace('{{BADDO}}', baddo);
             const outPath = path_1.default.resolve(__dirname, 'templates', '_fortune_render.html');
             fs_1.default.writeFileSync(outPath, html);
-            page = await ctx.puppeteer.page();
+            page = await puppeteer.page();
             await page.setViewport({ width: 600, height: 1080 * 2 });
             await page.goto(`file:///${outPath}`);
             await page.waitForSelector('#body', { timeout: 10000 });

package/lib/ranks.d.ts

@@ -1,3 +1,3 @@
-import { Context } from 'koishi';
+import { Context, Database } from 'koishi';
 import { LevelInfo } from './signin';
-export declare function registerRanks(ctx: Context, config: any, getLevelConfig: () => LevelInfo[]): void;
+export declare function registerRanks(ctx: Context, db: Database<any>, config: any, getLevelConfig: () => LevelInfo[]): void;

package/lib/ranks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerRanks = registerRanks;
 const koishi_1 = require("koishi");
+const signin_1 = require("./signin");
 const fs_1 = require("fs");
 const path_1 = require("path");
 /* ── 模板路径候选 ── */
@@ -21,55 +22,7 @@ async function resolveTemplatePath() {
     }
     throw new Error('未找到 rank-card.html 模板文件');
 }
-/* ── 等级查询 ── */
-const DEFAULT_LEVEL = { level: 0, levelExp: 0, levelName: '无等级', levelColor: '#666666' };
-function getLevelInfo(exp, levels) {
-    if (!levels?.length)
-        return DEFAULT_LEVEL;
-    const sorted = [...levels].sort((a, b) => b.levelExp - a.levelExp);
-    return sorted.find(l => exp >= l.levelExp) || sorted[sorted.length - 1];
-}
 /* ── 文本渲染 ── */
-function renderExpText(users, levelConfig, config) {
-    const divider = '┏' + '—'.repeat(config.borderwidth) + '┓';
-    const midDivider = '┣' + '—'.repeat(config.borderwidth) + '┫';
-    const endDivider = '┗' + '—'.repeat(config.borderwidth) + '┛';
-    const header = [divider, `┃  🏆 经验排行榜 TOP.${config.limit} `, midDivider].join('\n');
-    const rankings = users.map((user, index) => {
-        const medal = index < 3 ? ['👑', '⭐', '✧'][index] : '•';
-        const expStr = user.exp.toLocaleString();
-        let lines = [`┃ ${medal} ${index + 1}. ${user.displayName}`];
-        if (config.next_ExpDisplay) {
-            const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-            const cur = getLevelInfo(user.exp, levelConfig);
-            const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
-            const next = sorted[idx + 1];
-            lines.push(next ? `┃  ⚡${expStr} exp (下一级:${next.levelExp} exp)` : `┃  ⚡${expStr} (Max)`);
-        }
-        else {
-            lines.push(`┃  ⚡${expStr} exp`);
-        }
-        if (config.pre_next_LevelDisplay && levelConfig.length) {
-            const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-            const cur = getLevelInfo(user.exp, levelConfig);
-            const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
-            const prev = sorted[idx - 1]?.levelName;
-            const next = sorted[idx + 1]?.levelName;
-            let line = '┃  ✨';
-            if (prev)
-                line += `${prev} → `;
-            line += `「${cur.levelName}」`;
-            if (next)
-                line += ` → ${next}`;
-            lines.push(line);
-        }
-        else if (levelConfig.length) {
-            lines.push(`┃  ✨${getLevelInfo(user.exp, levelConfig).levelName}`);
-        }
-        return lines.join('\n');
-    }).join('\n\n');
-    return [header, rankings, endDivider].join('\n');
-}
 function renderSignText(users, levelConfig, config) {
     const divider = '┏' + '—'.repeat(config.borderwidth) + '┓';
     const midDivider = '┣' + '—'.repeat(config.borderwidth) + '┫';
@@ -80,7 +33,7 @@ function renderSignText(users, levelConfig, config) {
         let lines = [`┃ ${medal} ${index + 1}. ${user.displayName}`, `┃  📅${user.signCount.toLocaleString()} 天`];
         if (config.pre_next_LevelDisplay && levelConfig.length) {
             const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-            const cur = getLevelInfo(user.exp, levelConfig);
+            const cur = (0, signin_1.getLevelInfo)(user.exp, levelConfig);
             const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
             const prev = sorted[idx - 1]?.levelName;
             const next = sorted[idx + 1]?.levelName;
@@ -97,20 +50,20 @@ function renderSignText(users, levelConfig, config) {
     return [header, rankings, endDivider].join('\n');
 }
 /* ── 图片渲染 ── */
-async function renderRankImage(ctx, type, users, totalUsers, limit, getLevelConfig) {
+async function renderRankImage(ctx, users, totalUsers, limit, getLevelConfig) {
     try {
         const path = await resolveTemplatePath();
         let template = await fs_1.promises.readFile(path, 'utf-8');
         const levelConfig = getLevelConfig();
         const data = {
-            type,
+            type: 'sign',
             limit,
             channelName: '当前频道',
             totalUsers,
             updateTime: new Date().toLocaleString('zh-CN'),
             users: users.map(user => {
                 const sorted = [...levelConfig].sort((a, b) => a.levelExp - b.levelExp);
-                const cur = getLevelInfo(user.exp, levelConfig);
+                const cur = (0, signin_1.getLevelInfo)(user.exp, levelConfig);
                 const idx = sorted.findIndex(l => l.levelExp === cur.levelExp);
                 const prev = sorted[idx - 1]?.levelName;
                 const nextObj = sorted[idx + 1];
@@ -124,7 +77,7 @@ async function renderRankImage(ctx, type, users, totalUsers, limit, getLevelConf
                 return {
                     displayName: user.displayName,
                     originalId: user.name,
-                    value: type === 'exp' ? user.exp : user.signCount,
+                    value: user.signCount,
                     levelName: cur.levelName,
                     levelColor: cur.levelColor,
                     currentLevelExp: cur.levelExp,
@@ -153,13 +106,13 @@ async function renderRankImage(ctx, type, users, totalUsers, limit, getLevelConf
     }
 }
 /* ── 注册排行命令 ── */
-function registerRanks(ctx, config, getLevelConfig) {
+function registerRanks(ctx, db, config, getLevelConfig) {
     const logger = ctx.logger('jrys-plus');
     function canUseImage() {
         return config.imageMode && !!ctx.puppeteer;
     }
-    async function getRankedUsers(session, sortField) {
-        const all = await ctx.database.get('jrys', {}, { sort: { [sortField]: 'desc' } });
+    async function getRankedUsers() {
+        const all = await db.get('jrys', {}, { sort: { signCount: 'desc' } });
         if (!all.length)
             return null;
         const users = all.slice(0, config.limit).map(u => ({
@@ -168,31 +121,16 @@ function registerRanks(ctx, config, getLevelConfig) {
         }));
         return users;
     }
-    ctx.command(config.expCommand || 'jrysranks')
-        .action(async ({ session }) => {
-        const users = await getRankedUsers(session, 'exp');
-        if (users === null)
-            return '暂无数据';
-        if (!users.length)
-            return '当前频道暂无数据';
-        if (canUseImage()) {
-            const total = (await ctx.database.get('jrys', {})).length;
-            const img = await renderRankImage(ctx, 'exp', users, total, config.limit, getLevelConfig);
-            if (img)
-                return img;
-        }
-        return renderExpText(users, getLevelConfig(), config);
-    });
     ctx.command(config.signCommand || 'jrysranksign')
         .action(async ({ session }) => {
-        const users = await getRankedUsers(session, 'signCount');
+        const users = await getRankedUsers();
         if (users === null)
             return '暂无数据';
         if (!users.length)
             return '当前频道暂无数据';
         if (canUseImage()) {
-            const total = (await ctx.database.get('jrys', {})).length;
-            const img = await renderRankImage(ctx, 'sign', users, total, config.limit, getLevelConfig);
+            const total = (await db.get('jrys', {})).length;
+            const img = await renderRankImage(ctx, users, total, config.limit, getLevelConfig);
             if (img)
                 return img;
         }

package/lib/signin.d.ts

@@ -1,4 +1,4 @@
-import { Context } from 'koishi';
+import { Context, Database } from 'koishi';
 declare module 'koishi' {
     interface Tables {
         jrys: _UserFortune;
@@ -38,21 +38,22 @@ export interface SigninConfig {
     levelSet: LevelInfo[];
     fortuneSet: FortuneInfo[];
 }
+export declare function getLevelInfo(exp: number, levels: LevelInfo[]): LevelInfo;
 export declare class Signin {
-    private ctx;
+    private db;
     private cfg;
-    constructor(ctx: Context, cfg: SigninConfig);
+    constructor(db: Database<any>, cfg: SigninConfig);
     /** 执行签到。返回 0=成功, 1=已签到 */
     callSignin(uid: number, userid: string, luck: number): Promise<{
-        status: number;
-        allExp: number;
-        signTime: Date;
-        count: number;
-    } | {
         status: number;
         allExp?: undefined;
         signTime?: undefined;
         count?: undefined;
+    } | {
+        status: number;
+        allExp: any;
+        signTime: Date;
+        count: any;
     }>;
     getLevelInfo(exp: number): {
         levelInfo: LevelInfo;

package/lib/signin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signin = exports.defaultFortuneInfo = exports.defaultLevelInfo = void 0;
 exports.initDatabase = initDatabase;
+exports.getLevelInfo = getLevelInfo;
 const timeGreetings = [
     { range: [0, 5], message: '晚安' },
     { range: [5, 9], message: '早上好' },
@@ -59,24 +60,27 @@ function initDatabase(ctx) {
         signCount: 'unsigned',
     });
 }
-/* ── 签到逻辑（无 monetary 依赖） ── */
-const roll_1 = require("./roll");
+function getLevelInfo(exp, levels) {
+    if (!levels?.length)
+        return { level: 0, levelExp: 0, levelName: '无等级', levelColor: '#666666' };
+    const sorted = [...levels].sort((a, b) => b.levelExp - a.levelExp);
+    return sorted.find(l => exp >= l.levelExp) || sorted[sorted.length - 1];
+}
 class Signin {
-    constructor(ctx, cfg) {
-        this.ctx = ctx;
+    constructor(db, cfg) {
+        this.db = db;
         this.cfg = cfg;
     }
     /** 执行签到。返回 0=成功, 1=已签到 */
     async callSignin(uid, userid, luck) {
         const date = new Date();
-        const roll = new roll_1.Jrys();
         // 经验值仅用于后端等级/排行计算，不在签到卡上展示
         const exp = Math.round((Math.random() * 0.5 + luck / 200) *
             (this.cfg.signExp[1] - this.cfg.signExp[0])) + this.cfg.signExp[0];
-        const userData = await this.ctx.database.get('jrys', { id: uid });
+        const userData = await this.db.get('jrys', { id: uid });
         if (userData.length === 0) {
             const accExp = exp;
-            await this.ctx.database.create('jrys', {
+            await this.db.create('jrys', {
                 id: uid,
                 name: userid,
                 time: date,
@@ -90,7 +94,7 @@ class Signin {
         }
         const accExp = userData[0].exp + exp;
         const accCount = userData[0].signCount + 1;
-        await this.ctx.database.set('jrys', { id: uid }, {
+        await this.db.set('jrys', { id: uid }, {
             name: userid,
             time: date,
             exp: accExp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-jrys-plus",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "今日运势签到 + 排行榜，精简优化版",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",