From c3e555fd70858e1334b5ca94ba1c7a0512bcd94f Mon Sep 17 00:00:00 2001
From: SengokuCola <1026294844@qq.com>
Date: Fri, 28 Feb 2025 23:37:01 +0800
Subject: [PATCH] v0.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了表情包无法偷的bug
---
 requirements.txt                              | Bin 1106 -> 1050 bytes
 src/plugins/chat/cq_code.py                   |  33 +++++++-----
 src/plugins/chat/message_send_control.py      |   2 +-
 src/plugins/chat/storage.py                   |   1 -
 .../chat/{image_utils.py => utils_image.py}   |  51 ++++++++++++++++++
 5 files changed, 71 insertions(+), 16 deletions(-)
 rename src/plugins/chat/{image_utils.py => utils_image.py} (77%)

diff --git a/requirements.txt b/requirements.txt
index 684627886548ee785742eb557605ab9648f88b7a..bdc30ea96db621f041117de60e76af50b0125fd0 100644
GIT binary patch
delta 49
zcmcb_F^gk@2yYUDE<-Xy4nrmbF9X*^N5hFuA`_>mOgt7aS&qeI@)~B2#d3_yEI>I1
E075$p`2YX_

delta 100
zcmbQmafxGsh;BYZ9z!Za5<@;i34;+sG(#FgB118doybtYkjW6sU<-ss40>Q}I8o7%
i7g@k~VxT2hzyPSi1c(hLb_Q<dW8`3-#KbZ2kq!Xmm=kmW

diff --git a/src/plugins/chat/cq_code.py b/src/plugins/chat/cq_code.py
index 55b4d82d7..cb60a728c 100644
--- a/src/plugins/chat/cq_code.py
+++ b/src/plugins/chat/cq_code.py
@@ -4,15 +4,14 @@ import html
 import requests
 import base64
 from PIL import Image
-import io 
-from .image_utils import storage_compress_image, storage_emoji
 import os
 from random import random
 from nonebot.adapters.onebot.v11 import Bot
 from .config import global_config, llm_config
 import time
 import asyncio
-
+from .utils_image import storage_image,storage_emoji
+from .utils_user import get_user_nickname
 #解析各种CQ码
 #包含CQ码类
 
@@ -85,11 +84,11 @@ class CQCode:
             else:
                 self.translated_plain_text = self.translate_emoji()
         elif self.type == 'at':
-            from .message import Message
-            message_obj = Message(
-                user_id=str(self.params.get('qq', ''))
-            )
-            self.translated_plain_text = f"@{message_obj.user_nickname}"
+            user_nickname = get_user_nickname(self.params.get('qq', ''))
+            if user_nickname:
+                self.translated_plain_text = f"[@{user_nickname}]"
+            else:
+                self.translated_plain_text = f"[@某人]"
         elif self.type == 'reply':
             self.translated_plain_text = self.translate_reply()
         elif self.type == 'face':
@@ -151,6 +150,7 @@ class CQCode:
         image_base64 = base64.b64encode(content).decode('utf-8')
         if image_base64:
             self.image_base64 = image_base64
+            
             return image_base64
         else:
             return None
@@ -159,9 +159,12 @@ class CQCode:
         """处理表情包类型的CQ码"""
         if 'url' not in self.params:
             return '[表情包]'
-        base64 = self.get_img()
-        if base64:
-            return self.get_image_description(base64)
+        base64_str = self.get_img()
+        if base64_str:
+            # 将 base64 字符串转换为字节类型
+            image_bytes = base64.b64decode(base64_str)
+            storage_emoji(image_bytes)
+            return self.get_image_description(base64_str)
         else:
             return '[表情包]'
     
@@ -171,9 +174,11 @@ class CQCode:
         #没有url，直接返回默认文本
         if 'url' not in self.params:
             return '[图片]'
-        base64 = self.get_img()
-        if base64:
-            return self.get_image_description(base64)
+        base64_str = self.get_img()
+        if base64_str:
+            image_bytes = base64.b64decode(base64_str)
+            storage_image(image_bytes)
+            return self.get_image_description(base64_str)
         else:
             return '[图片]'
 
diff --git a/src/plugins/chat/message_send_control.py b/src/plugins/chat/message_send_control.py
index cee27bf1f..c5bd122f7 100644
--- a/src/plugins/chat/message_send_control.py
+++ b/src/plugins/chat/message_send_control.py
@@ -183,7 +183,7 @@ class MessageSendControl:
             if isinstance(message, Message_Thinking):
                 message.update_thinking_time()
                 thinking_time = message.thinking_time
-                if thinking_time < 60:  # 最少思考2秒
+                if thinking_time < 90:  # 最少思考2秒
                     if int(thinking_time) % 10 == 0:
                         print(f"\033[1;34m[调试]\033[0m 消息正在思考中，已思考{thinking_time:.1f}秒")
                     return
diff --git a/src/plugins/chat/storage.py b/src/plugins/chat/storage.py
index 4de6265c9..7aea02568 100644
--- a/src/plugins/chat/storage.py
+++ b/src/plugins/chat/storage.py
@@ -5,7 +5,6 @@ from collections import defaultdict
 import asyncio
 from .message import Message
 from ...common.database import Database
-from .image_utils import storage_compress_image
 
 class MessageStorage:
     def __init__(self):
diff --git a/src/plugins/chat/image_utils.py b/src/plugins/chat/utils_image.py
similarity index 77%
rename from src/plugins/chat/image_utils.py
rename to src/plugins/chat/utils_image.py
index 0857bfcdd..e1a882341 100644
--- a/src/plugins/chat/image_utils.py
+++ b/src/plugins/chat/utils_image.py
@@ -10,6 +10,16 @@ import base64
 
 bot_config = BotConfig.load_config()
 
+
+def storage_image(image_data: bytes,type: str, max_size: int = 200) -> bytes:
+    if type == 'image':
+        return storage_compress_image(image_data, max_size)
+    elif type == 'emoji':
+        return storage_emoji(image_data)
+    else:
+        raise ValueError(f"不支持的图片类型: {type}")
+
+
 def storage_compress_image(image_data: bytes, max_size: int = 200) -> bytes:
     """
     压缩图片到指定大小（单位：KB）并在数据库中记录图片信息
@@ -162,4 +172,45 @@ def storage_emoji(image_data: bytes) -> bytes:
         
     except Exception as e:
         print(f"\033[1;31m[错误]\033[0m 保存表情包失败: {str(e)}")
+        return image_data 
+    
+
+def storage_image(image_data: bytes) -> bytes:
+    """
+    存储图片到本地文件夹
+    Args:
+        image_data: 图片字节数据
+        group_id: 群组ID（仅用于日志）
+        user_id: 用户ID（仅用于日志）
+    Returns:
+        bytes: 原始图片数据
+    """
+    try:
+        # 使用 CRC32 计算哈希值
+        hash_value = format(zlib.crc32(image_data) & 0xFFFFFFFF, 'x')
+        
+        # 确保表情包目录存在
+        image_dir = "data/image"
+        os.makedirs(image_dir, exist_ok=True)
+        
+        # 检查是否已存在相同哈希值的文件
+        for filename in os.listdir(image_dir):
+            if hash_value in filename:
+                # print(f"\033[1;33m[提示]\033[0m 发现重复表情包: {filename}")
+                return image_data
+        
+        # 生成文件名
+        timestamp = int(time.time())
+        filename = f"{timestamp}_{hash_value}.jpg"
+        image_path = os.path.join(image_dir, filename)
+        
+        # 直接保存原始文件
+        with open(image_path, "wb") as f:
+            f.write(image_data)
+            
+        print(f"\033[1;32m[成功]\033[0m 保存图片到: {image_path}")
+        return image_data
+        
+    except Exception as e:
+        print(f"\033[1;31m[错误]\033[0m 保存图片失败: {str(e)}")
         return image_data 
\ No newline at end of file