@hieuzest/koishi-plugin-mahjongpub 0.2.12 → 0.2.13

package/lib/index.d.ts

@@ -1,6 +1,7 @@
 import { Context, Dict, Schema, Service } from 'koishi';
 import { ContestAdmin, TeamAdmin } from './api';
 import { ContestManager } from './manager';
+import { MahjongPub as Contest } from './mahjongpub';
 declare module 'koishi' {
     interface Context {
         mahjongpub: MahjongPub;
@@ -26,6 +27,7 @@ export declare class MahjongPub extends Service {
     config: MahjongPub.Config;
     teams: Dict<TeamAdmin>;
     contests: Dict<ContestAdmin>;
+    contest: Contest;
     constructor(ctx: Context, config: MahjongPub.Config);
     getTeam(pw: string): Promise<TeamAdmin>;
     getContest(cid: string, pw: string): Promise<ContestAdmin>;

package/lib/index.js

@@ -351,15 +351,18 @@ var ContestExtra = class {
   type;
   round;
   lobby;
+  playerIndex;
   ver = 0;
   async broadcast(msg) {
     this.subscribers.forEach((channel) => this.ctx.sendMessage(channel, msg).catch((e) => this.ctx.logger.debug(e)));
   }
 };
-function getRowPlayer(contest, team, rowi) {
-  const roleList = contest.t_type.split(/\s+/);
-  const roleSet = [...new Set(roleList).values()];
-  const index = roleSet.indexOf(roleList[rowi]);
+function getRowPlayer(contest, team, rowi, index) {
+  if ((0, import_koishi2.isNullable)(index)) {
+    const roleList = contest.t_type.split(/\s+/);
+    const roleSet = [...new Set(roleList).values()];
+    index = roleSet.indexOf(roleList[rowi]);
+  }
   return team.players[index]?.split("##", 1)[0];
 }
 __name(getRowPlayer, "getRowPlayer");
@@ -369,7 +372,7 @@ var ContestManager = class {
     this.config = config;
     this.mahjongpub = MahjongPub.new(ctx);
     ctx.command("mahjongpub.manager", { authority: 3 }).action(import_koishi2.noop);
-    ctx.command("mahjongpub.manager.init").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").option("type", "-t [type:string]").option("ver", "-v [ver:number]").option("round", "-r [round:number]").option("lobby", "-l [lobby:string]").action(async ({ session, options }) => {
+    ctx.command("mahjongpub.manager.init").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").option("type", "-t [type:string]").option("ver", "-v [ver:number]").option("round", "-r [round:number]").option("lobby", "-l [lobby:string]").option("index", "-i [index:number]").action(async ({ session, options }) => {
       const cid = +(session.channel["mahjongpub/bind-contest"] || 0);
       if (!cid) return "Unauthorized.";
       this.extra[cid] ??= new ContestExtra(ctx);
@@ -379,6 +382,7 @@ var ContestManager = class {
       if (!(0, import_koishi2.isNullable)(options.ver)) this.extra[cid].ver = options.ver;
       if (!(0, import_koishi2.isNullable)(options.round)) this.extra[cid].round = options.round;
       if (!(0, import_koishi2.isNullable)(options.lobby)) this.extra[cid].lobby = options.lobby;
+      if (!(0, import_koishi2.isNullable)(options.index)) this.extra[cid].playerIndex = options.index;
       return "Finished.";
     });
     ctx.command("mahjongpub.manager.deinit").channelFields(["mahjongpub/bind-contest"]).option("clear", "-c").action(async ({ session, options }) => {
@@ -478,7 +482,7 @@ var ContestManager = class {
       return;
     }
     const round = Object.values(rounds).find((x) => x.round === (cextra.round ?? contest.c_round) && x.t_class === cls);
-    const players = round.tids.map((tid) => getRowPlayer(contest, teams[tid], rowi));
+    const players = round.tids.map((tid) => getRowPlayer(contest, teams[tid], rowi, cextra.playerIndex));
     if (!players.every((x) => x)) {
       cextra.broadcast(`[${tag}] 失败： 名单未填写`);
       return;
@@ -563,6 +567,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
     this.config = config;
     ctx.plugin(ContestManager, config.manager);
     ctx.i18n.define("zh-CN", require_zh_CN());
+    this.contest = MahjongPub.new(ctx);
     ctx.model.extend("user", {
       "mahjongpub/bind-team": "string",
       "mahjongpub/bind-teams": "json"
@@ -826,6 +831,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
       ctx.command("mahjongpub.database.record.last <round:natural>", { authority: 3 }).option("rowi", "-i <rowi:integer>", { fallback: -1 }).option("ver", "-v <ver:integer>", { fallback: 0 }).channelFields(["mahjongpub/bind-contest"]).action(async ({ session, options }, round, cls) => {
         const [cid] = [session.channel["mahjongpub/bind-contest"]];
         try {
+          const cteams = await this.contest.getTeams(+cid);
           const record = await ctx.mahjong.database.db("scoreboard").collection("matches").find({
             cid,
             round,
@@ -841,7 +847,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
               seenCls.add(r.cls);
             }
           });
-          return filtered.map((r) => `[${r.cls}组] ` + r.results.map((x) => `${x.name} ${x.num}`).join(" / ")).join("\n");
+          return filtered.map((r) => `[${r.cls}-${r.rowi + 1}] ` + r.results.map((x, i) => `${cteams[r.tids[i]].t_name} ${x.num}`).join(" / ")).join("\n");
         } catch (e) {
           ctx.logger.warn(e);
           return session.text(".failed");
@@ -931,6 +937,7 @@ var MahjongPub2 = class extends import_koishi3.Service {
   }
   teams = {};
   contests = {};
+  contest;
   async getTeam(pw) {
     return new TeamAdmin(this.ctx, pw, this.config);
   }

package/lib/manager.d.ts

@@ -28,6 +28,7 @@ declare class ContestExtra {
     type: 'ti' | 'ssb';
     round?: number;
     lobby?: string;
+    playerIndex?: number;
     ver: number;
     constructor(ctx: Context);
     broadcast(msg: string): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hieuzest/koishi-plugin-mahjongpub",
   "description": "Mahjong.pub API",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [