优化异常处理,防止程序闪退
This commit is contained in:
88
robot.py
88
robot.py
@@ -126,7 +126,7 @@ class Robot(Job):
|
|||||||
q = re.sub(r"@.*?[\u2005|\s]", "", msg.content).replace(" ", "")
|
q = re.sub(r"@.*?[\u2005|\s]", "", msg.content).replace(" ", "")
|
||||||
if q == "今日百度新闻":
|
if q == "今日百度新闻":
|
||||||
self.newsBaiduReport()
|
self.newsBaiduReport()
|
||||||
elif q in ["nbc","cnn","abc","fox","bbc"] :
|
elif q in ["nbc", "cnn", "abc", "fox", "bbc"]:
|
||||||
self.newsEnReport(q)
|
self.newsEnReport(q)
|
||||||
else:
|
else:
|
||||||
rsp = self.chat.get_answer(q, (msg.roomid if msg.from_group() else msg.sender))
|
rsp = self.chat.get_answer(q, (msg.roomid if msg.from_group() else msg.sender))
|
||||||
@@ -163,7 +163,7 @@ class Robot(Job):
|
|||||||
# 聊天记录入库动作:
|
# 聊天记录入库动作:
|
||||||
try:
|
try:
|
||||||
now_time = str(datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
|
now_time = str(datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
|
||||||
archive_message(msg.roomid,now_time,msg.sender,msg.content,msg.type,msg.extra)
|
archive_message(msg.roomid, now_time, msg.sender, msg.content, msg.type, msg.extra)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.LOG.error(f"archive_message error: {e}")
|
self.LOG.error(f"archive_message error: {e}")
|
||||||
|
|
||||||
@@ -192,11 +192,11 @@ class Robot(Job):
|
|||||||
if msg.content == "^更新$":
|
if msg.content == "^更新$":
|
||||||
self.config.reload()
|
self.config.reload()
|
||||||
self.LOG.info("已更新")
|
self.LOG.info("已更新")
|
||||||
if msg.content == "今日36氪新闻" :
|
if msg.content == "今日百度新闻":
|
||||||
self.newsReport()
|
self.newsBaiduReport()
|
||||||
if msg.content =='聊天排行榜':
|
if msg.content == '聊天排行榜':
|
||||||
self.generateAndSendRanking()
|
self.generateAndSendRanking()
|
||||||
if msg.content =='聊天数据入库':
|
if msg.content == '聊天数据入库':
|
||||||
self.messageCountToDB()
|
self.messageCountToDB()
|
||||||
else:
|
else:
|
||||||
self.toChitchat(msg) # 闲聊
|
self.toChitchat(msg) # 闲聊
|
||||||
@@ -287,50 +287,49 @@ class Robot(Job):
|
|||||||
self.allContacts[msg.sender] = nickName[0]
|
self.allContacts[msg.sender] = nickName[0]
|
||||||
self.sendTextMsg(f"Hi {nickName[0]},我自动通过了你的好友请求。", msg.sender)
|
self.sendTextMsg(f"Hi {nickName[0]},我自动通过了你的好友请求。", msg.sender)
|
||||||
|
|
||||||
def newsReport(self) -> None:
|
|
||||||
receivers = self.config.NEWS
|
|
||||||
if not receivers:
|
|
||||||
return
|
|
||||||
|
|
||||||
news = News().get_36kr_news()
|
|
||||||
for r in receivers:
|
|
||||||
self.sendTextMsg(news, r)
|
|
||||||
|
|
||||||
def newsBaiduReport(self) -> None:
|
def newsBaiduReport(self) -> None:
|
||||||
receivers = self.config.NEWS
|
try:
|
||||||
if not receivers:
|
receivers = self.config.NEWS
|
||||||
return
|
if not receivers:
|
||||||
news = News().get_baidu_news()
|
return
|
||||||
news = (f"请根据新闻标题,按照新闻的类型(财经、彩票、房产、股票、家居、教育、科技、社会、时尚、时政、体育、星座、游戏、娱乐)进行分类;内容前加入当前日期和星期几" \
|
news = News().get_baidu_news()
|
||||||
"内容格式如下:" \
|
news = (
|
||||||
"### 分类1" \
|
f"请根据新闻标题,按照新闻的类型(财经、彩票、房产、股票、家居、教育、科技、社会、时尚、时政、体育、星座、游戏、娱乐)进行分类;内容前加入当前日期和星期几" \
|
||||||
"1.#标题1" \
|
"内容格式如下:" \
|
||||||
"2.#标题2" \
|
"### 分类1" \
|
||||||
"分类之间使用--号进行分割,无内容则忽略该分组" )+ news
|
"1.#标题1" \
|
||||||
|
"2.#标题2" \
|
||||||
|
"分类之间使用--号进行分割,无内容则忽略该分组") + news
|
||||||
|
|
||||||
rsp = self.chat.get_answer(news)
|
rsp = self.chat.get_answer(news)
|
||||||
for r in receivers:
|
for r in receivers:
|
||||||
self.sendTextMsg(rsp, r)
|
self.sendTextMsg(rsp, r)
|
||||||
|
except Exception as e:
|
||||||
|
self.LOG.error(f"newsBaiduReport error:{e}")
|
||||||
|
|
||||||
def newsEnReport(self,website) -> None:
|
def newsEnReport(self, website) -> None:
|
||||||
receivers = self.config.NEWS
|
try:
|
||||||
if not receivers:
|
receivers = self.config.NEWS
|
||||||
return
|
if not receivers:
|
||||||
|
return
|
||||||
|
|
||||||
news = News().get_eng_news(website)
|
news = News().get_eng_news(website)
|
||||||
for r in receivers:
|
for r in receivers:
|
||||||
self.sendTextMsg(news, r)
|
self.sendTextMsg(news, r)
|
||||||
|
except Exception as e:
|
||||||
|
self.LOG.error(f"newsEnReport error:{e}")
|
||||||
|
|
||||||
def sendEpicFreeGames(self):
|
def sendEpicFreeGames(self):
|
||||||
receivers = self.config.NEWS
|
try:
|
||||||
if not receivers:
|
receivers = self.config.NEWS
|
||||||
return
|
if not receivers:
|
||||||
if is_friday():
|
return
|
||||||
games= get_free()
|
if is_friday():
|
||||||
for r in receivers:
|
games = get_free()
|
||||||
self.sendTextMsg(games, r)
|
for r in receivers:
|
||||||
|
self.sendTextMsg(games, r)
|
||||||
|
except Exception as e:
|
||||||
|
self.LOG.error(f"sendEpicFreeGames error:{e}")
|
||||||
|
|
||||||
def messageCountToDB(self):
|
def messageCountToDB(self):
|
||||||
try:
|
try:
|
||||||
@@ -347,4 +346,3 @@ class Robot(Job):
|
|||||||
self.sendTextMsg(generate_and_send_ranking(r, self.allContacts), r)
|
self.sendTextMsg(generate_and_send_ranking(r, self.allContacts), r)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.LOG.error(f"SendRanking error:{e}")
|
self.LOG.error(f"SendRanking error:{e}")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user