|
|
@@ -37,18 +37,20 @@ def handler_single_msg(msg): |
|
|
|
WechatChannel().handle_text(msg) |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
@itchat.msg_register(TEXT, isGroupChat=True) |
|
|
|
def handler_group_msg(msg): |
|
|
|
WechatChannel().handle_group(msg) |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
@itchat.msg_register(VOICE) |
|
|
|
def handler_single_voice(msg): |
|
|
|
WechatChannel().handle_voice(msg) |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
@itchat.msg_register(VOICE, isGroupChat=True) |
|
|
|
def handler_group_voice(msg): |
|
|
|
WechatChannel().handle_group_voice(msg) |
|
|
|
return None |
|
|
|
|
|
|
|
@itchat.msg_register(VOICE, isGroupChat=True) |
|
|
|
def handler_group_voice(msg): |
|
|
@@ -108,13 +110,11 @@ class WechatChannel(Channel): |
|
|
|
else: |
|
|
|
other_user_id = from_user_id |
|
|
|
if from_user_id == other_user_id: |
|
|
|
context = Context(ContextType.VOICE, msg['FileName']) |
|
|
|
context.kwargs = {'isgroup': False, 'msg': msg, |
|
|
|
'receiver': other_user_id, 'session_id': other_user_id} |
|
|
|
thread_pool.submit(self.handle, context).add_done_callback( |
|
|
|
thread_pool_callback) |
|
|
|
context = Context(ContextType.VOICE,msg['FileName']) |
|
|
|
context.kwargs = {'isgroup': False, 'msg': msg, 'receiver': other_user_id, 'session_id': other_user_id} |
|
|
|
thread_pool.submit(self.handle, context).add_done_callback(thread_pool_callback) |
|
|
|
|
|
|
|
@time_checker |
|
|
|
@time_checker |
|
|
|
def handle_text(self, msg): |
|
|
|
logger.debug("[WX]receive text msg: " + |
|
|
|
json.dumps(msg, ensure_ascii=False)) |
|
|
@@ -221,6 +221,33 @@ class WechatChannel(Channel): |
|
|
|
thread_pool.submit(self.handle, context).add_done_callback( |
|
|
|
thread_pool_callback) |
|
|
|
|
|
|
|
def handle_group_voice(self, msg): |
|
|
|
if conf().get('group_speech_recognition', False) != True: |
|
|
|
return |
|
|
|
logger.debug("[WX]receive voice for group msg: " + msg['FileName']) |
|
|
|
group_name = msg['User'].get('NickName', None) |
|
|
|
group_id = msg['User'].get('UserName', None) |
|
|
|
create_time = msg['CreateTime'] # 消息时间 |
|
|
|
if conf().get('hot_reload') == True and int(create_time) < int(time.time()) - 60: #跳过1分钟前的历史消息 |
|
|
|
logger.debug("[WX]history group voice skipped") |
|
|
|
return |
|
|
|
# 验证群名 |
|
|
|
if not group_name: |
|
|
|
return "" |
|
|
|
if ('ALL_GROUP' in conf().get('group_name_white_list') or group_name in conf().get('group_name_white_list') or check_contain(group_name, conf().get('group_name_keyword_white_list'))): |
|
|
|
context = Context(ContextType.VOICE,msg['FileName']) |
|
|
|
context.kwargs = {'isgroup': True, 'msg': msg, 'receiver': group_id} |
|
|
|
|
|
|
|
group_chat_in_one_session = conf().get('group_chat_in_one_session', []) |
|
|
|
if ('ALL_GROUP' in group_chat_in_one_session or |
|
|
|
group_name in group_chat_in_one_session or |
|
|
|
check_contain(group_name, group_chat_in_one_session)): |
|
|
|
context['session_id'] = group_id |
|
|
|
else: |
|
|
|
context['session_id'] = msg['ActualUserName'] |
|
|
|
|
|
|
|
thread_pool.submit(self.handle, context).add_done_callback(thread_pool_callback) |
|
|
|
|
|
|
|
# 统一的发送函数,每个Channel自行实现,根据reply的type字段发送不同类型的消息 |
|
|
|
def send(self, reply: Reply, receiver): |
|
|
|
if reply.type == ReplyType.TEXT: |
|
|
@@ -260,11 +287,10 @@ class WechatChannel(Channel): |
|
|
|
'channel': self, 'context': context, 'reply': reply})) |
|
|
|
reply = e_context['reply'] |
|
|
|
if not e_context.is_pass(): |
|
|
|
logger.debug('[WX] ready to handle context: type={}, content={}'.format( |
|
|
|
context.type, context.content)) |
|
|
|
if context.type == ContextType.TEXT or context.type == ContextType.IMAGE_CREATE: |
|
|
|
logger.debug('[WX] ready to handle context: type={}, content={}'.format(context.type, context.content)) |
|
|
|
if context.type == ContextType.TEXT or context.type == ContextType.IMAGE_CREATE: # 文字和图片消息 |
|
|
|
reply = super().build_reply_content(context.content, context) |
|
|
|
elif context.type == ContextType.VOICE: |
|
|
|
elif context.type == ContextType.VOICE: # 语音消息 |
|
|
|
msg = context['msg'] |
|
|
|
mp3_path = TmpDir().path() + context.content |
|
|
|
msg.download(mp3_path) |
|
|
@@ -295,7 +321,14 @@ class WechatChannel(Channel): |
|
|
|
else: |
|
|
|
logger.info("[WX]receive voice check prefix: " + 'False') |
|
|
|
return |
|
|
|
|
|
|
|
|
|
|
|
img_match_prefix = check_prefix(content, conf().get('image_create_prefix')) |
|
|
|
if img_match_prefix: |
|
|
|
content = content.replace(img_match_prefix, '', 1).strip() |
|
|
|
context.type = ContextType.IMAGE_CREATE |
|
|
|
else: |
|
|
|
context.type = ContextType.TEXT |
|
|
|
context.content = content |
|
|
|
reply = super().build_reply_content(context.content, context) |
|
|
|
if reply.type == ReplyType.TEXT: |
|
|
|
if conf().get('voice_reply_voice'): |
|
|
@@ -341,14 +374,12 @@ class WechatChannel(Channel): |
|
|
|
reply, context['receiver'])) |
|
|
|
self.send(reply, context['receiver']) |
|
|
|
|
|
|
|
|
|
|
|
def check_prefix(content, prefix_list): |
|
|
|
for prefix in prefix_list: |
|
|
|
if content.startswith(prefix): |
|
|
|
return prefix |
|
|
|
return None |
|
|
|
|
|
|
|
|
|
|
|
def check_contain(content, keyword_list): |
|
|
|
if not keyword_list: |
|
|
|
return None |
|
|
|