Merge branch 'v2' of github.com:ikechan8370/chatgpt-plugin into v2

apps/chat.js

@@ -1592,13 +1592,13 @@ export class chatgpt extends plugin {
                   opt.qq = e.sender.user_id
                   opt.nickname = e.sender.card
                   opt.groupName = e.group.name
-                  opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : Bot.nickname
+                  opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : e.bot.nickname
                   let master = (await getMasterQQ())[0]
                   if (master && e.group) {
                     opt.masterName = e.group.pickMember(parseInt(master)).card || e.group.pickMember(parseInt(master)).nickname
                   }
                   if (master && !e.group) {
-                    opt.masterName = Bot.getFriendList().get(parseInt(master))?.nickname
+                    opt.masterName = e.bot.getFriendList().get(parseInt(master))?.nickname
                   }
                   let latestChats = await e.group.getChatHistory(0, 1)
                   if (latestChats.length > 0) {
@@ -2043,13 +2043,13 @@ export class chatgpt extends plugin {
             opt.qq = e.sender.user_id
             opt.nickname = e.sender.card
             opt.groupName = e.group.name
-            opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : Bot.nickname
+            opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : e.bot.nickname
             let master = (await getMasterQQ())[0]
             if (master && e.group) {
               opt.masterName = e.group.pickMember(parseInt(master)).card || e.group.pickMember(parseInt(master)).nickname
             }
             if (master && !e.group) {
-              opt.masterName = Bot.getFriendList().get(parseInt(master))?.nickname
+              opt.masterName = e.bot.getFriendList().get(parseInt(master))?.nickname
             }
             let latestChat = await e.group.getChatHistory(0, 1)
             let seq = latestChat[0].seq
@@ -2087,7 +2087,7 @@ export class chatgpt extends plugin {
               system += chats
                 .map(chat => {
                   let sender = chat.sender || {}
-                  // if (sender.user_id === Bot.uin && chat.raw_message.startsWith('建议的回复')) {
+                  // if (sender.user_id === e.bot.uin && chat.raw_message.startsWith('建议的回复')) {
                   if (chat.raw_message.startsWith('建议的回复')) {
                     // 建议的回复太容易污染设定导致对话太固定跑偏了
                     return ''
@@ -2215,7 +2215,7 @@ export class chatgpt extends plugin {
             logger.mark(logger.green('【ChatGPT-Plugin】插件avocado-plugin未安装') + '，安装后可查看最近热映电影与体验可玩性更高的点歌工具。\n可前往 https://github.com/Qz-Sean/avocado-plugin 获取')
           }
           if (e.isGroup) {
-            let botInfo = await Bot.getGroupMemberInfo(e.group_id, getUin(e), true)
+            let botInfo = await e.bot.getGroupMemberInfo(e.group_id, getUin(e), true)
             if (botInfo.role !== 'member') {
               // 管理员才给这些工具
               tools.push(...[new EditCardTool(), new JinyanTool(), new KickOutTool(), new HandleMessageMsgTool(), new SetTitleTool()])
@@ -2467,7 +2467,7 @@ export class chatgpt extends plugin {
     }
     if (bots.code === 0) {
       if (bots.data.pageList.length > 0) {
-        this.reply(await makeForwardMsg(this.e, bots.data.pageList.map(msg => `${msg.bot.botId} - ${msg.bot.botName}`)))
+        this.reply(await makeForwardMsg(this.e, bots.data.pageList.map(msg => `${msg.e.bot.botId} - ${msg.e.bot.botName}`)))
       } else {
         await e.reply('未查到相关助手', true)
       }

apps/entertainment.js

@@ -296,7 +296,7 @@ ${translateLangLabels}
     let groupId = e.msg.replace(/^#chatgpt打招呼/, '')
     logger.info(groupId)
     groupId = parseInt(groupId)
-    if (groupId && !Bot.getGroupList().get(groupId)) {
+    if (groupId && !e.bot.getGroupList().get(groupId)) {
       await e.reply('机器人不在这个群里！')
       return
     }
@@ -310,7 +310,7 @@ ${translateLangLabels}
     if (!groupId) {
       await e.reply(sendable)
     } else {
-      await Bot.sendGroupMsg(groupId, sendable)
+      await e.bot.sendGroupMsg(groupId, sendable)
       await e.reply('发送成功！')
     }
   }
@@ -325,7 +325,7 @@ ${translateLangLabels}
         continue
       }
       let groupId = parseInt(element)
-      if (Bot.getGroupList().get(groupId)) {
+      if (this.e.bot.getGroupList().get(groupId)) {
         // 打招呼概率
         if (Math.floor(Math.random() * 100) < Config.helloProbability) {
           let message = await generateHello()
@@ -381,12 +381,12 @@ ${translateLangLabels}
               }
             }
             if (useSilk) {
-              await Bot.sendGroupMsg(groupId, await uploadRecord(audio))
+              await this.e.bot.sendGroupMsg(groupId, await uploadRecord(audio))
             } else {
-              await Bot.sendGroupMsg(groupId, segment.record(audio))
+              await this.e.bot.sendGroupMsg(groupId, segment.record(audio))
             }
           } else {
-            await Bot.sendGroupMsg(groupId, message)
+            await this.e.bot.sendGroupMsg(groupId, message)
           }
         } else {
           logger.info(`时机未到，这次就不打招呼给群聊${groupId}了`)

apps/history.js

@@ -100,7 +100,7 @@ export class history extends plugin {
       },
       bot: {
         qq: getUin(e),
-        name: Bot.nickname
+        name: e.bot.nickname
       },
       chat
     }, {})

apps/management.js

@@ -990,7 +990,7 @@ Poe 模式会调用 Poe 中的 Claude-instant 进行对话。需要提供 Cookie
       }
     } else if (match) {
       const groupId = parseInt(match[1], 10)
-      if (Bot.getGroupList().get(groupId)) {
+      if (e.bot.getGroupList().get(groupId)) {
         if (await redis.get(`CHATGPT:SHUT_UP:${groupId}`)) {
           await redis.del(`CHATGPT:SHUT_UP:${groupId}`)
           await redis.set(`CHATGPT:SHUT_UP:${groupId}`, '1', { EX: time })
@@ -1040,7 +1040,7 @@ Poe 模式会调用 Poe 中的 Claude-instant 进行对话。需要提供 Cookie
         return false
       }
       const groupId = parseInt(match[1], 10)
-      if (Bot.getGroupList().get(groupId)) {
+      if (e.bot.getGroupList().get(groupId)) {
         if (await redis.get(`CHATGPT:SHUT_UP:${groupId}`)) {
           await redis.del(`CHATGPT:SHUT_UP:${groupId}`)
           await e.reply(`好的主人，我终于又可以在群${groupId}和大家聊天了`)

utils/SydneyAIClient.js

@@ -466,7 +466,6 @@ export default class SydneyAIClient {
         context += chats
           .map(chat => {
             let sender = chat.sender || chat || {}
-            // if (sender.user_id === Bot.uin && chat.raw_message.startsWith('建议的回复')) {
             if (chat.raw_message.startsWith('建议的回复')) {
               // 建议的回复太容易污染设定导致对话太固定跑偏了
               return ''

utils/common.js

@@ -86,10 +86,10 @@ export async function makeForwardMsg (e, msg = [], dec = '') {
   if (Version.isTrss) {
     return common.makeForwardMsg(e, msg, dec)
   }
-  let nickname = Bot.nickname
+  let nickname = e.bot.nickname
   if (e.isGroup) {
     try {
-      let info = await Bot.getGroupMemberInfo(e.group_id, getUin(e))
+      let info = await e.bot.getGroupMemberInfo(e.group_id, getUin(e))
       nickname = info.card || info.nickname
     } catch (err) {
       console.error(`Failed to get group member info: ${err}`)
@@ -792,7 +792,7 @@ export async function getImageOcrText (e) {
       let resultArr = []
       let eachImgRes = ''
       for (let i in img) {
-        const imgOCR = await Bot.imageOcr(img[i])
+        const imgOCR = await e.bot.imageOcr(img[i])
         for (let text of imgOCR.wordslist) {
           eachImgRes += (`${text?.words}  \n`)
         }
@@ -828,10 +828,17 @@ export function getMaxModelTokens (model = 'gpt-3.5-turbo') {
 
 export function getUin (e) {
   if (e?.bot?.uin) return e.bot.uin
+  if (e) {
+    if (Array.isArray(e.bot.uin)) {
+      if (Config.trssBotUin && e.bot.uin.indexOf(Config.trssBotUin) > -1) return Config.trssBotUin
+      else return e.bot.uin[0]
+    } else return e.bot.uin
+  } else {
     if (Array.isArray(Bot.uin)) {
       if (Config.trssBotUin && Bot.uin.indexOf(Config.trssBotUin) > -1) return Config.trssBotUin
       else return Bot.uin[0]
     } else return Bot.uin
+  }
 }
 
 /**

utils/poe/index 2.js

@@ -1,278 +0,0 @@
-import { readFileSync } from 'fs'
-import { scrape } from './credential.js'
-import fetch from 'node-fetch'
-import crypto from 'crypto'
-// used when test as a single file
-// const _path = process.cwd()
-const _path = process.cwd() + '/plugins/chatgpt-plugin/utils/poe'
-const gqlDir = `${_path}/graphql`
-const queries = {
-  // chatViewQuery: readFileSync(gqlDir + '/ChatViewQuery.graphql', 'utf8'),
-  addMessageBreakMutation: readFileSync(gqlDir + '/AddMessageBreakMutation.graphql', 'utf8'),
-  chatPaginationQuery: readFileSync(gqlDir + '/ChatPaginationQuery.graphql', 'utf8'),
-  addHumanMessageMutation: readFileSync(gqlDir + '/AddHumanMessageMutation.graphql', 'utf8'),
-  loginMutation: readFileSync(gqlDir + '/LoginWithVerificationCodeMutation.graphql', 'utf8'),
-  signUpWithVerificationCodeMutation: readFileSync(gqlDir + '/SignupWithVerificationCodeMutation.graphql', 'utf8'),
-  sendVerificationCodeMutation: readFileSync(gqlDir + '/SendVerificationCodeForLoginMutation.graphql', 'utf8')
-}
-const optionMap = [
-  { title: 'Claude (Powered by Anthropic)', value: 'a2' },
-  { title: 'Sage (Powered by OpenAI - logical)', value: 'capybara' },
-  { title: 'Dragonfly (Powered by OpenAI - simpler)', value: 'nutria' },
-  { title: 'ChatGPT (Powered by OpenAI - current)', value: 'chinchilla' },
-  { title: 'Claude+', value: 'a2_2' },
-  { title: 'GPT-4', value: 'beaver' }
-]
-export class PoeClient {
-  constructor (props) {
-    this.config = props
-  }
-
-  headers = {
-    'Content-Type': 'application/json',
-    Referrer: 'https://poe.com/',
-    Origin: 'https://poe.com',
-    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36'
-  }
-
-  chatId = 0
-  bot = ''
-
-  reConnectWs = false
-
-  async setCredentials () {
-    let result = await scrape(this.config.quora_cookie)
-    console.log(result)
-    this.config.quora_formkey = result.appSettings.formkey
-    this.config.channel_name = result.channelName
-    this.config.app_settings = result.appSettings
-
-    // set value
-    this.headers['poe-formkey'] = this.config.quora_formkey
-    this.headers['poe-tchannel'] = this.config.channel_name
-    this.headers.Cookie = this.config.quora_cookie
-    console.log(this.headers)
-  }
-
-  async subscribe () {
-    const query = {
-      queryName: 'subscriptionsMutation',
-      variables: {
-        subscriptions: [
-          {
-            subscriptionName: 'messageAdded',
-            query: 'subscription subscriptions_messageAdded_Subscription(\n  $chatId: BigInt!\n) {\n  messageAdded(chatId: $chatId) {\n    id\n    messageId\n    creationTime\n    state\n    ...ChatMessage_message\n    ...chatHelpers_isBotMessage\n  }\n}\n\nfragment ChatMessageDownvotedButton_message on Message {\n  ...MessageFeedbackReasonModal_message\n  ...MessageFeedbackOtherModal_message\n}\n\nfragment ChatMessageDropdownMenu_message on Message {\n  id\n  messageId\n  vote\n  text\n  ...chatHelpers_isBotMessage\n}\n\nfragment ChatMessageFeedbackButtons_message on Message {\n  id\n  messageId\n  vote\n  voteReason\n  ...ChatMessageDownvotedButton_message\n}\n\nfragment ChatMessageOverflowButton_message on Message {\n  text\n  ...ChatMessageDropdownMenu_message\n  ...chatHelpers_isBotMessage\n}\n\nfragment ChatMessageSuggestedReplies_SuggestedReplyButton_message on Message {\n  messageId\n}\n\nfragment ChatMessageSuggestedReplies_message on Message {\n  suggestedReplies\n  ...ChatMessageSuggestedReplies_SuggestedReplyButton_message\n}\n\nfragment ChatMessage_message on Message {\n  id\n  messageId\n  text\n  author\n  linkifiedText\n  state\n  ...ChatMessageSuggestedReplies_message\n  ...ChatMessageFeedbackButtons_message\n  ...ChatMessageOverflowButton_message\n  ...chatHelpers_isHumanMessage\n  ...chatHelpers_isBotMessage\n  ...chatHelpers_isChatBreak\n  ...chatHelpers_useTimeoutLevel\n  ...MarkdownLinkInner_message\n}\n\nfragment MarkdownLinkInner_message on Message {\n  messageId\n}\n\nfragment MessageFeedbackOtherModal_message on Message {\n  id\n  messageId\n}\n\nfragment MessageFeedbackReasonModal_message on Message {\n  id\n  messageId\n}\n\nfragment chatHelpers_isBotMessage on Message {\n  ...chatHelpers_isHumanMessage\n  ...chatHelpers_isChatBreak\n}\n\nfragment chatHelpers_isChatBreak on Message {\n  author\n}\n\nfragment chatHelpers_isHumanMessage on Message {\n  author\n}\n\nfragment chatHelpers_useTimeoutLevel on Message {\n  id\n  state\n  text\n  messageId\n}\n'
-          },
-          {
-            subscriptionName: 'viewerStateUpdated',
-            query: 'subscription subscriptions_viewerStateUpdated_Subscription {\n  viewerStateUpdated {\n    id\n    ...ChatPageBotSwitcher_viewer\n  }\n}\n\nfragment BotHeader_bot on Bot {\n  displayName\n  ...BotImage_bot\n}\n\nfragment BotImage_bot on Bot {\n  profilePicture\n  displayName\n}\n\nfragment BotLink_bot on Bot {\n  displayName\n}\n\nfragment ChatPageBotSwitcher_viewer on Viewer {\n  availableBots {\n    id\n    ...BotLink_bot\n    ...BotHeader_bot\n  }\n}\n'
-          }
-        ]
-      },
-      query: 'mutation subscriptionsMutation(\n  $subscriptions: [AutoSubscriptionQuery!]!\n) {\n  autoSubscribe(subscriptions: $subscriptions) {\n    viewer {\n      id\n    }\n  }\n}\n'
-    }
-
-    await this.makeRequest(query)
-  }
-
-  async makeRequest (request) {
-    let payload = JSON.stringify(request)
-    let baseString = payload + this.headers['poe-formkey'] + 'WpuLMiXEKKE98j56k'
-    const md5 = crypto.createHash('md5').update(baseString).digest('hex')
-    const response = await fetch('https://poe.com/api/gql_POST', {
-      method: 'POST',
-      headers: Object.assign(this.headers, {
-        'poe-tag-id': md5,
-        'content-type': 'application/json'
-      }),
-      body: payload
-    })
-    let text = await response.text()
-    try {
-      let result = JSON.parse(text)
-      console.log({ result })
-      return result
-    } catch (e) {
-      console.error(text)
-      throw e
-    }
-  }
-
-  async getBot (displayName) {
-    let r
-    let retry = 10
-    while (retry >= 0) {
-      let url = `https://poe.com/_next/data/${this.nextData.buildId}/${displayName}.json`
-      let r = await fetch(url, {
-        headers: this.headers
-      })
-      let res = await r.text()
-      try {
-        let chatData = (JSON.parse(res)).pageProps.payload.chatOfBotDisplayName
-        return chatData
-      } catch (e) {
-        r = res
-        retry--
-      }
-    }
-    throw new Error(r)
-  }
-
-  async getChatId () {
-    let r = await fetch('https://poe.com', {
-      headers: this.headers
-    })
-    let text = await r.text()
-    const jsonRegex = /<script id="__NEXT_DATA__" type="application\/json">(.+?)<\/script>/
-    const jsonText = text.match(jsonRegex)[1]
-    const nextData = JSON.parse(jsonText)
-    this.nextData = nextData
-    this.viewer = nextData.props.pageProps.payload.viewer
-    this.formkey = nextData.props.formkey
-    let bots = this.viewer.availableBots
-    this.bots = {}
-    for (let i = 0; i < bots.length; i++) {
-      let bot = bots[i]
-      let chatData = await this.getBot(bot.displayName)
-      this.bots[chatData.defaultBotObject.nickname] = chatData
-    }
-    console.log(this.bots)
-  }
-
-  async clearContext (bot) {
-    try {
-      const data = await this.makeRequest({
-        query: `${queries.addMessageBreakMutation}`,
-        variables: { chatId: this.config.chat_ids[bot] }
-      })
-
-      if (!data.data) {
-        this.reConnectWs = true // for websocket purpose
-        console.log('ON TRY! Could not clear context! Trying to reLogin..')
-      }
-      return data
-    } catch (e) {
-      this.reConnectWs = true // for websocket purpose
-      console.log('ON CATCH! Could not clear context! Trying to reLogin..')
-      return e
-    }
-  }
-
-  async sendMsg (bot, query) {
-    try {
-      const data = await this.makeRequest({
-        query: `${queries.addHumanMessageMutation}`,
-        variables: {
-          bot,
-          chatId: this.bots[bot].chatId,
-          query,
-          source: null,
-          withChatBreak: false
-        }
-      })
-      console.log(data)
-      if (!data.data) {
-        this.reConnectWs = true // for cli websocket purpose
-        console.log('Could not send message! Trying to reLogin..')
-      }
-      return data
-    } catch (e) {
-      this.reConnectWs = true // for cli websocket purpose
-      console.error(e)
-      return e
-    }
-  }
-
-  async getHistory (bot) {
-    try {
-      let response = await this.makeRequest({
-        query: `${queries.chatPaginationQuery}`,
-        variables: {
-          before: null,
-          bot,
-          last: 25
-        }
-      })
-
-      return response.data.chatOfBot.messagesConnection.edges
-        .map(({ node: { messageId, text, authorNickname } }) => ({
-          messageId,
-          text,
-          authorNickname
-        }))
-    } catch (e) {
-      console.log('There has been an error while fetching your history!')
-    }
-  }
-
-  async deleteMessages (msgIds) {
-    await this.makeRequest({
-      queryName: 'MessageDeleteConfirmationModal_deleteMessageMutation_Mutation',
-      variables: {
-        messageIds: msgIds
-      },
-      query: 'mutation MessageDeleteConfirmationModal_deleteMessageMutation_Mutation(\n  $messageIds: [BigInt!]!\n){\n  messagesDelete(messageIds: $messageIds) {\n    edgeIds\n  }\n}\n'
-    })
-  }
-
-  async getResponse (bot) {
-    let text
-    let state
-    let authorNickname
-    try {
-      while (true) {
-        await new Promise((resolve) => setTimeout(resolve, 2000))
-        let response = await this.makeRequest({
-          query: `${queries.chatPaginationQuery}`,
-          variables: {
-            before: null,
-            bot,
-            last: 1
-          }
-        })
-        let base = response.data.chatOfBot.messagesConnection.edges
-        let lastEdgeIndex = base.length - 1
-        text = base[lastEdgeIndex].node.text
-        authorNickname = base[lastEdgeIndex].node.authorNickname
-        state = base[lastEdgeIndex].node.state
-        if (state === 'complete' && authorNickname === bot) {
-          break
-        }
-      }
-    } catch (e) {
-      console.log('Could not get response!')
-      return {
-        status: false,
-        message: 'failed',
-        data: null
-      }
-    }
-
-    return {
-      status: true,
-      message: 'success',
-      data: text
-    }
-  }
-}
-
-async function testPoe () {
-  // const key = 'deb04db9f2332a3287b7d2545061af62'
-  // const channel = 'poe-chan55-8888-ujygckefewomybvkqfrp'
-  const cookie = 'p-b=WSvmyvjHVJoMtQVkirtn-A%3D%3D'
-  let client = new PoeClient({
-    // quora_formkey: key,
-    // channel_name: channel,
-    quora_cookie: cookie
-  })
-  await client.setCredentials()
-  await client.getChatId()
-  let ai = 'a2'
-  await client.sendMsg(ai, '你说话不是很通顺啊')
-  const response = await client.getResponse(ai)
-  return response
-}
-
-// testPoe().then(res => {
-//   console.log(res)
-// })

utils/tools/APTool.js

@@ -17,7 +17,7 @@ export class APTool extends AbstractTool {
 
   func = async function (opts, e) {
     let { prompt } = opts
-    if (e.at === Bot.uin) {
+    if (e.at === e.bot.uin) {
       e.at = null
     }
     e.atBot = false

utils/tools/EditCardTool.js

@@ -28,14 +28,18 @@ export class EditCardTool extends AbstractTool {
     qq = isNaN(qq) || !qq ? e.sender.user_id : parseInt(qq.trim())
     groupId = isNaN(groupId) || !groupId ? e.group_id : parseInt(groupId.trim())
 
-    let group = await Bot.pickGroup(groupId)
+    let group = await e.bot.pickGroup(groupId)
+    try {
       let mm = await group.getMemberMap()
       if (!mm.has(qq)) {
         return `failed, the user ${qq} is not in group ${groupId}`
       }
-    if (mm.get(Bot.uin).role === 'member') {
+      if (mm.get(e.bot.uin) && mm.get(e.bot.uin).role === 'member') {
         return `failed, you, not user, don't have permission to edit card in group ${groupId}`
       }
+    } catch (err) {
+      logger.error('获取群信息失败，可能使用的底层协议不完善')
+    }
     logger.info('edit card: ', groupId, qq)
     await group.setCard(qq, card)
     return `the user ${qq}'s card has been changed into ${card}`

utils/tools/EliMovieTool.js

@@ -20,7 +20,7 @@ export class EliMovieTool extends AbstractTool {
     if (yesOrNo === 'no') {
       return 'tell user why you don\'t want to check'
     }
-    if (e.at === Bot.uin) {
+    if (e.at === e.bot.uin) {
       e.at = null
     }
     e.atBot = false

utils/tools/HandleMessageMsgTool.js

@@ -27,11 +27,11 @@ export class HandleMessageMsgTool extends AbstractTool {
           break
         }
         case 'essence': {
-          await Bot.setEssenceMessage(messageId)
+          await e.bot.setEssenceMessage(messageId)
           break
         }
         case 'un-essence': {
-          await Bot.removeEssenceMessage(messageId)
+          await e.bot.removeEssenceMessage(messageId)
           break
         }
       }

utils/tools/JinyanTool.js

@@ -31,13 +31,13 @@ export class JinyanTool extends AbstractTool {
     qq = qq !== 'all'
       ? isNaN(qq) || !qq ? e.sender.user_id : parseInt(qq.trim())
       : 'all'
-    let group = await Bot.pickGroup(groupId)
+    let group = await e.bot.pickGroup(groupId)
     if (qq !== 'all') {
       let m = await group.getMemberMap()
       if (!m.has(qq)) {
         return `failed, the user ${qq} is not in group ${groupId}`
       }
-      if (m.get(Bot.uin).role === 'member') {
+      if (m.get(e.bot.uin).role === 'member') {
         return `failed, you, not user, don't have permission to mute other in group ${groupId}`
       }
     }

utils/tools/KickOutTool.js

@@ -30,7 +30,7 @@ export class KickOutTool extends AbstractTool {
       return 'the user is not admin, he cannot kickout other people. he should be punished'
     }
     console.log('kickout', groupId, qq)
-    let group = await Bot.pickGroup(groupId)
+    let group = await e.bot.pickGroup(groupId)
     await group.kickMember(qq)
     if (isPunish === 'true') {
       return `the user ${qq} has been kicked out from group ${groupId} as punishment because of his 不正当行为`

utils/tools/QueryGenshinTool.js

@@ -24,7 +24,7 @@ export class QueryGenshinTool extends AbstractTool {
   func = async function (opts, e) {
     let { qq, uid = '', character = '' } = opts
     qq = isNaN(qq) || !qq ? e.sender.user_id : parseInt(qq.trim())
-    if (e.at === Bot.uin) {
+    if (e.at === e.bot.uin) {
       e.at = null
     }
     e.atBot = false

utils/tools/QueryStarRailTool.js

@@ -24,7 +24,7 @@ export class QueryStarRailTool extends AbstractTool {
   func = async function (opts, e) {
     let { qq, uid, character } = opts
     qq = isNaN(qq) || !qq ? e.sender.user_id : parseInt(qq.trim())
-    if (e.at === Bot.uin) {
+    if (e.at === e.bot.uin) {
       e.at = null
     }
     e.atBot = false

utils/tools/SendAudioMessageTool.js

@@ -70,7 +70,7 @@ export class SendAudioMessageTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
     try {
       switch (ttsMode) {
         case 1:
@@ -102,14 +102,14 @@ export class SendAudioMessageTool extends AbstractTool {
       return `audio generation failed,  error: ${JSON.stringify(err)}`
     }
     if (sendable) {
-      let groupList = await Bot.getGroupList()
+      let groupList = await e.bot.getGroupList()
       try {
         if (groupList.get(target)) {
-          let group = await Bot.pickGroup(target)
+          let group = await e.bot.pickGroup(target)
           await group.sendMsg(sendable)
           return 'audio has been sent to group' + target
         } else {
-          let user = await Bot.pickFriend(target)
+          let user = await e.bot.pickFriend(target)
           await user.sendMsg(sendable)
           return 'audio has been sent to user' + target
         }

utils/tools/SendAvatarTool.js

@@ -26,12 +26,12 @@ export class SendAvatarTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
 
-    let groupList = await Bot.getGroupList()
+    let groupList = await e.bot.getGroupList()
     console.log('sendAvatar', target, pictures)
     if (groupList.get(target)) {
-      let group = await Bot.pickGroup(target)
+      let group = await e.bot.pickGroup(target)
       await group.sendMsg(pictures)
     }
     return `the ${pictures.length > 1 ? 'users: ' + qq + '\'s avatar' : 'avatar'} has been sent to group ${target}`

utils/tools/SendBilibiliTool.js

@@ -26,12 +26,12 @@ export class SendVideoTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
 
     let msg = []
     try {
       let { arcurl, title, pic, description, videoUrl, headers, bvid, author, play, pubdate, like, honor } = await getBilibili(id)
-      let group = await Bot.pickGroup(target)
+      let group = await e.bot.pickGroup(target)
       msg.push(title.replace(/(<([^>]+)>)/ig, '') + '\n')
       msg.push(`UP主：${author} 发布日期：${formatDate(new Date(pubdate * 1000))} 播放量：${play} 点赞：${like}\n`)
       msg.push(arcurl + '\n')

utils/tools/SendDiceTool.js

@@ -23,16 +23,16 @@ export class SendDiceTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
-    let groupList = await Bot.getGroupList()
+    let groupList = await e.bot.getGroupList()
     num = isNaN(num) || !num ? 1 : num > 5 ? 5 : num
     if (groupList.get(target)) {
-      let group = await Bot.pickGroup(target, true)
+      let group = await e.bot.pickGroup(target, true)
       for (let i = 0; i < num; i++) {
         await group.sendMsg(segment.dice())
       }
     } else {
-      let friend = await Bot.pickFriend(target)
+      let friend = await e.bot.pickFriend(target)
       await friend.sendMsg(segment.dice())
     }
     if (num === 5) {

utils/tools/SendMessageToSpecificGroupOrUserTool.js

@@ -23,16 +23,16 @@ export class SendMessageToSpecificGroupOrUserTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
 
-    let groupList = await Bot.getGroupList()
+    let groupList = await e.bot.getGroupList()
     try {
       if (groupList.get(target)) {
-        let group = await Bot.pickGroup(target)
+        let group = await e.bot.pickGroup(target)
         await group.sendMsg(await convertFaces(msg, true, e))
         return 'msg has been sent to group' + target
       } else {
-        let user = await Bot.pickFriend(target)
+        let user = await e.bot.pickFriend(target)
         await user.sendMsg(msg)
         return 'msg has been sent to user' + target
       }

utils/tools/SendMusicTool.js

@@ -23,10 +23,10 @@ export class SendMusicTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
 
     try {
-      let group = await Bot.pickGroup(target)
+      let group = await e.bot.pickGroup(target)
       await group.shareMusic('163', id)
       return `the music has been shared to ${target}`
     } catch (e) {

utils/tools/SendPictureTool.js

@@ -22,7 +22,7 @@ export class SendPictureTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
     // 处理错误url和picture留空的情况
     const urlRegex = /(?:(?:https?|ftp):\/\/)?(?:\S+(?::\S*)?@)?(?:((?:(?:[a-z0-9\u00a1-\u4dff\u9fd0-\uffff][a-z0-9\u00a1-\u4dff\u9fd0-\uffff_-]{0,62})?[a-z0-9\u00a1-\u4dff\u9fd0-\uffff]\.)+(?:[a-z\u00a1-\u4dff\u9fd0-\uffff]{2,}\.?))(?::\d{2,5})?)(?:\/[\w\u00a1-\u4dff\u9fd0-\uffff$-_.+!*'(),%]+)*(?:\?(?:[\w\u00a1-\u4dff\u9fd0-\uffff$-_.+!*(),%:@&=]|(?:[\[\]])|(?:[\u00a1-\u4dff\u9fd0-\uffff]))*)?(?:#(?:[\w\u00a1-\u4dff\u9fd0-\uffff$-_.+!*'(),;:@&=]|(?:[\[\]]))*)?\/?/i
     if (/https:\/\/example.com/.test(urlOfPicture) || !urlOfPicture || !urlRegex.test(urlOfPicture)) urlOfPicture = ''
@@ -32,14 +32,14 @@ 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 = await Bot.getGroupList()
+    let groupList = await e.bot.getGroupList()
     try {
       if (groupList.get(target)) {
-        let group = await Bot.pickGroup(target)
+        let group = await e.bot.pickGroup(target)
         await group.sendMsg(pictures)
         return 'picture has been sent to group' + target
       } else {
-        let user = await Bot.pickFriend(target)
+        let user = await e.bot.pickFriend(target)
         await user.sendMsg(pictures)
         return 'picture has been sent to user' + target
       }

utils/tools/SendRPSTool.js

@@ -19,13 +19,13 @@ export class SendRPSTool extends AbstractTool {
     const defaultTarget = e.isGroup ? e.group_id : e.sender.user_id
     const target = isNaN(targetGroupIdOrQQNumber) || !targetGroupIdOrQQNumber
       ? defaultTarget
-      : parseInt(targetGroupIdOrQQNumber) === Bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
+      : parseInt(targetGroupIdOrQQNumber) === e.bot.uin ? defaultTarget : parseInt(targetGroupIdOrQQNumber)
-    let groupList = await Bot.getGroupList()
+    let groupList = await e.bot.getGroupList()
     if (groupList.get(target)) {
-      let group = await Bot.pickGroup(target, true)
+      let group = await e.bot.pickGroup(target, true)
       await group.sendMsg(segment.rps(num))
     } else {
-      let friend = await Bot.pickFriend(target)
+      let friend = await e.bot.pickFriend(target)
       await friend.sendMsg(segment.rps(num))
     }
   }

utils/tools/SetTitleTool.js

@@ -28,12 +28,12 @@ export class SetTitleTool extends AbstractTool {
     qq = isNaN(qq) || !qq ? e.sender.user_id : parseInt(qq.trim())
     groupId = isNaN(groupId) || !groupId ? e.group_id : parseInt(groupId.trim())
 
-    let group = await Bot.pickGroup(groupId)
+    let group = await e.bot.pickGroup(groupId)
     let mm = await group.getMemberMap()
     if (!mm.has(qq)) {
       return `failed, the user ${qq} is not in group ${groupId}`
     }
-    if (mm.get(Bot.uin).role !== 'owner') {
+    if (mm.get(e.bot.uin).role !== 'owner') {
       return 'on group owner can give title'
     }
     logger.info('edit card: ', groupId, qq)