fix: 表情包无法注册

Author: SengokuCola

dashboard/src/index.css

@@ -384,12 +384,8 @@
 :root[data-dashboard-style='future-retro'],
 :root[data-dashboard-style='future-retro'] body {
   background-color: var(--retro-paper);
-  background-image:
-    var(--retro-paper-texture),
-    radial-gradient(circle at 12% 18%, rgb(255 248 226 / 0.44) 0 14%, transparent 36%);
-  background-size:
-    180px 180px,
-    100% 100%;
+  background-image: var(--retro-paper-texture);
+  background-size: 180px 180px;
   color: var(--retro-ink);
   font-family: var(--typography-font-family-base);
 }
@@ -404,12 +400,8 @@
 
 :root[data-dashboard-style='future-retro'] [data-dashboard-shell='true'] {
   background-color: var(--retro-paper);
-  background-image:
-    var(--retro-paper-texture),
-    radial-gradient(circle at 12% 18%, rgb(255 248 226 / 0.44) 0 14%, transparent 36%);
-  background-size:
-    180px 180px,
-    100% 100%;
+  background-image: var(--retro-paper-texture);
+  background-size: 180px 180px;
   color: var(--retro-ink);
 }
 
@@ -459,12 +451,8 @@
 :root[data-dashboard-style='future-retro'] [data-dashboard-header='true'],
 :root[data-dashboard-style='future-retro'] [data-dashboard-sidebar='true'] {
   background-color: var(--retro-paper) !important;
-  background-image:
-    var(--retro-paper-texture),
-    radial-gradient(circle at 12% 18%, rgb(255 248 226 / 0.32) 0 14%, transparent 36%) !important;
-  background-size:
-    180px 180px,
-    100% 100% !important;
+  background-image: var(--retro-paper-texture) !important;
+  background-size: 180px 180px !important;
   border-color: var(--retro-line) !important;
   border-width: 0 var(--retro-stroke) 0 0 !important;
   box-shadow: none !important;

dashboard/src/lib/prompt-generator-api.ts

@@ -2,6 +2,25 @@ import { parseResponse } from '@/lib/api-helpers'
 import { fetchWithAuth } from '@/lib/fetch-with-auth'
 import type { ApiResponse } from '@/types/api'
 
+const PROMPT_GENERATOR_METHOD_NOT_ALLOWED_MESSAGE =
+  '生成失败：可能是模型不支持或前后端版本不匹配，请换用文本聊天模型，或刷新并重启 WebUI 后再试。'
+
+function normalizePromptGeneratorError<T>(result: ApiResponse<T>): ApiResponse<T> {
+  if (result.success) {
+    return result
+  }
+
+  const normalizedError = result.error.toLowerCase()
+  if (normalizedError.includes('method not allowed') || normalizedError.includes('405')) {
+    return {
+      success: false,
+      error: PROMPT_GENERATOR_METHOD_NOT_ALLOWED_MESSAGE,
+    }
+  }
+
+  return result
+}
+
 export interface PromptGeneratorChatPrompt {
   platform: string
   item_id: string
@@ -59,7 +78,7 @@ export async function generatePromptPersona(
     method: 'POST',
     body: JSON.stringify(payload),
   })
-  return parseResponse<PromptGeneratorResponse>(response)
+  return normalizePromptGeneratorError(await parseResponse<PromptGeneratorResponse>(response))
 }
 
 export interface PromptGeneratorApplyResponse {

src/emoji_system/emoji_manager.py

@@ -490,24 +490,37 @@ def load_emojis_from_db(self) -> None:
                 statement = select(Images)
                 results = session.exec(statement).all()
                 self.emojis = []
+                removed_record_count = 0
                 for record in results:
                     if record.image_type != ImageType.EMOJI:
                         continue
                     if not record.is_registered:
                         continue
-                    if record.no_file_flag:
-                        continue
                     if record.is_banned:
                         continue
                     try:
+                        if record.no_file_flag or _resolve_existing_emoji_path(record.full_path) is None:
+                            logger.warning(
+                                f"[数据库] 已注册表情包缺少实际文件，删除破损注册记录: "
+                                f"id={record.id}, path={record.full_path}"
+                            )
+                            session.delete(record)
+                            removed_record_count += 1
+                            continue
                         emoji = MaiEmoji.from_db_instance(record)
                         self.emojis.append(emoji)
                     except Exception as e:
                         logger.error(
-                            f"[数据库] 加载表情包记录时出错: {e}\n记录ID: {record.id}, 路径: {record.full_path}"
+                            f"[数据库] 加载表情包记录时出错，将删除异常记录: {e}\n"
+                            f"记录ID: {record.id}, 路径: {record.full_path}"
                         )
+                        session.delete(record)
+                        removed_record_count += 1
                 self._emoji_num = len(self.emojis)
-                logger.info(f"[数据库] 成功加载 {self._emoji_num} 个已注册表情包")
+                logger.info(
+                    f"[数据库] 成功加载 {self._emoji_num} 个已注册表情包，"
+                    f"清理破损注册记录 {removed_record_count} 条"
+                )
         except Exception as e:
             logger.critical(f"[数据库] 加载表情包记录时发生不可恢复错误: {e}")
             self.emojis = []
@@ -1069,6 +1082,8 @@ async def periodic_emoji_maintenance(self) -> None:
                 with get_db_session() as session:
                     statement = select(Images).filter_by(image_type=ImageType.EMOJI)
                     for record in session.exec(statement).all():
+                        if not record.is_registered and not record.is_banned:
+                            continue
                         if record_path := _resolve_existing_emoji_path(record.full_path):
                             known_paths.add(record_path)
                 logger.info("[emoji_maintenance] Scanning data/emoji for new emojis...")

tests/test_emoji_maintenance.py

@@ -1,10 +1,10 @@
 from pathlib import Path
+from types import SimpleNamespace
 from typing import Any
 
 import asyncio
-import sys
-
 import pytest
+import sys
 
 sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
 
@@ -37,38 +37,92 @@ def delete(self, record: Any) -> None:
         self.deleted.append(record)
 
 
-def test_integrity_preserves_unknown_files_and_removes_known_orphans(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+def _build_emoji_record(
+    record_id: int,
+    full_path: Path | str,
+    *,
+    image_hash: str = "emoji_hash",
+    is_registered: bool = True,
+    is_banned: bool = False,
+    no_file_flag: bool = False,
+) -> SimpleNamespace:
+    return SimpleNamespace(
+        id=record_id,
+        image_type=emoji_module.ImageType.EMOJI,
+        image_hash=image_hash,
+        description="开心",
+        full_path=str(full_path),
+        query_count=0,
+        is_registered=is_registered,
+        is_banned=is_banned,
+        no_file_flag=no_file_flag,
+        register_time=None,
+        last_used_time=None,
+    )
+
+
+def test_load_removes_registered_records_when_file_missing(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    available_file = tmp_path / "available.png"
+    missing_file = tmp_path / "missing.png"
+    available_file.write_bytes(b"available")
+
+    available_record = _build_emoji_record(1, available_file, image_hash="available_hash")
+    missing_record = _build_emoji_record(2, missing_file, image_hash="missing_hash")
+    session = _Session(records=[available_record, missing_record])
+    monkeypatch.setattr(emoji_module, "get_db_session", lambda: session)
+
+    manager = emoji_module.EmojiManager()
+    try:
+        manager.load_emojis_from_db()
+
+        assert [emoji.file_hash for emoji in manager.emojis] == ["available_hash"]
+        assert manager._emoji_num == 1
+        assert session.deleted == [missing_record]
+    finally:
+        manager.shutdown()
+
+
+def test_integrity_preserves_unknown_files_and_removes_missing_registered_records(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: Path,
+) -> None:
     monkeypatch.setattr(emoji_module, "EMOJI_DIR", tmp_path)
     new_file = tmp_path / "new.png"
-    known_orphan = tmp_path / "known.png"
+    missing_file = tmp_path / "missing.png"
     new_file.write_bytes(b"new")
-    known_orphan.write_bytes(b"known")
 
-    session = _Session(records=[])
+    missing_record = _build_emoji_record(1, missing_file, image_hash="missing_hash")
+    session = _Session(records=[missing_record])
     monkeypatch.setattr(emoji_module, "get_db_session", lambda: session)
 
     manager = emoji_module.EmojiManager()
     try:
-        manager._known_emoji_file_paths = {known_orphan.absolute().resolve()}
-
         manager.check_emoji_file_integrity()
 
         assert new_file.exists()
-        assert not known_orphan.exists()
+        assert session.deleted == [missing_record]
+        assert manager.emojis == []
     finally:
         manager.shutdown()
 
 
 @pytest.mark.asyncio
-async def test_periodic_maintenance_scans_unknown_files_before_integrity(
+async def test_periodic_maintenance_scans_unregistered_records_before_integrity(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: Path,
 ) -> None:
     monkeypatch.setattr(emoji_module, "EMOJI_DIR", tmp_path)
-    known_file = tmp_path / "known.png"
-    new_file = tmp_path / "new.png"
-    known_file.write_bytes(b"known")
-    new_file.write_bytes(b"new")
+    registered_file = tmp_path / "registered.png"
+    unregistered_file = tmp_path / "unregistered.png"
+    registered_file.write_bytes(b"registered")
+    unregistered_file.write_bytes(b"unregistered")
+    session = _Session(
+        records=[
+            _build_emoji_record(1, registered_file, image_hash="registered_hash"),
+            _build_emoji_record(2, unregistered_file, image_hash="unregistered_hash", is_registered=False),
+        ]
+    )
+    monkeypatch.setattr(emoji_module, "get_db_session", lambda: session)
 
     monkeypatch.setattr(emoji_module.global_config.emoji, "steal_emoji", True)
     monkeypatch.setattr(emoji_module.global_config.emoji, "check_interval", 0)
@@ -79,7 +133,6 @@ async def test_periodic_maintenance_scans_unknown_files_before_integrity(
     first_check = asyncio.Event()
 
     manager = emoji_module.EmojiManager()
-    manager._known_emoji_file_paths = {known_file.absolute().resolve()}
 
     async def _register_emoji_by_filename(path: Path | str) -> emoji_module.EmojiRegisterStatus:
         emoji_path = Path(path)
@@ -105,6 +158,6 @@ def _check_emoji_file_integrity() -> None:
             await task
         manager.shutdown()
 
-    assert events[0] == ("scan", "new.png")
+    assert events[0] == ("scan", "unregistered.png")
     assert events[1] == ("check", "")
-    assert ("scan", "known.png") not in events
+    assert ("scan", "registered.png") not in events