diff options
| -rw-r--r-- | ATRI/plugins/bilibili_dynamic/__init__.py | 9 | ||||
| -rw-r--r-- | ATRI/plugins/twitter/__init__.py | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py index 75dfb68..cbbeead 100644 --- a/ATRI/plugins/bilibili_dynamic/__init__.py +++ b/ATRI/plugins/bilibili_dynamic/__init__.py @@ -12,7 +12,7 @@ from nonebot import get_bot from nonebot.matcher import Matcher from nonebot.params import CommandArg, ArgPlainText from nonebot.permission import Permission, SUPERUSER -from nonebot.adapters.onebot.v11 import Message, GroupMessageEvent +from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEvent from ATRI.log import logger as log from ATRI.utils import timestamp2datetime @@ -190,12 +190,13 @@ async def _check_bd(): for i in result: i["name"] = m.up_nickname if ts < i["timestamp"]: - content = Message(sub.gen_output(i, _CONTENT_LIMIT)) - pic = i.get("pic", None) + content = sub.gen_output(i, _CONTENT_LIMIT) + _pic = i.get("pic", None) bot = get_bot() await bot.send_group_msg(group_id=m.group_id, message=content) - if pic: + if _pic: + pic = Message(MessageSegment.image(_pic)) try: await bot.send_group_msg(group_id=m.group_id, message=pic) except Exception: diff --git a/ATRI/plugins/twitter/__init__.py b/ATRI/plugins/twitter/__init__.py index 5d75e18..c219338 100644 --- a/ATRI/plugins/twitter/__init__.py +++ b/ATRI/plugins/twitter/__init__.py @@ -195,21 +195,18 @@ async def _check_td(): if ts < ts_t: raw_media = info["status"]["entities"].get("media", dict()) - if raw_media: - _pic = raw_media[0]["media_url"] - else: - _pic = str() + _pic = raw_media[0]["media_url"] if raw_media else str() data = { "name": info["name"], "content": info["status"]["text"], } content = sub.gen_output(data, _CONTENT_LIMIT) - pic = Message(MessageSegment.image(_pic)) bot = get_bot() await bot.send_group_msg(group_id=m.group_id, message=content) - if pic: + if _pic: + pic = Message(MessageSegment.image(_pic)) try: await bot.send_group_msg(group_id=m.group_id, message=pic) except Exception: |