From 27dd2482f8bcdb645cb102485d8c693bd65e6dce Mon Sep 17 00:00:00 2001 From: felinae98 <731499577@qq.com> Date: Mon, 8 Feb 2021 14:46:05 +0800 Subject: [PATCH] fix bug --- src/plugins/hk_reporter/post.py | 7 +++++-- src/plugins/hk_reporter/scheduler.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/plugins/hk_reporter/post.py b/src/plugins/hk_reporter/post.py index 40d64d9..3df080f 100644 --- a/src/plugins/hk_reporter/post.py +++ b/src/plugins/hk_reporter/post.py @@ -8,10 +8,13 @@ class Post: url: str pics: list[str] - def generate_messages(self): + async def generate_messages(self): if plugin_config.hk_reporter_use_pic: text_msg = '来源: {}\n{}'.format(self.target_type, self.text) - res = [await parse_text(text_msg), self.url] + if self.target_type == 'rss': + res = [await parse_text(text_msg)] + else: + res = [await parse_text(text_msg), self.url] else: first_msg = '来源: {}\n{}\n详情:{}'.format(self.target_type, self.text, self.url) res = [first_msg] diff --git a/src/plugins/hk_reporter/scheduler.py b/src/plugins/hk_reporter/scheduler.py index 2f8374f..e89e5b2 100644 --- a/src/plugins/hk_reporter/scheduler.py +++ b/src/plugins/hk_reporter/scheduler.py @@ -31,7 +31,7 @@ async def weibo_check(): logger.warning('no bot connected') else: for to_send in send_list: - send_msgs(bot, to_send['user'], to_send['user_type'], new_weibo.generate_messages()) + send_msgs(bot, to_send['user'], to_send['user_type'], await new_weibo.generate_messages()) @scheduler.scheduled_job('interval', seconds=10) async def bilibili_check(): @@ -50,7 +50,7 @@ async def bilibili_check(): logger.warning('no bot connected') else: for to_send in send_list: - send_msgs(bot, to_send['user'], to_send['user_type'], new_post.generate_messages()) + send_msgs(bot, to_send['user'], to_send['user_type'], await new_post.generate_messages()) @scheduler.scheduled_job('interval', seconds=30) async def rss_check(): @@ -69,7 +69,7 @@ async def rss_check(): logger.warning('no bot connected') else: for to_send in send_list: - send_msgs(bot, to_send['user'], to_send['user_type'], new_post.generate_messages()) + send_msgs(bot, to_send['user'], to_send['user_type'], await new_post.generate_messages()) @scheduler.scheduled_job('interval', seconds=1) async def _():