koishi-plugin-noah 1.0.1 → 1.0.3

package/lib/core/services/user-service.d.ts

@@ -19,5 +19,5 @@ export declare class UserService {
      * @param cid Channel ID
      * @param serverId Server ID
      */
-    updateChannelDefaultServer(cid: string, serverId: number): Promise<void>;
+    updateChannelDefaultServer(platform: string, cid: string, serverId: number): Promise<void>;
 }

package/lib/index.js

@@ -450,8 +450,8 @@ var UserService = class {
    * @param cid Channel ID
    * @param serverId Server ID
    */
-  async updateChannelDefaultServer(cid, serverId) {
-    await this.ctx.database.set("channel", cid, { defaultServerId: serverId });
+  async updateChannelDefaultServer(platform, cid, serverId) {
+    await this.ctx.database.setChannel(platform, cid, { defaultServerId: serverId });
   }
 };
 
@@ -737,7 +737,6 @@ function hasPermission(...perms) {
 }
 __name(hasPermission, "hasPermission");
 function isPluginAdmin(session, config) {
-  console.log(config.adminUsers, session.userId);
   return config.adminUsers?.includes(session.userId) ?? false;
 }
 __name(isPluginAdmin, "isPluginAdmin");
@@ -849,7 +848,7 @@ async function showServerMenu(ctx, session, serverService, userService, server2,
     return session.text("commands.timeout");
   const selectNum = parseInt(select, 10);
   if (isNaN(selectNum) || selectNum < 0 || selectNum > 4) {
-    return await session.text(".invalid-select");
+    return session.text(".invalid-select");
   }
   if (selectNum === 0) {
     if (from === "user")
@@ -865,7 +864,7 @@ async function showServerMenu(ctx, session, serverService, userService, server2,
     } else {
       if (channelDefaultServerId === server2.id)
         return session.text(".menu-1-error-duplicate");
-      await userService.updateChannelDefaultServer(cid, server2.id);
+      await userService.updateChannelDefaultServer(session.platform, cid, server2.id);
     }
     return session.text(".menu-1-success");
   }
@@ -894,9 +893,9 @@ async function showServerMenu(ctx, session, serverService, userService, server2,
       if (channelDefaultServerId === server2.id) {
         const res = await serverService.getServersByCid(cid);
         if (res.length === 0) {
-          await userService.updateChannelDefaultServer(cid, 0);
+          await userService.updateChannelDefaultServer(session.platform, cid, 0);
         } else {
-          await userService.updateChannelDefaultServer(cid, res[0].id);
+          await userService.updateChannelDefaultServer(session.platform, cid, res[0].id);
         }
       }
     }
@@ -926,7 +925,7 @@ async function addServer(ctx, session, serverService, userService, from, uid, us
     return session.text("commands.timeout");
   const selectNum = parseInt(select, 10);
   if (isNaN(selectNum) || selectNum < 1 || selectNum > serverValues.length) {
-    return await session.text(".invalid-select");
+    return session.text(".invalid-select");
   }
   const serverType = serverValues[selectNum - 1];
   await session.send(session.text(".add-url"));
@@ -939,24 +938,25 @@ async function addServer(ctx, session, serverService, userService, from, uid, us
     return session.text("commands.timeout");
   if (serverName.includes(" "))
     return session.text(".add-invalid-name");
-  const res = from === "user" ? await serverService.createServerForUser({
-    type: serverType,
-    name: serverName,
-    baseUrl: url,
-    supportedGames: []
-  }, uid) : await serverService.createServerForChannel({
-    type: serverType,
-    name: serverName,
-    baseUrl: url,
-    supportedGames: []
-  }, cid);
   if (from === "user") {
+    const res = await serverService.createServerForUser({
+      type: serverType,
+      name: serverName,
+      baseUrl: url,
+      supportedGames: []
+    }, uid);
     if (userDefaultServerId === 0) {
       await userService.updateUserDefaultServer(uid, res.id);
     }
   } else {
+    const res = await serverService.createServerForChannel({
+      type: serverType,
+      name: serverName,
+      baseUrl: url,
+      supportedGames: []
+    }, cid);
     if (channelDefaultServerId === 0) {
-      await userService.updateChannelDefaultServer(cid, res.id);
+      await userService.updateChannelDefaultServer(session.platform, cid, res.id);
     }
   }
   return session.text(".add-success", { serverName, serverType });
@@ -1291,7 +1291,7 @@ function calculateVolforce(raw_score) {
   const gradeFactor = GRADE_FACTORS[grade];
   const clearFactor = CLEAR_FACTORS[clearType];
   const volforce = level * score * gradeFactor * clearFactor * 2e-6;
-  return Math.round(volforce) / 20;
+  return Math.floor(volforce) / 20;
 }
 __name(calculateVolforce, "calculateVolforce");
 
@@ -1357,6 +1357,25 @@ var SDVXService2 = class _SDVXService {
     };
     return diffStrMap[diffType] || "novice";
   }
+  /**
+   * Get the user name/ID from the server response
+   * @param ctx Context object
+   * @param url Base URL for the API
+   * @param cardId Card ID of the player
+   * @returns The player ID (e.g., "ED*")
+   */
+  async getUserName(ctx, url, cardId) {
+    try {
+      const response = await ctx.http.get(`/my?card=${cardId}`, { baseURL: url, responseType: "text" });
+      const match = response.match(/猫网玩家\[([^\]]+)\]/);
+      if (!match || !match[1]) {
+        throw new Error("Failed to extract player ID from response");
+      }
+      return match[1];
+    } catch (error) {
+      throw error;
+    }
+  }
   async getAllScore(ctx, url, cardId, config) {
     try {
       const data = await ctx.http.get(`/sdvx/scores?card=${cardId}`, { baseURL: url, responseType: "json" });
@@ -2077,16 +2096,53 @@ var SDVXDrawer = class extends BaseDrawer {
             subTitle = score.music_data.sub_title_name;
           }
         }
-        const wrappedText = this.wrapText(ctx, mainTitle, 413);
-        wrappedText.forEach((line, index) => {
-          ctx.fillText(line, x + 388, y + 90 + index * 30);
-        });
-        ctx.fillStyle = "rgba(255, 255, 255, 0.7)";
-        const wrappedSubTitle = this.wrapText(ctx, subTitle, 413);
-        const startY2 = y + 388 + wrappedText.length * 30;
-        wrappedSubTitle.forEach((line, index) => {
-          ctx.fillText(line, x + 388, startY2 + index * 28);
-        });
+        const totalAvailableWidth = 413;
+        ctx.font = '400 24px "Noto Sans JP"';
+        const mainTitleWidth = ctx.measureText(mainTitle).width;
+        let displayMainTitle = mainTitle;
+        if (subTitle) {
+          const mainTitleMaxWidth = totalAvailableWidth * 0.7;
+          if (mainTitleWidth > mainTitleMaxWidth) {
+            let fitLength = 0;
+            for (let i2 = 1; i2 <= mainTitle.length; i2++) {
+              if (ctx.measureText(mainTitle.substring(0, i2)).width > mainTitleMaxWidth) {
+                fitLength = i2 - 1;
+                break;
+              }
+            }
+            displayMainTitle = mainTitle.substring(0, fitLength);
+          }
+          ctx.fillStyle = "#FFFFFF";
+          ctx.fillText(displayMainTitle, x + 388, y + 90);
+          ctx.fillStyle = "rgba(255, 255, 255, 0.7)";
+          const actualMainTitleWidth = ctx.measureText(displayMainTitle).width;
+          const remainingWidth = totalAvailableWidth - actualMainTitleWidth - 10;
+          let displaySubTitle = subTitle;
+          if (ctx.measureText(subTitle).width > remainingWidth) {
+            let fitLength = 0;
+            for (let i2 = 1; i2 <= subTitle.length; i2++) {
+              if (ctx.measureText(subTitle.substring(0, i2)).width > remainingWidth) {
+                fitLength = i2 - 1;
+                break;
+              }
+            }
+            displaySubTitle = subTitle.substring(0, fitLength);
+          }
+          ctx.fillText(displaySubTitle, x + 388 + actualMainTitleWidth + 10, y + 90);
+        } else {
+          if (mainTitleWidth > totalAvailableWidth) {
+            let fitLength = 0;
+            for (let i2 = 1; i2 <= mainTitle.length; i2++) {
+              if (ctx.measureText(mainTitle.substring(0, i2)).width > totalAvailableWidth) {
+                fitLength = i2 - 1;
+                break;
+              }
+            }
+            displayMainTitle = mainTitle.substring(0, fitLength);
+          }
+          ctx.fillStyle = "#FFFFFF";
+          ctx.fillText(displayMainTitle, x + 388, y + 90);
+        }
         ctx.fillStyle = "#FFFFFF";
         const grade = score.music.score_grade;
         if (gradeImages[grade]) {
@@ -2332,7 +2388,7 @@ function vf(ctx, config) {
       const sdvxDrawer = drawerManager.getDrawer("sdvx");
       const imageBuffer = await sdvxDrawer.generateVFImage({
         scores: scoreList,
-        playerName: card2.name || "Unknown Player",
+        playerName: await sdvxService.getUserName(ctx, server2.baseUrl, card2.code),
         config
       }, {
         lossless: options.lossless || false

package/lib/servers/Mao/services/sdvx-service.d.ts

@@ -13,6 +13,14 @@ export declare class SDVXService implements ISDVXService {
      * @returns The difficulty string (novice, advanced, exhaust, infinite, maximum)
      */
     private getDifficultyString;
+    /**
+     * Get the user name/ID from the server response
+     * @param ctx Context object
+     * @param url Base URL for the API
+     * @param cardId Card ID of the player
+     * @returns The player ID (e.g., "ED*")
+     */
+    getUserName(ctx: Context, url: string, cardId: string): Promise<string>;
     getAllScore(ctx: Context, url: string, cardId: string, config: SDVXConfig): Promise<SDVXScore[]>;
     getScore(ctx: Context, url: string, cardId: string, musicId: number, config: SDVXConfig): Promise<SDVXScore>;
     getRecentScores(ctx: Context, url: string, cardId: string, count: number, config: SDVXConfig): Promise<SDVXScore[]>;

package/lib/types/index.d.ts

@@ -46,6 +46,14 @@ export interface SDVXService extends GameService {
      * @throws Error if the fetch operation fails
      */
     getRecentScores(ctx: Context, url: string, cardId: string, count?: number, config?: SDVXConfig): Promise<SDVXScore[]>;
+    /**
+     * Get the user name/ID from the server response
+     * @param ctx Context object
+     * @param url Base URL for the API
+     * @param cardId Card ID of the player
+     * @returns The player ID (e.g., "ED*")
+     */
+    getUserName(ctx: Context, url: string, cardId: string): Promise<string>;
 }
 export interface IServer {
     name: TServer;

package/package.json

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