diff --git a/utils/utils.py b/utils/utils.py index 6dd7f41b..6a81a9be 100755 --- a/utils/utils.py +++ b/utils/utils.py @@ -16,7 +16,6 @@ try: except ModuleNotFoundError: import json - scheduler = require("nonebot_plugin_apscheduler").scheduler @@ -108,8 +107,8 @@ class BanCheckLimiter: self.mint[key] = 0 return False if ( - self.mint[key] >= self.default_count - and time.time() - self.mtime[key] < self.default_check_time + self.mint[key] >= self.default_count + and time.time() - self.mtime[key] < self.default_check_time ): self.mtime[key] = time.time() self.mint[key] = 0 @@ -203,10 +202,7 @@ def get_message_at(data: Union[str, Message]) -> List[int]: for msg in data["message"]: if msg["type"] == "at": qq_list.append(int(msg["data"]["qq"])) - else: - for seg in data: - if seg.type == "image": - qq_list.append(seg.data["url"]) + return qq_list @@ -229,6 +225,25 @@ def get_message_img(data: Union[str, Message]) -> List[str]: return img_list +def get_message_img_file(data: Union[str, Message]) -> List[str]: + """ + 说明: + 获取消息中所有的 图片file + 参数: + :param data: event.json() + """ + file_list = [] + if isinstance(data, str): + data = json.loads(data) + for msg in data["message"]: + if msg["type"] == "image": + file_list.append(msg["data"]["file"]) + else: + for seg in data["image"]: + file_list.append(seg.data["file"]) + return file_list + + def get_message_text(data: Union[str, Message]) -> str: """ 说明: @@ -355,7 +370,7 @@ def cn2py(word: str) -> str: def change_pixiv_image_links( - url: str, size: Optional[str] = None, nginx_url: Optional[str] = None + url: str, size: Optional[str] = None, nginx_url: Optional[str] = None ): """ 说明: @@ -373,7 +388,7 @@ def change_pixiv_image_links( if nginx_url: url = ( url.replace("i.pximg.net", nginx_url) - .replace("i.pixiv.cat", nginx_url) - .replace("_webp", "") + .replace("i.pixiv.cat", nginx_url) + .replace("_webp", "") ) return url