kaiyuan/chatgpt-on-wechat
1
0
Fork 0
mirror of https://github.com/zhayujie/chatgpt-on-wechat.git synced 2026-07-20 21:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1457 from befantasy/master

Browse Source 
新增”ContextType.ACCEPT_FRIEND“，方便插件对“同意好友请求”后的事件进行处理。
This commit is contained in:
zhayujie
2023-10-13 15:44:25 +08:00
committed by GitHub
parent 238f05f453 f72cd13fba
commit 36ac6d005a
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/context.py
View File

@@ -12,6 +12,7 @@ class ContextType(Enum):
SHARING = 6 # 分享信息 SHARING = 6 # 分享信息
IMAGE_CREATE = 10 # 创建图片命令 IMAGE_CREATE = 10 # 创建图片命令
ACCEPT_FRIEND = 19 # 同意好友请求
JOIN_GROUP = 20 # 加入群聊 JOIN_GROUP = 20 # 加入群聊
PATPAT = 21 # 拍了拍 PATPAT = 21 # 拍了拍
FUNCTION = 22 # 函数调用 FUNCTION = 22 # 函数调用

2
channel/wechat/wechat_channel.py
View File

@@ -167,7 +167,7 @@ class WechatChannel(ChatChannel):
logger.debug("[WX]receive voice for group msg: {}".format(cmsg.content)) logger.debug("[WX]receive voice for group msg: {}".format(cmsg.content))
elif cmsg.ctype == ContextType.IMAGE: elif cmsg.ctype == ContextType.IMAGE:
logger.debug("[WX]receive image for group msg: {}".format(cmsg.content)) logger.debug("[WX]receive image for group msg: {}".format(cmsg.content))
elif cmsg.ctype in [ContextType.JOIN_GROUP, ContextType.PATPAT]: elif cmsg.ctype in [ContextType.JOIN_GROUP, ContextType.PATPAT, ContextType.ACCEPT_FRIEND]:
logger.debug("[WX]receive note msg: {}".format(cmsg.content)) logger.debug("[WX]receive note msg: {}".format(cmsg.content))
elif cmsg.ctype == ContextType.TEXT: elif cmsg.ctype == ContextType.TEXT:
# logger.debug("[WX]receive group msg: {}, cmsg={}".format(json.dumps(cmsg._rawmsg, ensure_ascii=False), cmsg)) # logger.debug("[WX]receive group msg: {}, cmsg={}".format(json.dumps(cmsg._rawmsg, ensure_ascii=False), cmsg))

3
channel/wechat/wechat_message.py
View File

@@ -34,6 +34,9 @@ class WechatMessage(ChatMessage):
self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[-1] self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[-1]
elif "加入群聊" in itchat_msg["Content"]: elif "加入群聊" in itchat_msg["Content"]:
self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0] self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]
elif "你已添加了" in itchat_msg["Content"]: #通过好友请求
self.ctype = ContextType.ACCEPT_FRIEND
self.content = itchat_msg["Content"]
elif "拍了拍我" in itchat_msg["Content"]: elif "拍了拍我" in itchat_msg["Content"]:
self.ctype = ContextType.PATPAT self.ctype = ContextType.PATPAT
self.content = itchat_msg["Content"] self.content = itchat_msg["Content"]