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

feat: support at everywhere

Browse Source
This commit is contained in:
lanvent
2023-03-31 05:16:30 +08:00
parent d9ef5a6612
commit 37a95980d4
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channel/wechat/wechat_channel.py
View File

@@ -5,9 +5,11 @@ wechat channel
""" """
import os import os
import re
import requests import requests
import io import io
import time import time
from common.singleton import singleton
from lib import itchat from lib import itchat
import json import json
from lib.itchat.content import * from lib.itchat.content import *
@@ -68,11 +70,11 @@ def _check(func):
return func(self, msg) return func(self, msg)
return wrapper return wrapper
@singleton
class WechatChannel(Channel): class WechatChannel(Channel):
def __init__(self): def __init__(self):
self.userName = None self.user_id = None
self.nickName = None self.name = None
self.receivedMsgs = ExpiredDict(60*60*24) self.receivedMsgs = ExpiredDict(60*60*24)
def startup(self): def startup(self):
@@ -90,9 +92,9 @@ class WechatChannel(Channel):
itchat.auto_login(enableCmdQR=2, hotReload=hotReload) itchat.auto_login(enableCmdQR=2, hotReload=hotReload)
else: else:
raise e raise e
self.userName = itchat.instance.storageClass.userName self.user_id = itchat.instance.storageClass.userName
self.nickName = itchat.instance.storageClass.nickName self.name = itchat.instance.storageClass.nickName
logger.info("Wechat login success, username: {}, nickname: {}".format(self.userName, self.nickName)) logger.info("Wechat login success, user_id: {}, nickname: {}".format(self.user_id, self.name))
# start message listener # start message listener
itchat.run() itchat.run()
@@ -160,17 +162,12 @@ class WechatChannel(Channel):
group_id = msg['User'].get('UserName', None) group_id = msg['User'].get('UserName', None)
if not group_name: if not group_name:
return "" return ""
origin_content = msg['Content'] content = msg.content
content = msg['Content']
content_list = content.split(' ', 1)
context_special_list = content.split('\u2005', 1)
if len(context_special_list) == 2:
content = context_special_list[1]
elif len(content_list) == 2:
content = content_list[1]
if "」\n- - - - - - - - - - - - - - -" in content: if "」\n- - - - - - - - - - - - - - -" in content:
logger.debug("[WX]reference query skipped") logger.debug("[WX]reference query skipped")
return "" return ""
pattern = f'@{self.name}(\u2005|\u0020)'
content = re.sub(pattern, r'', content)
config = conf() config = conf()
group_name_white_list = config.get('group_name_white_list', []) group_name_white_list = config.get('group_name_white_list', [])