fix bugs and code structure

Author: SnapdragonLee

Readme.md

@@ -83,7 +83,7 @@ Using ChatGPT-weBot based on ChatGPT(Non-API key call) and official WeChat hook
 
 2. Download package from Github Releases.
 
-3. Install `WeChat-3.6.0.18.exe` on your computer, **if your version is higher than 3.6.0.18, you can downgrade instantly.** Then get your account online.
+3. Install `WeChat-3.6.0.18.exe` on your computer, **if your version is higher than 3.6.0.18, you can downgrade instantly.** Then get your account online. You can also download zip version of WeChat. **If you wanna dual-call WeChat, modify `./dual-start.bat` file guiding by annotation.**
 
 
 
@@ -152,6 +152,7 @@ Using ChatGPT-weBot based on ChatGPT(Non-API key call) and official WeChat hook
 
 ## Log
 
+- 2023.2.27 Add zip version of WeChat and `dual-start.bat`,  fix the bug that prevents other operations when the response keyword is empty.
 - 2023.2.25 Add the option in `config.json` to quote the original question before answering 
 - 2023.2.25 Complete all API function on features and Debugs for errors
 - 2023.2.23 Accomplish some API listed on features

Readme_ZH.md

@@ -83,7 +83,7 @@
 
 2. 从 Github Releases 下载需要的包。
 
-3. 在您的计算机上安装 `WeChat-3.6.0.18.exe`，**如果您正在使用的微信版本高于3.6.0.18，可以降级覆盖安装。** 之后请登陆您的微信。
+3. 在您的计算机上安装 `WeChat-3.6.0.18.exe`，**如果您正在使用的微信版本高于3.6.0.18，可以降级覆盖安装。** 之后请登陆您的微信。您也可以下载 zip 版本的微信，**如果您想要实现微信双开，根据批处理注释修改 `./dual-start.bat` 。**
 
 
 
@@ -148,6 +148,7 @@
 
 ## 日志
 
+- 2023年2月27日 添加压缩包版微信与双开脚本，并修复响应关键字为空时无法进行其他操作的 bug
 - 2023年2月25日 `config.json` 中添加回答前引用原问题选项
 - 2023年2月25日 完成所有功能的 API 函数并修复了其它的错误
 - 2023年2月23日 完成了一些在功能列表中列出的 API 并进行了部分调试

client/wxclient.py

@@ -257,28 +257,7 @@ def handle_recv_txt_msg(j):
             content = re.sub(groupChatKey, "", content)
 
     if autoReply and ((not is_room and prvReplyMode) or (is_room and grpReplyMode)):
-        if is_ask:
-            if chatbot is None:
-                chatbot = Chatbot(
-                    rev_config,
-                    conversation_id=None,
-                    parent_id=None,
-                )
-                if is_room:
-                    global_dict[(wx_id, room_id)] = chatbot
-                else:
-                    global_dict[(wx_id, "")] = chatbot
-
-            print("ask:" + content)
-            for data in chatbot.ask(
-                    prompt=content,
-            ):
-                reply += data["message"][len(reply):]
-
-            if (grpCitationMode and is_room) or (prvCitationMode and not is_room):
-                reply = content + "\n---------\n" + reply
-
-        elif content.startswith(helpKey):
+        if content.startswith(helpKey):
             if is_room:
                 reply = str(
                     b'\xe6\xac\xa2\xe8\xbf\x8e\xe4\xbd\xbf\xe7\x94\xa8 ChatGPT-weBot\xef\xbc\x8c\xe6\x9c\xac\xe9'
@@ -314,6 +293,9 @@ def handle_recv_txt_msg(j):
                 ):
                     reply += data["message"][len(reply):]
 
+                if (grpCitationMode and is_room) or (prvCitationMode and not is_room):
+                    reply = content + "\n- - - - - - - -\n" + reply.strip()
+
         elif content.startswith(rollbackKey):
             if chatbot is None:
                 reply = "您还没有问过问题"
@@ -332,6 +314,27 @@ def handle_recv_txt_msg(j):
 
             time.sleep(1.5)
 
+        elif is_ask:
+            if chatbot is None:
+                chatbot = Chatbot(
+                    rev_config,
+                    conversation_id=None,
+                    parent_id=None,
+                )
+                if is_room:
+                    global_dict[(wx_id, room_id)] = chatbot
+                else:
+                    global_dict[(wx_id, "")] = chatbot
+
+            print("ask:" + content)
+            for data in chatbot.ask(
+                    prompt=content,
+            ):
+                reply += data["message"][len(reply):]
+
+            if (grpCitationMode and is_room) or (prvCitationMode and not is_room):
+                reply = content + "\n- - - - - - - -\n" + reply.strip()
+
         else:
             return
     else:

dual-start.bat

@@ -0,0 +1,11 @@
+@echo off
+
+# Please enter your WeChat setup location in double quotation marks
+# 请在下方双引号中填写最新版本的微信安装目录
+start /d "D:\Program files(x86)\WeChat\" WeChat.exe
+
+# Please enter your WeChat setup location in double quotation marks
+# 请在下方双引号中填写 3.6.0.18 版本的微信安装目录
+start /d "D:\Program files(x86)\WeChat\[3.6.0.18]_tmp" WeChat.exe
+
+exit