github/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-03-19 21:38:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 手机上回复消息，不触发机器人

Browse Source
This commit is contained in:
SSMario
2023-05-16 09:38:38 +08:00
parent 9ee0ea88b5
commit 44cb54a9ea
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
channel/chat_message.py
View File

@@ -48,6 +48,7 @@ class ChatMessage(object):
to_user_nickname = None to_user_nickname = None
other_user_id = None other_user_id = None
other_user_nickname = None other_user_nickname = None
my_msg = False
is_group = False is_group = False
is_at = False is_at = False

3
channel/wechat/wechat_channel.py
View File

@@ -59,6 +59,9 @@ def _check(func):
if conf().get("hot_reload") == True and int(create_time) < int(time.time()) - 60: # 跳过1分钟前的历史消息 if conf().get("hot_reload") == True and int(create_time) < int(time.time()) - 60: # 跳过1分钟前的历史消息
logger.debug("[WX]history message {} skipped".format(msgId)) logger.debug("[WX]history message {} skipped".format(msgId))
return return
if cmsg.my_msg:
logger.debug("[WX]my message {} skipped".format(msgId))
return
return func(self, cmsg) return func(self, cmsg)
return wrapper return wrapper

2
channel/wechat/wechat_message.py
View File

@@ -58,6 +58,8 @@ class WechatMessage(ChatMessage):
if self.to_user_id == user_id: if self.to_user_id == user_id:
self.to_user_nickname = nickname self.to_user_nickname = nickname
try: # 陌生人时候, 'User'字段可能不存在 try: # 陌生人时候, 'User'字段可能不存在
self.my_msg = itchat_msg["ToUserName"] == itchat_msg["User"]["UserName"] and \
itchat_msg["ToUserName"] != itchat_msg["FromUserName"]
self.other_user_id = itchat_msg["User"]["UserName"] self.other_user_id = itchat_msg["User"]["UserName"]
self.other_user_nickname = itchat_msg["User"]["NickName"] self.other_user_nickname = itchat_msg["User"]["NickName"]
if self.other_user_id == self.from_user_id: if self.other_user_id == self.from_user_id: