fix: 画图报错

addons/dashboard/helper.py

@@ -119,14 +119,14 @@ class DashBoardHelper():
             )
             qq_gocq_platform_group = DashBoardConfig(
                 config_type="group",
-                name="OneBot协议平台配置",
+                name="go-cqhttp",
                 description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
                         val_type="bool",
                         name="启用",
-                        description="支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        description="",
                         value=config['gocqbot']['enable'],
                         path="gocqbot.enable",
                     ),

addons/dashboard/server.py

@@ -390,13 +390,13 @@ class AstrBotDashBoard():
                     },
                     {
                         "title": "QQ_OFFICIAL",
-                        "desc": "QQ官方API，仅支持频道",
+                        "desc": "QQ官方API。支持频道、群（需获得群权限）",
                         "namespace": "internal_platform_qq_official",
                         "tag": ""
                     },
                     {
-                        "title": "OneBot协议",
-                        "desc": "支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        "title": "go-cqhttp",
+                        "desc": "第三方 QQ 协议实现。支持频道、群",
                         "namespace": "internal_platform_qq_gocq",
                         "tag": ""
                     }

main.py

@@ -4,7 +4,6 @@ import sys
 import warnings
 import traceback
 import threading
-from SparkleLogging.utils.core import LogManager
 from logging import Formatter, Logger
 
 warnings.filterwarnings("ignore")
@@ -78,19 +77,12 @@ def check_env():
         exit()
 
 if __name__ == "__main__":
-    logger = LogManager.GetLogger(
-    log_name='astrbot-core',
-        out_to_console=True,
-        custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
-    )
-    logger.info(logo_tmpl)
     
     # 设置代理
     from util.cmd_config import CmdConfig
     cc = CmdConfig()
     http_proxy = cc.get("http_proxy")
     https_proxy = cc.get("https_proxy")
-    logger.info(f"使用代理: {http_proxy}, {https_proxy}")
     if http_proxy:
         os.environ['HTTP_PROXY'] = http_proxy
     if https_proxy:
@@ -98,6 +90,16 @@ if __name__ == "__main__":
     os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
 
     update_dept()
+    
+    from SparkleLogging.utils.core import LogManager
+    logger = LogManager.GetLogger(
+    log_name='astrbot-core',
+        out_to_console=True,
+        custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
+    )
+    logger.info(logo_tmpl)
+    logger.info(f"使用代理: {http_proxy}, {https_proxy}")
+    
     check_env()
     t = threading.Thread(target=main, daemon=True)
     t.start()

model/command/command.py

@@ -217,7 +217,7 @@ class Command:
             "help": "帮助",
             "keyword": "设置关键词/关键指令回复",
             "update": "更新项目",
-            "nick": "设置机器人昵称",
+            "nick": "设置机器人唤醒词",
             "plugin": "插件安装、卸载和重载",
             "web on/off": "LLM 网页搜索能力",
         }

model/command/openai_official.py

@@ -248,9 +248,6 @@ class CommandOpenAIOfficial(Command):
     async def draw(self, message: str):
         if self.provider is None:
             return False, "未启用 OpenAI 官方 API", "draw"
-        if message.startswith("/画"):
-            message = message[2:]
-        elif message.startswith("画"):
-            message = message[1:]
+        message = message.removeprefix("/").removeprefix("画")
         img_url = await self.provider.image_generate(message)
         return True, img_url, "draw"

model/platform/qq_gocq.py

@@ -11,6 +11,7 @@ from nakuru import (
     Notify
 )
 from typing import Union
+from type.types import GlobalObject
 import time
 
 from ._platfrom import Platform
@@ -29,7 +30,7 @@ class FakeSource:
 
 
 class QQGOCQ(Platform):
-    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+    def __init__(self, cfg: dict, message_handler: callable, global_object: GlobalObject) -> None:
         super().__init__(message_handler)
 
         self.loop = asyncio.new_event_loop()
@@ -38,14 +39,8 @@ class QQGOCQ(Platform):
         self.waiting = {}
         self.cc = CmdConfig()
         self.cfg = cfg
-
-        try:
-            self.nick_qq = cfg['nick_qq']
-        except:
-            self.nick_qq = ["ai", "!", "！"]
-        nick_qq = self.nick_qq
-        if isinstance(nick_qq, str):
-            nick_qq = [nick_qq]
+        
+        self.context = global_object
 
         self.unique_session = cfg['uniqueSessionMode']
         self.pic_mode = cfg['qq_pic_mode']
@@ -132,8 +127,8 @@ class QQGOCQ(Platform):
                     if message.type.value == "GroupMessage":
                         if str(i.qq) == str(message.self_id):
                             resp = True
-                elif isinstance(i, Plain):
-                    for nick in self.nick_qq:
+                elif isinstance(i, Plain) and self.context.nick:
+                    for nick in self.context.nick:
                         if nick != '' and i.text.strip().startswith(nick):
                             resp = True
                             break

model/provider/openai_official.py

@@ -415,7 +415,7 @@ class ProviderOpenAIOfficial(Provider):
 
         return False
     
-    async def image_generate(self, prompt, session_id, **kwargs) -> str:
+    async def image_generate(self, prompt: str, session_id: str = None, **kwargs) -> str:
         '''
         生成图片
         '''