部分原有功能加入 @群处理,只发给@的群组

This commit is contained in:
liuwei
2025-02-12 14:54:28 +08:00
parent 23e80cb61a
commit 00acba7a2d

View File

@@ -127,10 +127,10 @@ class Robot(Job):
else: # 接了 ChatGPT智能回复
q = re.sub(r"@.*?[\u2005|\s]", "", msg.content).replace(" ", "")
if q == "今日百度新闻":
self.newsBaiduReport()
self.newsBaiduReport((msg.roomid if msg.from_group() else msg.sender))
return True
elif q in ["nbc", "cnn", "abc", "fox", "bbc"]:
self.newsEnReport(q)
self.newsEnReport(q, (msg.roomid if msg.from_group() else msg.sender))
return True
elif q == '/总结':
self.message_summary_robot((msg.roomid if msg.from_group() else msg.sender))
@@ -296,11 +296,8 @@ class Robot(Job):
self.allContacts[msg.sender] = nickName[0]
self.sendTextMsg(f"Hi {nickName[0]},我自动通过了你的好友请求。", msg.sender)
def newsBaiduReport(self) -> None:
def newsBaiduReport(self, sender: str = None) -> None:
try:
receivers = self.config.NEWS
if not receivers:
return
news = News().get_baidu_news()
# news = (
# f"请根据新闻标题,按照新闻的类型(财经、彩票、房产、股票、家居、教育、科技、社会、时尚、时政、体育、星座、游戏、娱乐)进行分类;内容前加入当前日期和星期几" \
@@ -311,20 +308,14 @@ class Robot(Job):
# "分类之间使用--号进行分割,无内容则忽略该分组") + news
# rsp = self.chat.get_answer(news)
for r in receivers:
self.sendTextMsg(news, r)
self.sendTextMsg(news, sender)
except Exception as e:
self.LOG.error(f"newsBaiduReport error{e}")
def newsEnReport(self, website) -> None:
def newsEnReport(self, website, sender: str = None) -> None:
try:
receivers = self.config.NEWS
if not receivers:
return
news = News().get_eng_news(website)
for r in receivers:
self.sendTextMsg(news, r)
self.sendTextMsg(news, sender)
except Exception as e:
self.LOG.error(f"newsEnReport error{e}")