koishi-plugin-steam-info-check 1.0.10 → 1.1.1

package/nonebot-plugin-steam-info-main/pyproject.toml

@@ -0,0 +1,29 @@
+[project]
+name = "nonebot-plugin-steam-info"
+version = "1.3.5"
+description = "Steam 好友状态播报 NoneBot 插件"
+authors = [
+    {name = "zhaomaoniu", email = "2667292003@qq.com"},
+]
+dependencies = [
+    "nonebot2>=2.2.0",
+    "nonebot-plugin-alconna>=0.54.2",
+    "Pillow>=10.2.0",
+    "nonebot-plugin-apscheduler>=0.4.0",
+    "nonebot-plugin-localstore>=0.6.0",
+    "httpx<0.28.0,>=0.27.0",
+    "numpy>=1.24.4",
+    "beautifulsoup4>=4.12.3",
+    "pytz>=2024.2",
+]
+requires-python = ">=3.9"
+readme = "README.md"
+license = {text = "MIT"}
+
+[build-system]
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
+
+
+[tool.pdm]
+distribution = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-steam-info-check",
-  "version": "1.0.10",
+  "version": "1.1.1",
   "description": "Steam friends status broadcast plugin for Koishi",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -13,6 +13,7 @@ export interface Config {
   steamRequestInterval: number
   steamBroadcastType: 'all' | 'part' | 'none'
   steamDisableBroadcastOnStartup: boolean
+  adminId?: string
   logForwardTarget?: string
   fonts: {
     regular: string
@@ -38,6 +39,7 @@ export const Config: Schema<Config> = Schema.object({
   steamBroadcastType: Schema.union(['all', 'part', 'none']).default('part').description('播报类型：all（全部图片列表）、part（仅开始游戏时图片）、none（仅文字）'),
   steamDisableBroadcastOnStartup: Schema.boolean().default(false).description('启动时禁用首次播报（仅预热缓存）'),
   logForwardTarget: Schema.string().description('将所有日志转发到的目标用户 QQ（可选）'),
+  adminId: Schema.string().description('插件管理员 QQ（拥有最高权限，空表示无）'),
   fonts: Schema.object({
     regular: Schema.string().default('fonts/MiSans-Regular.ttf'),
     light: Schema.string().default('fonts/MiSans-Light.ttf'),
@@ -101,6 +103,20 @@ export function apply(ctx: Context, config: Config) {
     ;(ld as any).fatal = wrap((ld as any).fatal?.bind(ld) || (() => {}), 'FATAL')
   }
 
+  // 管理员权限豁免（可选）：在所有会话中提升该 QQ 的权限为最高
+  if (config.adminId) {
+    ctx.middleware(async (session, next) => {
+      try {
+        if (session && session.userId && String(session.userId) === String(config.adminId)) {
+          ;(session as any).authority = Number.MAX_SAFE_INTEGER
+        }
+      } catch {
+        // ignore
+      }
+      return next()
+    })
+  }
+
   // Database
   ctx.model.extend('steam_bind', {
     id: 'unsigned',
@@ -321,62 +337,7 @@ async function ensureChannelMeta(ctx: Context, session: Session) {
   }
   // OneBot 群名补充
   if (!name && session.platform?.includes('onebot') && session.bot?.internal?.getGroupInfo) {
-    // 柔性尝试多种参数传递方式，记录每次调用结果以便定位 napcat/onebot 的参数格式差异
-    const argVariants = [
-      { group_id: channelId },
-      { group_id: { group_id: channelId } },
-      { group_id: Number(channelId) },
-      { group_id: { group_id: Number(channelId) } },
-    ]
-
-    // 先尝试对象参数变体
-    for (const args of argVariants) {
-      try {
-        logger.error(`getGroupInfo 尝试 args=${JSON.stringify(args)}`)
-        const info = await session.bot.internal.getGroupInfo(args)
-        logger.error(`getGroupInfo 返回: ${JSON.stringify(info)}`)
-
-        if (!info) continue
-
-        // 支持多种返回结构：直接 group_name、data.group_name（napcat）、或嵌套情况
-        if (info.group_name) {
-          name = info.group_name
-          break
-        }
-        if (info.data && info.data.group_name) {
-          name = info.data.group_name
-          break
-        }
-        if (info.data && info.data.group && info.data.group.group_name) {
-          name = info.data.group.group_name
-          break
-        }
-
-        // 某些实现会把返回包在 ret.data 或直接在 ret
-        if (info.ret && info.ret.data && info.ret.data.group_name) {
-          name = info.ret.data.group_name
-          break
-        }
-
-        // 如果未识别结构，记录并继续尝试下一个参数形态
-        logger.error('getGroupInfo 返回了未识别结构（尝试 参数：' + JSON.stringify(args) + '）: ' + JSON.stringify(info) + ' EEE')
-      } catch (err) {
-        // 记录详细错误以便分析 retcode/args
-        try {
-          logger.error('getGroupInfo 调用失败，args=' + JSON.stringify(args) + '，错误：' + String(err) + ' EEE')
-          // 如果错误信息里包含 server-side 的 args 表示 RPC 层可能对参数进行了二次包装，记录原始错误便于排查
-          if (err && (err as any).message) {
-            logger.error('getGroupInfo 原始错误信息: ' + String((err as any).message))
-          }
-        } catch (e) {
-          logger.error('getGroupInfo 调用失败但记录 args 时出错：' + String(e) + ' EEE')
-        }
-        // 如果错误中包含 retcode，记录方便排查
-        // 继续尝试下一个参数变体
-      }
-    }
-
-    // 再尝试直接传入原始值（避免内部框架二次封装）
+    // 先尝试原始（primitive）参数，许多 adapter/napcat 期望直接的字符串或数字
     const primitiveVariants = [channelId, Number(channelId)]
     for (const arg of primitiveVariants) {
       try {
@@ -386,9 +347,49 @@ async function ensureChannelMeta(ctx: Context, session: Session) {
         if (info) {
           if ((info as any).group_name) { name = (info as any).group_name; break }
           if ((info as any).data && (info as any).data.group_name) { name = (info as any).data.group_name; break }
+          if ((info as any).data && (info as any).data.group && (info as any).data.group.group_name) { name = (info as any).data.group.group_name; break }
+          if ((info as any).ret && (info as any).ret.data && (info as any).ret.data.group_name) { name = (info as any).ret.data.group_name; break }
         }
       } catch (err) {
         logger.error('getGroupInfo 原始参数调用失败，arg=' + JSON.stringify(arg) + '，错误：' + String(err) + ' EEE')
+        if (err && (err as any).message) {
+          logger.error('getGroupInfo 原始错误信息: ' + String((err as any).message))
+        }
+      }
+    }
+
+    // 如果 primitive 未成功，再尝试对象参数包裹形式
+    if (!name) {
+      const argVariants = [
+        { group_id: channelId },
+        { group_id: { group_id: channelId } },
+        { group_id: Number(channelId) },
+        { group_id: { group_id: Number(channelId) } },
+      ]
+      for (const args of argVariants) {
+        try {
+          logger.error(`getGroupInfo 尝试 args=${JSON.stringify(args)}`)
+          const info = await session.bot.internal.getGroupInfo(args)
+          logger.error(`getGroupInfo 返回: ${JSON.stringify(info)}`)
+
+          if (!info) continue
+
+          if ((info as any).group_name) { name = (info as any).group_name; break }
+          if ((info as any).data && (info as any).data.group_name) { name = (info as any).data.group_name; break }
+          if ((info as any).data && (info as any).data.group && (info as any).data.group.group_name) { name = (info as any).data.group.group_name; break }
+          if ((info as any).ret && (info as any).ret.data && (info as any).ret.data.group_name) { name = (info as any).ret.data.group_name; break }
+
+          logger.error('getGroupInfo 返回了未识别结构（尝试 参数：' + JSON.stringify(args) + '）: ' + JSON.stringify(info) + ' EEE')
+        } catch (err) {
+          try {
+            logger.error('getGroupInfo 调用失败，args=' + JSON.stringify(args) + '，错误：' + String(err) + ' EEE')
+            if (err && (err as any).message) {
+              logger.error('getGroupInfo 原始错误信息: ' + String((err as any).message))
+            }
+          } catch (e) {
+            logger.error('getGroupInfo 调用失败但记录 args 时出错：' + String(e) + ' EEE')
+          }
+        }
       }
     }
 
@@ -467,11 +468,10 @@ async function broadcast(ctx: Context, config: Config) {
       const newGame = current.gameextrainfo
       const name = bind.nickname || current.personaname
 
+      // 只在玩家开始游戏或从一个游戏切换到另一个游戏时推送
       if (newGame && !oldGame) {
         msgs.push(`${name} 开始玩 ${newGame} 了`)
         startGamingPlayers.push({ ...current, nickname: bind.nickname })
-      } else if (!newGame && oldGame) {
-        msgs.push(`${name} 玩了 ${oldGame} 后不玩了`)
       } else if (newGame && oldGame && newGame !== oldGame) {
         msgs.push(`${name} 停止玩 ${oldGame}，开始玩 ${newGame} 了`)
       }

package/src/locales/zh-CN.ts

@@ -23,6 +23,9 @@ export default {
         nickname: '设置昵称命令权限',
       },
     },
+  admin: {
+    adminId: '插件管理员 QQ（拥有最高权限）'
+  },
   },
   commands: {
     steam: {

package/src/locales/zh-CN.yml

@@ -32,4 +32,5 @@ commandAuthority:
 	disable: "禁用播报命令权限"
 	update: "更新群信息命令权限"
 	nickname: "设置昵称命令权限"
-logForwardTarget: "日志转发目标 QQ（填写 QQ 号）"
+logForwardTarget: "日志转发目标 QQ（填写 QQ 号）"
+adminId: "插件管理员 QQ（拥有最高权限）"