koishi-plugin-noah 2.3.4 → 2.3.5

package/lib/core/utils/server.d.ts

@@ -1,6 +1,13 @@
 import { Context } from 'koishi';
+import { CardService } from '../services/card-service';
 import { ServerService } from '../services/server-service';
 import { UserService } from '../services/user-service';
+import { Card, Server } from '../types';
+/**
+ * Resolve the server for a given card, with fallback to channel/user defaults.
+ * If the card references a deleted server, cleans up the stale reference automatically.
+ */
+export declare function resolveServerForCard(card: Card, cardService: CardService, serverService: ServerService, uid: number, platform: string, channelId: string | null): Promise<Server | null>;
 /**
  * Ensure the user has an Official (KONAMI) server and return its id.
  * Creates one with the configured support URL when missing.

package/lib/index.cjs

@@ -644,18 +644,20 @@ var ServerService = class {
       if (channelServerRes.length > 0) {
         await this.ctx.database.set(
           "channel",
-          { id: channel.id },
+          { id: channel.id, platform: channel.platform },
           { defaultServerId: channelServerRes[0].sid }
         );
       } else {
-        await this.ctx.database.set("channel", { id: channel.id }, { defaultServerId: 0 });
+        await this.ctx.database.set(
+          "channel",
+          { id: channel.id, platform: channel.platform },
+          { defaultServerId: 0 }
+        );
       }
     }
     const cardRes = await this.ctx.database.get("card", { defaultServerId: id });
     for (const card2 of cardRes) {
-      if (card2.defaultServerId !== void 0 && card2.defaultServerId !== 0) {
-        await this.ctx.database.set("card", { id: card2.id }, { defaultServerId: 0 });
-      }
+      await this.ctx.database.set("card", { id: card2.id }, { defaultServerId: 0 });
     }
   }
   /**
@@ -997,6 +999,19 @@ function formatCardInfo(data) {
 __name(formatCardInfo, "formatCardInfo");
 
 // src/core/utils/server.ts
+async function resolveServerForCard(card2, cardService, serverService, uid, platform, channelId) {
+  if (card2.defaultServerId != void 0 && card2.defaultServerId != 0) {
+    const cardServer = await serverService.getServerById(card2.defaultServerId);
+    if (cardServer) return cardServer;
+    await cardService.updateCard(card2.id, { defaultServerId: 0 });
+  }
+  if (channelId) {
+    const channelDefault = await serverService.getDefaultServerByCid(platform, channelId);
+    if (channelDefault) return channelDefault;
+  }
+  return await serverService.getDefaultServerByUid(uid);
+}
+__name(resolveServerForCard, "resolveServerForCard");
 async function ensureOfficialServerForUser(ctx, serverService, userService, uid, officialSupportUrl) {
   const userServers = await serverService.getServersByUid(uid);
   const existingOfficial = userServers.find((server3) => server3.type === "official");
@@ -5843,23 +5858,15 @@ function radar(ctx, config, logger5) {
     const defaultCard = await cardService.getDefaultCardByUid(session.user.id);
     if (!defaultCard) return session.text(".card-not-found");
     const card2 = await cardService.getCardByCode(defaultCard.code);
-    let server2;
-    if (card2.defaultServerId != void 0 && card2.defaultServerId != 0)
-      server2 = await serverService.getServerById(card2.defaultServerId);
-    else {
-      const channelDefaultServer = atGuild ? await serverService.getDefaultServerByCid(
-        session.platform,
-        session.channel.id
-      ) : null;
-      if (channelDefaultServer) server2 = channelDefaultServer;
-      else {
-        const userDefaultServer = await serverService.getDefaultServerByUid(
-          session.user.id
-        );
-        if (userDefaultServer) server2 = userDefaultServer;
-        else return session.text(".server-not-found");
-      }
-    }
+    const server2 = await resolveServerForCard(
+      card2,
+      cardService,
+      serverService,
+      session.user.id,
+      session.platform,
+      atGuild ? session.channel.id : null
+    );
+    if (!server2) return session.text(".server-not-found");
     const serverManager = ServerManager.getInstance();
     const sdvxService = serverManager.getGameService(server2.type, "sdvx");
     const scoreService = ScoreService.getInstance();
@@ -5934,23 +5941,15 @@ function recent(ctx, config, logger5) {
       cardCode = userCards[selectNum - 1].code;
     }
     const card2 = await cardService.getCardByCode(cardCode);
-    let server2;
-    if (card2.defaultServerId != void 0 && card2.defaultServerId != 0)
-      server2 = await serverService.getServerById(card2.defaultServerId);
-    else {
-      const channelDefaultServer = atGuild ? await serverService.getDefaultServerByCid(
-        session.platform,
-        session.channel.id
-      ) : null;
-      if (channelDefaultServer) server2 = channelDefaultServer;
-      else {
-        const userDefaultServer = await serverService.getDefaultServerByUid(
-          session.user.id
-        );
-        if (userDefaultServer) server2 = userDefaultServer;
-        else return session.text(".server-not-found");
-      }
-    }
+    const server2 = await resolveServerForCard(
+      card2,
+      cardService,
+      serverService,
+      session.user.id,
+      session.platform,
+      atGuild ? session.channel.id : null
+    );
+    if (!server2) return session.text(".server-not-found");
     const serverManager = ServerManager.getInstance();
     const sdvxService = serverManager.getGameService(server2.type, "sdvx");
     try {
@@ -6279,23 +6278,15 @@ function vf(ctx, config, logger5) {
       cardCode = userCards[selectNum - 1].code;
     }
     const card2 = await cardService.getCardByCode(cardCode);
-    let server2;
-    if (card2.defaultServerId != void 0 && card2.defaultServerId != 0)
-      server2 = await serverService.getServerById(card2.defaultServerId);
-    else {
-      const channelDefaultServer = atGuild ? await serverService.getDefaultServerByCid(
-        session.platform,
-        session.channel.id
-      ) : null;
-      if (channelDefaultServer) server2 = channelDefaultServer;
-      else {
-        const userDefaultServer = await serverService.getDefaultServerByUid(
-          session.user.id
-        );
-        if (userDefaultServer) server2 = userDefaultServer;
-        else return session.text(".server-not-found");
-      }
-    }
+    const server2 = await resolveServerForCard(
+      card2,
+      cardService,
+      serverService,
+      session.user.id,
+      session.platform,
+      atGuild ? session.channel.id : null
+    );
+    if (!server2) return session.text(".server-not-found");
     const serverManager = ServerManager.getInstance();
     const sdvxService = serverManager.getGameService(server2.type, "sdvx");
     const scoreService = ScoreService.getInstance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-noah",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "contributors": [
     "Logthm <logthm@outlook.com>"
   ],