wechaty-web-panel 1.0.3 → 1.0.6

package/.idea/workspace.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2e980355-75b9-47a9-b344-f25eda9493b2" name="Default Changelist" comment="feat(模块): 添加了个很棒的功能&#10;fix(模块): 修复了一些 bug&#10;docs(模块): 更新了一下文档&#10;UI(模块): 修改了一下样式&#10;chore(模块): 对脚手架做了些更改&#10;locale(模块): 为国际化做了微小的贡献" />
+    <list default="true" id="2e980355-75b9-47a9-b344-f25eda9493b2" name="Default Changelist" comment="feat(模块): 添加了个很棒的功能&#10;fix(模块): 修复了一些 bug&#10;docs(模块): 更新了一下文档&#10;UI(模块): 修改了一下样式&#10;chore(模块): 对脚手架做了些更改&#10;locale(模块): 为国际化做了微小的贡献">
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/handlers/on-message.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/handlers/on-message.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/service/event-dispatch-service.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/service/event-dispatch-service.js" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -128,7 +133,14 @@
       <workItem from="1655357894259" duration="3028000" />
       <workItem from="1656644469354" duration="82000" />
       <workItem from="1657611185486" duration="30768000" />
-      <workItem from="1657730101683" duration="5169000" />
+      <workItem from="1657730101683" duration="5453000" />
+      <workItem from="1657780584734" duration="4000" />
+      <workItem from="1657783060418" duration="100000" />
+      <workItem from="1657785079799" duration="18000" />
+      <workItem from="1657787236035" duration="654000" />
+      <workItem from="1657788805443" duration="1074000" />
+      <workItem from="1657790966316" duration="1506000" />
+      <workItem from="1657793837240" duration="3027000" />
     </task>
     <servers />
   </component>

package/CHANGELOG.md

@@ -1,9 +1,14 @@
 ## 更新日志
+### V1.0.6(2022-07-14)
+
+1、修复机器人无法对话功能
+2、插件添加忽略关键词功能
+
 ### V1.0.3(2022-07-13)
 
 1、添加微信开发对话平台
 2、添加新闻分类事件
-3、
+3、修复头像上传无法展示问题
 
 ### V1.0.2(2022-02-21)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -60,6 +60,6 @@
   "publishConfig": {
     "registry": " https://registry.npmjs.org/"
   },
-  "_id": "wechaty-web-panel@1.0.3",
-  "_commitid": "edb8001"
+  "_id": "wechaty-web-panel@1.0.6",
+  "_commitid": "afa6242"
 }

package/src/handlers/on-message.js

@@ -3,6 +3,24 @@ const { getContactTextReply, getRoomTextReply } = require('../common/reply')
 const { delay } = require('../lib/index')
 const { dispatchAsync } = require('../service/room-async-service')
 const { allConfig } = require('../common/configDb')
+const { getAibotConfig } = require('../common/aiDb')
+
+/**
+ * 检测是否属于忽略的消息
+ * @param msg 用户信息
+ * @param list 需要忽略的列表
+ */
+function checkIgnore(msg, list) {
+  if (!list.length) return false
+  for (let item of list) {
+    const word = item.word
+    const type = item.type
+    if ((type === 'start' && msg.startsWith(word)) || (type === 'end' && msg.endsWith(word)) || (type === 'equal' && msg === word) || (type === 'include' && msg.includes(word))) {
+      return true
+    }
+  }
+  return false
+}
 
 /**
  * 根据消息类型过滤私聊消息事件
@@ -11,6 +29,7 @@ const { allConfig } = require('../common/configDb')
  */
 async function dispatchFriendFilterByMsgType(that, msg) {
   try {
+    const aibotConfig = await getAibotConfig()
     const type = msg.type()
     const contact = msg.talker() // 发消息人
     const isOfficial = contact.type() === that.Contact.Type.Official
@@ -21,8 +40,9 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         content = msg.text()
         if (!isOfficial) {
           console.log(`发消息人${await contact.name()}:${content}`)
-          if (content.trim()) {
-            replys = await getContactTextReply(that, contact, content)
+          const isIgnore = checkIgnore(content.trim(), aibotConfig.ignoreMessages)
+          if (content.trim() && !isIgnore) {
+            replys = await getContactTextReply(that, contact, content.trim())
             for (let reply of replys) {
               await delay(1000)
               await contactSay(contact, reply)
@@ -62,6 +82,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
  * @param {*} msg 消息主体
  */
 async function dispatchRoomFilterByMsgType(that, room, msg) {
+  const aibotConfig = await getAibotConfig()
   try {
     const contact = msg.talker() // 发消息人
     const contactName = contact.name()
@@ -79,6 +100,9 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const mentionSelf = content.includes(`@${userSelfName}`)
         if (mentionSelf) {
           content = content.replace(/@[^,，：:\s@]+/g, '').trim()
+          // 检测是否需要这条消息
+          const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages)
+          if (isIgnore) return
           replys = await getRoomTextReply(that, content, contactName, contactId, contactAvatar, room)
           for (let reply of replys) {
             await delay(1000)

package/src/index.js

@@ -25,19 +25,24 @@ module.exports = function WechatyWebPanelPlugin(config = { apiKey, apiSecret })
   const initConfig = {
     apiKey: envKey || config.apiKey,
     apiSecret: envSecret || config.apiSecret,
+    // 需要忽略的关键词 [{type:'start', word: ''},{type:'end', word: ''},{type:'equal', word: ''},{type:'include', word: ''}]
+    ignoreMessages: config.ignoreMessages || [],
+    // 需要忽略的事件 ['scan', 'login', 'logout', 'friendship', 'room-join', 'room-topic', 'room-leave', 'message', 'ready', 'heartbeat', 'error']
+    ignoreEvents: config.ignoreEvents || [],
   }
   addAibotConfig(initConfig)
   return function (bot) {
-    bot.on('scan', onScan)
-    bot.on('login', onLogin)
-    bot.on('logout', onLogout)
-    bot.on('friendship', onFriend)
-    bot.on('room-join', onRoomjoin)
-    bot.on('room-topic', onRoomtopic)
-    bot.on('room-leave', onRoomleave)
-    bot.on('message', onMessage)
-    bot.on('ready', onReady)
-    bot.on('heartbeat', onHeartbeat)
-    bot.on('error', onError)
+    const ignoreEvents = initConfig.ignoreEvents
+    if (!ignoreEvents.includes('scan')) bot.on('scan', onScan)
+    if (!ignoreEvents.includes('login')) bot.on('login', onLogin)
+    if (!ignoreEvents.includes('logout')) bot.on('logout', onLogout)
+    if (!ignoreEvents.includes('friendship')) bot.on('friendship', onFriend)
+    if (!ignoreEvents.includes('room-join')) bot.on('room-join', onRoomjoin)
+    if (!ignoreEvents.includes('room-topic')) bot.on('room-topic', onRoomtopic)
+    if (!ignoreEvents.includes('room-leave')) bot.on('room-leave', onRoomleave)
+    if (!ignoreEvents.includes('message')) bot.on('message', onMessage)
+    if (!ignoreEvents.includes('ready')) bot.on('ready', onReady)
+    if (!ignoreEvents.includes('heartbeat')) bot.on('heartbeat', onHeartbeat)
+    if (!ignoreEvents.includes('error')) bot.on('error', onError)
   }
 }

package/src/proxy/aibotk.js

@@ -317,7 +317,7 @@ async function drawRoomPhoto(roomName, list, contactName) {
 async function putqn(base, name) {
   try {
     const token = await getQiToken()
-    const namebase = Buffer.from(name).toString('base64').replace('=', '')
+    const namebase = Buffer.from(name).toString('base64').replace(/=/g, '')
     let filename = 'wechat/avatar/' + namebase + '.jpeg'
     let base_file_name = Buffer.from(filename).toString('base64').replace('+', '-').replace('/', '_')
     let options = {
@@ -330,7 +330,7 @@ async function putqn(base, name) {
     }
     let content = await req(options)
     console.log('上传结果', content.key)
-    return 'http://image.xkboke.com/' + content.key
+    return 'https://img.aibotk.com/' + content.key
   } catch (e) {
     console.log('上传失败', e.Error)
   }

package/src/proxy/tencent-open.js

@@ -162,7 +162,6 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
     const data = {
       signature,
       query: msg,
-      env: 'debug',
     }
     const res = await axios.post(`https://openai.weixin.qq.com/openapi/aibot/eTZV8kYIvKnmvQJgXsy7e7f3WDWeGf`, data, {})
     const resData = res.data

package/src/service/event-dispatch-service.js

@@ -144,22 +144,22 @@ async function dispatchAiBot(bot, msg, name, id) {
       case 0:
         // 天行机器人
         res = await api.getResByTX(msg, id)
-        replys = [{ type: 1, res }]
+        replys = [{ type: 1, content: res }]
         break
       case 1:
         // 天行图灵机器人
         res = await api.getResByTXTL(msg, id)
-        replys = [{ type: 1, res }]
+        replys = [{ type: 1, content: res }]
         break
       case 2:
         // 图灵机器人
         res = await api.getResByTL(msg, id)
-        replys = [{ type: 1, res }]
+        replys = [{ type: 1, content: res }]
         break
       case 3:
         // 微信闲聊
         res = await chatTencent(msg, id)
-        replys = [{ type: 1, res }]
+        replys = [{ type: 1, content: res }]
         break
       case 5:
         // 微信开放对话平台