modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-10-03 19:00:00 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -7,23 +7,28 @@ import uuid
 from io import BytesIO
 from math import ceil
 from pathlib import Path
-from typing import List, Literal, Optional, Tuple, Union, Callable, Awaitable
-
-from PIL.ImageFont import FreeTypeFont
-from nonebot.utils import is_coroutine_callable
+from typing import Awaitable, Callable, List, Literal, Optional, Tuple, Union

 import cv2
 import imagehash
-from configs.path_config import FONT_PATH, IMAGE_PATH
 from imagehash import ImageHash
 from matplotlib import pyplot as plt
+from nonebot.utils import is_coroutine_callable
 from PIL import Image, ImageDraw, ImageFile, ImageFilter, ImageFont
+from PIL.ImageFont import FreeTypeFont
+
+from configs.path_config import FONT_PATH, IMAGE_PATH
 from services import logger

 ImageFile.LOAD_TRUNCATED_IMAGES = True
 Image.MAX_IMAGE_PIXELS = None


+ModeType = Literal[
+    "1", "CMYK", "F", "HSV", "I", "L", "LAB", "P", "RGB", "RGBA", "RGBX", "YCbCr"
+]
+
+
 def compare_image_with_hash(
    image_file1: str, image_file2: str, max_dif: int = 1.5
 ) -> bool:
@@ -154,7 +159,7 @@ class BuildImage:
        paste_image_width: int = 0,
        paste_image_height: int = 0,
        color: Union[str, Tuple[int, int, int], Tuple[int, int, int, int]] = None,
-        image_mode: str = "RGBA",
+        image_mode: ModeType = "RGBA",
        font_size: int = 10,
        background: Union[Optional[str], BytesIO, Path] = None,
        font: str = "yz.ttf",
@@ -162,7 +167,7 @@ class BuildImage:
        is_alpha: bool = False,
        plain_text: Optional[str] = None,
        font_color: Optional[Union[str, Tuple[int, int, int]]] = None,
-        **kwargs
+        **kwargs,
    ):
        """
        参数:
@@ -320,6 +325,19 @@ class BuildImage:
            self.markImg.paste(img, pos)
        self._current_w += self.paste_image_width

+    @classmethod
+    def get_text_size(cls, msg: str, font: str, font_size: int) -> Tuple[int, int]:
+        """
+        说明:
+            获取文字在该图片 font_size 下所需要的空间
+        参数:
+            :param msg: 文字内容
+            :param font: 字体
+            :param font_size: 字体大小
+        """
+        font = cls.load_font(font, font_size)
+        return font.getsize(msg)
+
    def getsize(self, msg: str) -> Tuple[int, int]:
        """
        说明:
@@ -395,7 +413,7 @@ class BuildImage:
        center_type: Optional[Literal["center", "by_height", "by_width"]] = None,
        font: Union[FreeTypeFont, str] = None,
        font_size: Optional[int] = None,
-        **kwargs
+        **kwargs,
    ):
        """
        说明:
@@ -408,7 +426,9 @@ class BuildImage:
            :param font: 字体
            :param font_size: 字体大小
        """
-        await self.loop.run_in_executor(None, self.text, pos, text, fill, center_type, font, font_size, **kwargs)
+        await self.loop.run_in_executor(
+            None, self.text, pos, text, fill, center_type, font, font_size, **kwargs
+        )

    def text(
        self,
@@ -418,7 +438,7 @@ class BuildImage:
        center_type: Optional[Literal["center", "by_height", "by_width"]] = None,
        font: Union[FreeTypeFont, str] = None,
        font_size: Optional[int] = None,
-        **kwargs
+        **kwargs,
    ):
        """
        说明:
@@ -577,9 +597,9 @@ class BuildImage:
        buf = BytesIO()
        self.markImg.save(buf, format="PNG")
        base64_str = base64.b64encode(buf.getvalue()).decode()
-        return base64_str
+        return "base64://" + base64_str

-    def convert(self, type_: str):
+    def convert(self, type_: ModeType):
        """
        说明:
            修改图片类型
@@ -792,7 +812,7 @@ class BuildImage:
        """
        self.markImg = self.markImg.rotate(angle, expand=expand)

-    async def atranspose(self, angle: int):
+    async def atranspose(self, angle: Literal[0, 1, 2, 3, 4, 5, 6]):
        """
        说明:
            异步 旋转图片(包括边框)
@@ -801,7 +821,7 @@ class BuildImage:
        """
        await self.loop.run_in_executor(None, self.transpose, angle)

-    def transpose(self, angle: int):
+    def transpose(self, angle: Literal[0, 1, 2, 3, 4, 5, 6]):
        """
        说明:
            旋转图片(包括边框)
@@ -1663,7 +1683,11 @@ async def build_sort_image(
    image_group: List[List[BuildImage]],
    h: Optional[int] = None,
    padding_top: int = 200,
-    color: Union[str, Tuple[int, int, int], Tuple[int, int, int, int]] = (255, 255, 255),
+    color: Union[str, Tuple[int, int, int], Tuple[int, int, int, int]] = (
+        255,
+        255,
+        255,
+    ),
    background_path: Optional[Path] = None,
    background_handle: Callable[[BuildImage], Optional[Awaitable]] = None,
 ) -> BuildImage: