perf: #steam设置随机bot开启 仅限TRSS

XasYer · Dec 6, 2024 · 4c35030 · 4c35030
1 parent dfb18b3
commit 4c35030
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/apps/setting.js b/apps/setting.js
@@ -14,7 +14,7 @@ const app = {
 
 export const rule = {
   setting: {
-    reg: new RegExp(`^#steam设置\\s*(${keys.join('|')})?[\\s+]*(.*)$`),
+    reg: new RegExp(`^#steam设置\\s*(${keys.join('|')})?[\\s+]*(.*)$`, 'i'),
     fnc: async e => {
       if (!e.isMaster) {
         await e.reply('只有主人才可以设置哦~')
@@ -30,7 +30,17 @@ export const rule = {
         // 设置模式
         let val = regRet[2] || ''
 
-        if (regRet[1] == '全部') {
+        const key = (() => {
+          if (/apikey/i.test(regRet[1])) {
+            return 'apiKey'
+          } if (/随机Bot/i.test(regRet[1])) {
+            return '随机Bot'
+          } else {
+            return regRet[1]
+          }
+        })()
+
+        if (key == '全部') {
           val = !/关闭/.test(val)
           for (const i of keys) {
             if (typeof cfgSchemaMap[i].def == 'boolean') {
@@ -42,7 +52,7 @@ export const rule = {
             }
           }
         } else {
-          const cfgSchema = cfgSchemaMap[regRet[1]]
+          const cfgSchema = cfgSchemaMap[key]
           if (cfgSchema.type !== 'array') {
             if (cfgSchema.input) {
               val = cfgSchema.input(val)

diff --git a/components/Config.js b/components/Config.js
@@ -91,6 +91,7 @@ class Config {
    *  pushMode: number,
    *  time: number,
    *  defaultPush: boolean,
+   *  randomBot: boolean,
    *  blackBotList: string[],
    *  whiteBotList: string[],
    *  blackGroupList: string[],

diff --git a/config/default_config/push.yaml b/config/default_config/push.yaml
@@ -18,6 +18,9 @@ time: 5
 # 是否默认开启推送 即绑定steamId之后不需要发 #steam开启推送 指令
 defaultPush: true
 
+# 是否随机Bot进行推送, 有多个Bot在同一群群时随机选择一个在线的Bot推送状态 (仅限TRSS)
+randomBot: false
+
 # 推送的Bot黑名单, 不开启推送的Bot将不会被推送, 比如腾讯QQBot限制主动消息
 blackBotList:
   - 3889000138

diff --git a/models/setting/index.js b/models/setting/index.js
@@ -86,8 +86,11 @@ export const cfgSchema = {
         key: '推送模式',
         type: 'number',
         def: 1,
-        min: 1,
-        max: 2,
+        component: 'RadioGroup',
+        options: [
+          { label: '文字推送', value: 1 },
+          { label: '图片推送', value: 2 }
+        ],
         input: (n) => {
           if (n >= 1 && n <= 2) {
             return n * 1
@@ -97,6 +100,13 @@ export const cfgSchema = {
         },
         desc: '推送模式 1: 文字推送 2: 图片推送'
       },
+      randomBot: {
+        title: '随机推送Bot',
+        key: '随机Bot',
+        type: 'boolean',
+        def: false,
+        desc: '有多个Bot在同一群群时随机选择一个在线的Bot推送状态 (仅限TRSS)'
+      },
       blackBotList: {
         title: '推送黑名单机器人',
         key: '推送bot黑名单',

diff --git a/models/utils/index.js b/models/utils/index.js
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import moment from 'moment'
 import { Bot, logger } from '#lib'
-import { Version } from '#components'
+import { Config, Version } from '#components'
 import * as request from './request.js'
 import { join } from 'path'
 
@@ -86,14 +86,15 @@ export async function getUserName (botId, uid, gid) {
       }
     } else {
       uid = Number(uid) || uid
+      const bot = (Config.push.randomBot && Version.BotName === 'Trss-Yunzai') ? Bot : Bot[botId]
       if (gid) {
         gid = Number(gid) || gid
-        const group = Bot[botId].pickGroup(gid)
+        const group = bot.pickGroup(gid)
         const member = await group.pickMember(uid)
         const info = await member.getInfo?.() || member.info || {}
         return info.card || info.nickname || info.user_id || uid
       } else {
-        const user = Bot[botId].pickFriend(uid)
+        const user = bot.pickFriend(uid)
         const info = await user.getInfo?.() || user.info || {}
         return info.nickname || info.user_id || uid
       }
@@ -118,15 +119,16 @@ export async function getUserAvatar (botId, uid, gid) {
       return avatarUrl || await bot.getAvatarUrl(botId) || ''
     } else {
       uid = Number(uid) || uid
+      const bot = (Config.push.randomBot && Version.BotName === 'Trss-Yunzai') ? Bot : Bot[botId]
       if (gid) {
         gid = Number(gid) || gid
-        const group = Bot[botId].pickGroup(gid)
+        const group = bot.pickGroup(gid)
         const avatarUrl = (await group.pickMember(uid)).getAvatarUrl()
-        return avatarUrl || Bot[botId].avatar
+        return avatarUrl || bot.avatar
       } else {
-        const user = Bot[botId].pickUser(uid)
+        const user = bot.pickUser(uid)
         const avatarUrl = await user.getAvatarUrl()
-        return avatarUrl || Bot[botId].avatar || ''
+        return avatarUrl || bot.avatar || ''
       }
     }
   } catch {
@@ -147,7 +149,8 @@ export async function getGroupMemberList (botId, groupId) {
       const memberList = await Bot.getBot(botId).GetGroupMemberList(groupId)
       result.push(...memberList.map(i => i.uid))
     } else {
-      const memberMap = await Bot[botId].pickGroup(groupId).getMemberMap()
+      const bot = (Config.push.randomBot && Version.BotName === 'Trss-Yunzai') ? Bot : Bot[botId]
+      const memberMap = await bot.pickGroup(groupId).getMemberMap()
       result.push(...memberMap.keys())
     }
   } catch { }
@@ -187,7 +190,8 @@ export async function sendGroupMsg (botId, gid, msg) {
     return await Bot.sendMsg(botId, { scene: 'group', peer: gid }, msg)
   } else {
     gid = Number(gid) || gid
-    return await Bot[botId].pickGroup(gid).sendMsg(msg)
+    const bot = (Config.push.randomBot && Version.BotName === 'Trss-Yunzai') ? Bot : Bot[botId]
+    return await bot.pickGroup(gid).sendMsg(msg)
   }
 }