fix: getGroupList兼容trss-onebot array处理为数组

utils/common.js

@@ -832,6 +832,21 @@ export function getUin (e) {
   } else return Bot.uin
 }
 
+export async function getGroupList (e) {
+  let groupList
+  try {
+    groupList = await e.bot.getGroupList()
+  } catch (err) {
+    groupList = e.bot.gl
+  }
+  //onebot getGroupList方法返回的array，需要转换为map 等同于e.bot.gl
+  if (Array.isArray(groupList)) {
+    return e.bot.gl
+  } else {
+    return groupList
+  }
+}
+
 /**
  * 生成当前语音模式下可发送的音频信息
  * @param e - 上下文对象

utils/tools/SendAudioMessageTool.js

@@ -1,7 +1,7 @@
 import { AbstractTool } from './AbstractTool.js'
 import { generateVitsAudio } from '../tts.js'
 import { Config } from '../config.js'
-import { generateAudio, generateAzureAudio } from '../common.js'
+import { generateAudio, generateAzureAudio, getGroupList } from '../common.js'
 import VoiceVoxTTS from '../tts/voicevox.js'
 import uploadRecord from '../uploadRecord.js'
 
@@ -102,12 +102,7 @@ export class SendAudioMessageTool extends AbstractTool {
       return `audio generation failed,  error: ${JSON.stringify(err)}`
     }
     if (sendable) {
-      let groupList
+      let groupList = await getGroupList(e)
-      try {
-        groupList = await e.bot.getGroupList()
-      } catch (err) {
-        groupList = e.bot.gl
-      }
       try {
         if (groupList.get(target)) {
           let group = await e.bot.pickGroup(target)

utils/tools/SendAvatarTool.js

@@ -1,4 +1,5 @@
 import { AbstractTool } from './AbstractTool.js'
+import { getGroupList } from '../common.js'
 
 export class SendAvatarTool extends AbstractTool {
   name = 'sendAvatar'
@@ -27,12 +28,7 @@ export class SendAvatarTool extends AbstractTool {
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
       : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
-    let groupList
+    let groupList = await getGroupList(e)
-    try {
-      groupList = await e.bot.getGroupList()
-    } catch (err) {
-      groupList = e.bot.gl
-    }
     console.log('sendAvatar', target, pictures)
     if (groupList.get(target)) {
       let group = await e.bot.pickGroup(target)

utils/tools/SendDiceTool.js

@@ -1,4 +1,5 @@
 import { AbstractTool } from './AbstractTool.js'
+import { getGroupList } from '../common.js'
 
 export class SendDiceTool extends AbstractTool {
   name = 'sendDice'
@@ -24,12 +25,7 @@ export class SendDiceTool extends AbstractTool {
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
       : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
-    let groupList
+    let groupList = await getGroupList(e)
-    try {
-      groupList = await e.bot.getGroupList()
-    } catch (err) {
-      groupList = e.bot.gl
-    }
     num = isNaN(num) || !num ? 1 : num > 5 ? 5 : num
     if (groupList.get(target)) {
       let group = await e.bot.pickGroup(target, true)

utils/tools/SendMessageToSpecificGroupOrUserTool.js

@@ -1,6 +1,6 @@
 import { AbstractTool } from './AbstractTool.js'
 import { convertFaces } from '../face.js'
-import {getMasterQQ} from '../common.js'
+import {getMasterQQ, getGroupList} from '../common.js'
 import {Config} from '../config.js'
 
 export class SendMessageToSpecificGroupOrUserTool extends AbstractTool {
@@ -27,12 +27,7 @@ export class SendMessageToSpecificGroupOrUserTool extends AbstractTool {
       ? defaultTarget
       : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
 
-    let groupList
+    let groupList = await getGroupList(e)
-    try {
-      groupList = await e.bot.getGroupList()
-    } catch (err) {
-      groupList = e.bot.gl
-    }
     try {
       if (groupList.get(target)) {
         let group = await e.bot.pickGroup(target)

utils/tools/SendPictureTool.js

@@ -1,5 +1,5 @@
 import { AbstractTool } from './AbstractTool.js'
-import {getMasterQQ} from '../common.js'
+import {getMasterQQ, getGroupList} from '../common.js'
 import {Config} from '../config.js'
 
 export class SendPictureTool extends AbstractTool {
@@ -37,16 +37,10 @@ export class SendPictureTool extends AbstractTool {
     let pictures = urlOfPicture.trim().split(' ')
     logger.mark('pictures to send: ', pictures)
     pictures = pictures.map(img => segment.image(img))
-    let groupList
+    let groupList = await getGroupList(e)
-    try {
-      groupList = await e.bot.getGroupList()
-    } catch (err) {
-      groupList = e.bot.gl
-    }
     let errs = []
     try {
-      if ((typeof groupList.get === 'function' && groupList.get(target)) || 
+      if (groupList.get(target)) {
-          (Array.isArray(groupList) && groupList.includes(target))) {
         let group = await e.bot.pickGroup(target)
         for (let pic of pictures) {
           try {

utils/tools/SendRPSTool.js

@@ -1,4 +1,5 @@
 import { AbstractTool } from './AbstractTool.js'
+import { getGroupList } from '../common.js'
 
 export class SendRPSTool extends AbstractTool {
   name = 'sendRPS'
@@ -20,12 +21,7 @@ export class SendRPSTool extends AbstractTool {
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
       : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
-    let groupList
+    let groupList = await getGroupList(e)
-    try {
-      groupList = await e.bot.getGroupList()
-    } catch (err) {
-      groupList = e.bot.gl
-    }
     if (groupList.get(target)) {
       let group = await e.bot.pickGroup(target, true)
       await group.sendMsg(segment.rps(num))