refactor: decouple and improve code architecture for better maintainability

Author: 006lp

nonebot_plugin_qqdetail/config.py

@@ -54,6 +54,16 @@ class RateLimitConfig(BaseModel):
     white_users: List[str] = Field(default_factory=list, description="用户白名单")
 
 
+class ImageStyleConfig(BaseModel):
+    """图片样式配置"""
+    font_size: int = Field(default=35, description="字体大小")
+    text_padding: int = Field(default=10, description="文本与边框的间距")
+    avatar_size: Optional[int] = Field(default=None, description="头像大小（None 表示与文本高度一致）")
+    border_thickness: int = Field(default=10, description="边框厚度")
+    border_color: tuple[int, int, int] = Field(default=(38, 38, 38), description="边框颜色 RGB")
+    corner_radius: int = Field(default=30, description="圆角大小")
+
+
 class Config(BaseModel):
     """插件配置"""
     qqdetail_only_admin: bool = Field(default=False, description="仅管理员可用")
@@ -62,3 +72,4 @@ class Config(BaseModel):
     qqdetail_auto_box_config: AutoBoxConfig = Field(default_factory=AutoBoxConfig)
     qqdetail_rate_limit_config: RateLimitConfig = Field(default_factory=RateLimitConfig)
     qqdetail_display_config: DisplayConfig = Field(default_factory=DisplayConfig)
+    qqdetail_image_style_config: ImageStyleConfig = Field(default_factory=ImageStyleConfig)

nonebot_plugin_qqdetail/draw.py

@@ -1,7 +1,7 @@
 import io
 import random
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Tuple
 
 from nonebot import logger
 from PIL import Image, ImageDraw
@@ -10,6 +10,8 @@
 from typing import Union
 from io import BytesIO
 
+from .config import ImageStyleConfig
+
 try:
     import emoji
     EMOJI_AVAILABLE = True
@@ -23,14 +25,6 @@
 FONT_PATH: Path = RESOURCE_DIR / "可爱字体.ttf"
 EMOJI_FONT_PATH: Path = RESOURCE_DIR / "NotoColorEmoji.ttf"
 
-# 样式配置
-FONT_SIZE = 35  # 字体大小
-TEXT_PADDING = 10  # 文本与边框的间距
-AVATAR_SIZE = None  # 头像大小（None 表示与文本高度一致）
-BORDER_THICKNESS = 10  # 边框厚度
-BORDER_COLOR = (38, 38, 38)  # 边框颜色 #262626
-CORNER_RADIUS = 30  # 圆角大小
-
 # 加载字体
 def load_font(font_path: Path, size: int) -> Union[ImageFont.ImageFont, FreeTypeFont]:
     """加载字体，如果失败则使用默认字体"""
@@ -44,36 +38,42 @@ def load_font(font_path: Path, size: int) -> Union[ImageFont.ImageFont, FreeType
 RESOURCE_DIR.mkdir(parents=True, exist_ok=True)
 
 # 加载主字体
-if FONT_PATH.exists():
-    cute_font = load_font(FONT_PATH, FONT_SIZE)
-    logger.debug(f"[QQDetail] 主字体加载: {FONT_PATH}")
-else:
-    logger.warning(f"[QQDetail] 字体文件不存在: {FONT_PATH}，使用默认字体")
-    cute_font = ImageFont.load_default()
+def get_cute_font(size: int) -> Union[ImageFont.ImageFont, FreeTypeFont]:
+    """获取主字体"""
+    if FONT_PATH.exists():
+        return load_font(FONT_PATH, size)
+    else:
+        logger.warning(f"[QQDetail] 字体文件不存在: {FONT_PATH}，使用默认字体")
+        return ImageFont.load_default()
 
 # 加载 Emoji 字体
-emoji_font = None
-if EMOJI_FONT_PATH.exists():
-    emoji_font = load_font(EMOJI_FONT_PATH, FONT_SIZE)
-    logger.debug(f"[QQDetail] Emoji 字体加载: {EMOJI_FONT_PATH}")
-else:
-    logger.warning(f"[QQDetail] Emoji 字体文件不存在: {EMOJI_FONT_PATH}")
+def get_emoji_font(size: int) -> Optional[Union[ImageFont.ImageFont, FreeTypeFont]]:
+    """获取Emoji字体"""
+    if EMOJI_FONT_PATH.exists():
+        return load_font(EMOJI_FONT_PATH, size)
+    else:
+        logger.warning(f"[QQDetail] Emoji 字体文件不存在: {EMOJI_FONT_PATH}")
+        return None
 
 
-def create_image(avatar: bytes, reply: list) -> bytes:
+def create_image(avatar: bytes, reply: list, style_config: ImageStyleConfig) -> bytes:
     """创建用户资料图片"""
     reply_str = "\n".join(reply)
-    
+
+    # 获取字体
+    cute_font = get_cute_font(style_config.font_size)
+    emoji_font = get_emoji_font(style_config.font_size)
+
     # 创建临时图片计算文本的宽高
     temp_img = Image.new("RGBA", (1, 1))
     temp_draw = ImageDraw.Draw(temp_img)
-    
+
     # 将 Emoji 替换为中文字符以计算宽度
     if EMOJI_AVAILABLE:
         no_emoji_reply = "".join("一" if emoji.is_emoji(c) else c for c in reply_str)  # type: ignore[union-attr]
     else:
         no_emoji_reply = reply_str
-    
+
     # 计算每行文本的高度
     lines = no_emoji_reply.split("\n")
     line_heights = []
@@ -84,14 +84,14 @@ def create_image(avatar: bytes, reply: list) -> bytes:
                 line_height = int(line_bbox[3] - line_bbox[1])
                 line_heights.append(line_height)
             except:
-                line_heights.append(FONT_SIZE + 5)
+                line_heights.append(style_config.font_size + 5)
         else:
-            line_heights.append(FONT_SIZE + 5)
-    
+            line_heights.append(style_config.font_size + 5)
+
     # 计算整体文本高度
     text_height = sum(line_heights) + (len(lines) - 1) * 5
-    text_height += TEXT_PADDING  # 底部额外边距
-    
+    text_height += style_config.text_padding  # 底部额外边距
+
     # 计算最大文本宽度
     max_line_width = 0
     for line in lines:
@@ -101,40 +101,48 @@ def create_image(avatar: bytes, reply: list) -> bytes:
                 line_width = int(line_bbox[2] - line_bbox[0])
                 max_line_width = max(max_line_width, line_width + 15)
             except:
-                max_line_width = max(max_line_width, len(line) * FONT_SIZE + 15)
-    
+                max_line_width = max(max_line_width, len(line) * style_config.font_size + 15)
+
     text_width = max_line_width
-    img_height = text_height + 2 * TEXT_PADDING
-    
+    img_height = text_height + 2 * style_config.text_padding
+
     # 调整头像大小
     avatar_img = Image.open(BytesIO(avatar))
-    avatar_size = AVATAR_SIZE if AVATAR_SIZE else text_height
+    avatar_size = style_config.avatar_size if style_config.avatar_size else text_height
     avatar_img = avatar_img.resize((avatar_size, avatar_size))
-    img_width = avatar_img.width + text_width + 2 * TEXT_PADDING
-    
+    img_width = avatar_img.width + text_width + 2 * style_config.text_padding
+
     # 创建主图
     img = Image.new("RGBA", (img_width, img_height), color=(255, 255, 255, 255))
     img.paste(avatar_img, (0, (img_height - avatar_size) // 2))
-    
+
     # 绘制文本
-    _draw_multi(img, reply_str, avatar_img.width + TEXT_PADDING, TEXT_PADDING)
-    
+    _draw_multi(img, reply_str, avatar_img.width + style_config.text_padding, style_config.text_padding, cute_font, emoji_font, style_config)
+
     # 添加边框
     border_img = Image.new(
         mode="RGBA",
-        size=(img_width + BORDER_THICKNESS * 2, img_height + BORDER_THICKNESS * 2),
-        color=BORDER_COLOR,
+        size=(img_width + style_config.border_thickness * 2, img_height + style_config.border_thickness * 2),
+        color=style_config.border_color,
     )
-    border_img.paste(img, (BORDER_THICKNESS, BORDER_THICKNESS))
-    
+    border_img.paste(img, (style_config.border_thickness, style_config.border_thickness))
+
     # 转换为字节
     img_byte_arr = io.BytesIO()
     border_img.save(img_byte_arr, format="PNG")
     return img_byte_arr.getvalue()
 
 
-def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10):
+def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10, cute_font=None, emoji_font=None, style_config: Optional[ImageStyleConfig] = None):
     """在图片上绘制多语言文本"""
+    if cute_font is None:
+        cute_font = get_cute_font(35)  # 默认值
+    if emoji_font is None:
+        emoji_font = get_emoji_font(35)
+    if style_config is None:
+        from .config import ImageStyleConfig
+        style_config = ImageStyleConfig()
+
     lines = text.split("\n")
     current_y = text_y
     draw = ImageDraw.Draw(img)
@@ -147,10 +155,10 @@ def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10)
             random.randint(240, 255),
         )
         current_x = text_x
-        
+
         # 跳过空行
         if not line.strip():
-            current_y += FONT_SIZE + 5
+            current_y += style_config.font_size + 5
             continue
 
         # 计算当前行的实际高度
@@ -161,7 +169,7 @@ def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10)
 
         try:
             bbox = cute_font.getbbox(no_emoji_line)
-            line_height = int(bbox[3] - bbox[1]) if bbox else FONT_SIZE
+            line_height = int(bbox[3] - bbox[1]) if bbox else style_config.font_size
 
             for char in line:
                 # 判断是否为 Emoji
@@ -175,12 +183,12 @@ def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10)
                     char_bbox = cute_font.getbbox(char)
 
                 # 计算字符宽度
-                char_width = char_bbox[2] - char_bbox[0] if char_bbox else FONT_SIZE // 2
-                
+                char_width = char_bbox[2] - char_bbox[0] if char_bbox else style_config.font_size // 2
+
                 # 检查是否超出边界
-                if current_x + char_width > img.width - TEXT_PADDING:
+                if current_x + char_width > img.width - style_config.text_padding:
                     current_x = text_x
-                    current_y += max(line_height, FONT_SIZE) + 5
+                    current_y += max(line_height, style_config.font_size) + 5
 
                     # 重新绘制当前字符
                     if is_emoji_char and emoji_font:
@@ -191,13 +199,13 @@ def _draw_multi(img: Image.Image, text: str, text_x: int = 10, text_y: int = 10)
                 current_x += char_width
 
             # 移动到下一行
-            next_y = current_y + max(line_height, FONT_SIZE) + 5
-            if next_y > img.height - TEXT_PADDING:
-                current_y = img.height - TEXT_PADDING - max(line_height, FONT_SIZE)
+            next_y = current_y + max(line_height, style_config.font_size) + 5
+            if next_y > img.height - style_config.text_padding:
+                current_y = img.height - style_config.text_padding - max(line_height, style_config.font_size)
             else:
                 current_y = next_y
         except Exception as e:
             logger.error(f"[QQDetail] 绘制文本时出错: {e}")
-            current_y += FONT_SIZE + 5
+            current_y += style_config.font_size + 5
 
     return img