feat:表达方式可简化

This commit is contained in:
SengokuCola
2026-04-21 11:17:40 +08:00
parent ec7c437bc4
commit 54d3f156d4
6 changed files with 11 additions and 191 deletions

View File

@@ -41,13 +41,6 @@ class MaisakaExpressionSelector:
logger.error(f"检查表达方式使用开关失败: {exc}")
return False
def _can_use_advanced_chosen(self, session_id: str) -> bool:
try:
return ExpressionConfigUtils.get_expression_advanced_chosen_for_chat(session_id)
except Exception as exc:
logger.error(f"检查表达方式二次选择开关失败: {exc}")
return False
@staticmethod
def _is_global_expression_group_marker(platform: str, item_id: str) -> bool:
return platform == "*" and item_id == "*"
@@ -287,7 +280,7 @@ class MaisakaExpressionSelector:
logger.info(f"表达方式选择已跳过本地候选不足session_id={session_id}")
return MaisakaExpressionSelectionResult()
if not self._can_use_advanced_chosen(session_id):
if not global_config.expression.advanced_chosen:
return self._build_direct_selection_result(
session_id=session_id,
candidates=candidates,

View File

@@ -35,14 +35,6 @@ class TempMethodsExpression:
return None
@staticmethod
def get_expression_advanced_chosen_for_chat(chat_stream_id: Optional[str] = None) -> bool:
"""根据聊天流 ID 获取表达方式是否启用二次选择。"""
config_item = TempMethodsExpression._find_expression_config_item(chat_stream_id)
if config_item is None:
return False
return config_item.advanced_chosen
@staticmethod
def get_expression_config_for_chat(chat_stream_id: Optional[str] = None) -> tuple[bool, bool, bool]:
"""