Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Update message_builder.py

Browse Source
This commit is contained in:
HibiKier 2022-02-24 16:12:25 +08:00 committed by GitHub
parent 76df21036a
commit ca18d45786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
utils/message_builder.py
View File

@ -10,7 +10,6 @@ import os
def image( def image(
file: Union[str, Path, bytes] = None, file: Union[str, Path, bytes] = None,
path: str = None, path: str = None,
abspath: Union[str, Path] = None,
b64: str = None, b64: str = None,
) -> Union[MessageSegment, str]: ) -> Union[MessageSegment, str]:
""" """
@ -20,18 +19,9 @@ def image(
参数： 参数：
:param file: 图片文件名称，默认在 resource/img 目录下 :param file: 图片文件名称，默认在 resource/img 目录下
:param path: 图片所在路径，默认在 resource/img 目录下 :param path: 图片所在路径，默认在 resource/img 目录下
:param abspath: 图片绝对路径
:param b64: 图片base64 :param b64: 图片base64
""" """
if abspath: if isinstance(file, Path):
if isinstance(abspath, Path):
return MessageSegment.image(abspath)
return (
MessageSegment.image("file:///" + abspath)
if os.path.exists(abspath)
else ""
)
elif isinstance(file, Path):
if file.exists(): if file.exists():
return MessageSegment.image(file) return MessageSegment.image(file)
logger.warning(f"图片 {file.absolute()}缺失...") logger.warning(f"图片 {file.absolute()}缺失...")
@ -41,14 +31,11 @@ def image(
elif b64: elif b64:
return MessageSegment.image(b64 if "base64://" in b64 else "base64://" + b64) return MessageSegment.image(b64 if "base64://" in b64 else "base64://" + b64)
else: else:
if "http" in file: if file.startswith("http"):
return MessageSegment.image(file) return MessageSegment.image(file)
if len(file.split(".")) == 1: if len(file.split(".")) == 1:
file += ".jpg" file += ".jpg"
file = ( if (file := IMAGE_PATH / path / file if path else IMAGE_PATH / file).exists():
IMAGE_PATH / path / file if path else IMAGE_PATH / file
)
if file.exists():
return MessageSegment.image(file) return MessageSegment.image(file)
else: else:
logger.warning(f"图片 {file} 缺失...") logger.warning(f"图片 {file} 缺失...")