去除@对话内容,所有触发都需要加入指令

This commit is contained in:
liuwei
2025-04-08 13:45:50 +08:00
parent ce4569837b
commit b8e40ba987

View File

@@ -164,60 +164,24 @@ class Robot(Job):
def toChitchat(self, msg: WxMsg) -> bool:
"""闲聊,接入 ChatGPT
"""
if not self.chat: # 没接 ChatGPT固定回复
rsp = "你@我干嘛?"
else: # 接了 ChatGPT智能回复
# 去除@的人和空格等字符
q = re.sub(r"@.*?[\u2005|\s]", "", msg.content).replace(" ", "")
# 所有人员都可以要求他撤回刚刚的信息
if msg.from_group() and q.startswith("/"):
# 进行权限判断 加入权限防止tokens浪费
if self.gbm.get_group_permission(msg.roomid, Feature.TASK_GAME) == PermissionStatus.DISABLED:
return True
else:
try:
# 因为内容中存在空格指令所以不能使用q
game_message = re.sub(r"@.*?[\u2005|\s]", "", msg.content)
self.LOG.info(f"msg.content:{msg.content}\n game_message: {game_message}")
resp = game_process_message(group_id=msg.roomid, player_id=msg.sender, message=game_message,
player_name=self.allContacts.get(msg.sender, msg.sender))
message = resp["message"]
player_id = resp["player_id"]
print(f"消息: {message}")
print(f"玩家ID: {player_id}")
self.send_text_msg(message, msg.roomid, msg.sender)
except Exception as e:
self.LOG.error(f"game_message_load error{e}")
return True
if q == "#今日百度新闻":
self.news_baidu_report((msg.roomid if msg.from_group() else msg.sender))
return True
elif q in ["nbc", "cnn", "abc", "fox", "bbc"]:
self.news_en_report(q, (msg.roomid if msg.from_group() else msg.sender))
return True
else:
# 如果是群消息并且群没开启AI则不处理该动作
if msg.from_group() and self.gbm.get_group_permission(msg.roomid,
Feature.AI_CAPABILITY) == PermissionStatus.DISABLED:
return True
else:
resp = self.gbm.get_enabled_features(msg.roomid)
self.message_util.send_text_msg(resp, (msg.roomid if msg.from_group() else msg.sender), msg.sender)
# if msg.type == 1: # 只处理类型为1的消息提供的问题引用@不予以对话
# rsp = self.chat.get_answer(q, (msg.roomid if msg.from_group() else msg.sender))
# else:
return True
if rsp:
if msg.from_group():
self.send_text_msg(rsp, msg.roomid, msg.sender)
else:
self.send_text_msg(rsp, msg.sender)
# 去除@的人和空格等字符
q = re.sub(r"@.*?[\u2005|\s]", "", msg.content).replace(" ", "")
if q == "#今日百度新闻":
self.news_baidu_report((msg.roomid if msg.from_group() else msg.sender))
return True
elif q in ["nbc", "cnn", "abc", "fox", "bbc"]:
self.news_en_report(q, (msg.roomid if msg.from_group() else msg.sender))
return True
else:
self.LOG.error(f"无法从 ChatGPT 获得答案")
return False
# 如果是群消息并且群没开启AI则不处理该动作
if msg.from_group() and self.gbm.get_group_permission(msg.roomid,
Feature.AI_CAPABILITY) == PermissionStatus.ENABLED:
resp = self.gbm.get_enabled_features(msg.roomid)
self.message_util.send_text_msg(resp, (msg.roomid if msg.from_group() else msg.sender), msg.sender)
return True
else:
return True
def processMsg(self, msg: WxMsg) -> None:
"""当接收到消息的时候,会调用本方法。如果不实现本方法,则打印原始消息。