From a0d714334a822f43c7a1cd462774716e6d3233cd Mon Sep 17 00:00:00 2001
From: SengokuCola <1026294844@qq.com>
Date: Wed, 25 Jun 2025 21:56:35 +0800
Subject: [PATCH] =?UTF-8?q?better=EF=BC=9A=E5=BE=AE=E8=B0=83=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BBprompt=E7=9A=84=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chat/normal_chat/normal_chat.py                   |  2 +-
 .../{focus_chat => }/replyer/default_generator.py     |  0
 src/person_info/relationship_manager.py               | 11 ++++++++++-
 src/plugin_system/apis/generator_api.py               |  2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
 rename src/chat/{focus_chat => }/replyer/default_generator.py (100%)

diff --git a/src/chat/normal_chat/normal_chat.py b/src/chat/normal_chat/normal_chat.py
index ed5623a2e..0af1877fa 100644
--- a/src/chat/normal_chat/normal_chat.py
+++ b/src/chat/normal_chat/normal_chat.py
@@ -22,7 +22,7 @@ from src.chat.focus_chat.planners.action_manager import ActionManager
 from src.chat.normal_chat.normal_chat_planner import NormalChatPlanner
 from src.chat.normal_chat.normal_chat_action_modifier import NormalChatActionModifier
 from src.chat.normal_chat.normal_chat_expressor import NormalChatExpressor
-from src.chat.focus_chat.replyer.default_generator import DefaultReplyer
+from src.chat.replyer.default_generator import DefaultReplyer
 from src.person_info.person_info import PersonInfoManager
 from src.person_info.relationship_manager import get_relationship_manager
 from src.chat.utils.chat_message_builder import (
diff --git a/src/chat/focus_chat/replyer/default_generator.py b/src/chat/replyer/default_generator.py
similarity index 100%
rename from src/chat/focus_chat/replyer/default_generator.py
rename to src/chat/replyer/default_generator.py
diff --git a/src/person_info/relationship_manager.py b/src/person_info/relationship_manager.py
index e831060b9..58e782f45 100644
--- a/src/person_info/relationship_manager.py
+++ b/src/person_info/relationship_manager.py
@@ -124,10 +124,19 @@ class RelationshipManager:
         if not person_name or person_name == "none":
             return ""
         short_impression = await person_info_manager.get_value(person_id, "short_impression")
+        
 
+        
         nickname_str = await person_info_manager.get_value(person_id, "nickname")
         platform = await person_info_manager.get_value(person_id, "platform")
-        relation_prompt = f"'{person_name}' ，ta在{platform}上的昵称是{nickname_str}。"
+        
+        if person_name == nickname_str and not short_impression:
+            return ""        
+
+        if person_name == nickname_str:
+            relation_prompt = f"'{person_name}' :"
+        else:
+            relation_prompt = f"'{person_name}' ，ta在{platform}上的昵称是{nickname_str}。"
 
         if short_impression:
             relation_prompt += f"你对ta的印象是：{short_impression}。"
diff --git a/src/plugin_system/apis/generator_api.py b/src/plugin_system/apis/generator_api.py
index c91319d8b..8130d9b4f 100644
--- a/src/plugin_system/apis/generator_api.py
+++ b/src/plugin_system/apis/generator_api.py
@@ -10,7 +10,7 @@
 
 from typing import Tuple, Any, Dict, List
 from src.common.logger import get_logger
-from src.chat.focus_chat.replyer.default_generator import DefaultReplyer
+from src.chat.replyer.default_generator import DefaultReplyer
 from src.chat.message_receive.chat_stream import get_chat_manager
 
 logger = get_logger("generator_api")