koishi-plugin-prism-neo 0.0.10 → 0.0.13

package/lib/index.js

@@ -90,24 +90,26 @@ async function getLock({ ctx, config }, userId) {
   );
 }
 __name(getLock, "getLock");
-async function machinePowerOn({ ctx, config }, machineName, userId) {
+async function machinePowerOn({ ctx, config }, machineName, userId, needLogin = true) {
   return await ctx.http.post(
     makeUrl(config.url, `/machine/power`),
     {
       machineName,
       "powerState": true,
-      userId: `QQ:${userId}`
+      userId: `QQ:${userId}`,
+      needLogin
     }
   );
 }
 __name(machinePowerOn, "machinePowerOn");
-async function machinePowerOff({ ctx, config }, machineName, userId) {
+async function machinePowerOff({ ctx, config }, machineName, userId, needLogin = true) {
   return await ctx.http.post(
     makeUrl(config.url, `/machine/power`),
     {
       machineName,
       "powerState": false,
-      userId: `QQ:${userId}`
+      userId: `QQ:${userId}`,
+      needLogin
     }
   );
 }
@@ -164,11 +166,12 @@ async function redeem({ ctx, config }, code, userId) {
   );
 }
 __name(redeem, "redeem");
-async function insertCoin({ ctx, config }, alias, userId) {
+async function insertCoin({ ctx, config }, alias, userId, force = false) {
   return await ctx.http.post(
     makeUrl(config.url, `/remote/${alias}/coin`),
     {
-      userId: `QQ:${userId}`
+      userId: `QQ:${userId}`,
+      force
     }
   );
 }
@@ -183,7 +186,7 @@ var Config = import_koishi.Schema.object({
 });
 async function getUserName(session, userId) {
   if (userId) {
-    return (await session.bot.getUser(userId)).name + `(${userId}})`;
+    return (await session.bot.getUser(userId)).name + ` ( ${userId} )`;
   } else {
     return "匿名用户";
   }
@@ -302,7 +305,7 @@ async function handleLoginCmd(context, user) {
   await login(context, userId);
   const pwd = await getLock(context, userId);
   if (user) {
-    return `✅ 已为用户 ${getUserName(context.session, userId)} 入场，该用户的门锁密码是: ${pwd.password}
+    return `✅ 已为用户 ${await getUserName(context.session, userId)} 入场，该用户的门锁密码是: ${pwd.password}
 注意! 门锁密码有效期为三分钟`;
   }
   return `✅ 入场成功，你的门锁密码是: ${pwd.password}
@@ -317,7 +320,7 @@ async function handleLogoutCmd(context, user) {
   if (pendingLogout && now - pendingLogout < 60 * 1e3) {
     kv.delete(targetUserId);
     const res = await logout(context, targetUserId);
-    const messagePrefix = user ? `✅ 已为用户 ${getUserName(context.session, targetUserId)} 退场` : "✅ 退场成功";
+    const messagePrefix = user ? `✅ 已为用户 ${await getUserName(context.session, targetUserId)} 退场` : "✅ 退场成功";
     return [
       messagePrefix,
       `入场时间: ${formatDateTime(res.session.createdAt)}`,
@@ -455,13 +458,15 @@ async function handleItemsCmd(context, user) {
 __name(handleItemsCmd, "handleItemsCmd");
 async function handleMachineOn(context, alias) {
   if (!alias) return "请输入设备名";
-  const res = await machinePowerOn(context, alias, context.session.userId);
+  let isAdmin = await context.ctx.permissions.check(context.config.admin, context.session);
+  const res = await machinePowerOn(context, alias, context.session.userId, !isAdmin);
   return `${res.machine} 启动成功`;
 }
 __name(handleMachineOn, "handleMachineOn");
 async function handleMachineOff(context, alias) {
   if (!alias) return "请输入设备名";
-  const res = await machinePowerOff(context, alias, context.session.userId);
+  let isAdmin = await context.ctx.permissions.check(context.config.admin, context.session);
+  const res = await machinePowerOff(context, alias, context.session.userId, !isAdmin);
   return `${res.machine} 关闭成功`;
 }
 __name(handleMachineOff, "handleMachineOff");
@@ -534,7 +539,8 @@ async function handleRedeem(context, code) {
 __name(handleRedeem, "handleRedeem");
 async function handleCoin(context, alias) {
   if (!alias) return "请输入设备名";
-  const res = await insertCoin(context, alias, context.session.userId);
+  let isAdmin = await context.ctx.permissions.check(context.config.admin, context.session);
+  const res = await insertCoin(context, alias, context.session.userId, isAdmin);
   return `已为 ${res.machineName} 投入 ${res.count} 个币`;
 }
 __name(handleCoin, "handleCoin");

package/lib/service.d.ts

@@ -11,8 +11,8 @@ export declare function getLock({ ctx, config }: ActionContext, userId: string):
     password: string;
     id: any;
 }>;
-export declare function machinePowerOn({ ctx, config }: ActionContext, machineName: string, userId: string): Promise<any>;
-export declare function machinePowerOff({ ctx, config }: ActionContext, machineName: string, userId: string): Promise<any>;
+export declare function machinePowerOn({ ctx, config }: ActionContext, machineName: string, userId: string, needLogin?: boolean): Promise<any>;
+export declare function machinePowerOff({ ctx, config }: ActionContext, machineName: string, userId: string, needLogin?: boolean): Promise<any>;
 export declare function getAllMachinePower({ ctx, config, session }: ActionContext): Promise<{
     machine: string;
     state: {
@@ -29,4 +29,4 @@ export declare function walletAdd({ ctx, config }: ActionContext, amount: number
 export declare function walletDel({ ctx, config }: ActionContext, amount: number, userId: string): Promise<any>;
 export declare function costOverwrite({ ctx, config }: ActionContext, amount: string, userId: string): Promise<any>;
 export declare function redeem({ ctx, config }: ActionContext, code: string, userId: string): Promise<any>;
-export declare function insertCoin({ ctx, config }: ActionContext, alias: string, userId: string): Promise<any>;
+export declare function insertCoin({ ctx, config }: ActionContext, alias: string, userId: string, force?: boolean): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-prism-neo",
   "description": "prism koishi前端",
-  "version": "0.0.10",
+  "version": "0.0.13",
   "main": "lib/index.js",
   "files": [
     "lib",