From b1e7772c8331614953ea2e4a77c9261a6cf8134c Mon Sep 17 00:00:00 2001
From: ninemine <1371605831@qq.com>
Date: Thu, 13 Nov 2025 14:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=9B=9E=E5=A4=8D=E6=97=B6?=
=?UTF-8?q?=E7=8E=B0=E5=9C=A8=E4=BD=BF=E7=94=A8=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.tasks/2025-11-12_2_alchemy_material_check.md | 9 ++++++++-
Plugins/WPSAPI.py | 9 +++++++--
Plugins/WPSConfigSystem.py | 3 ++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/.tasks/2025-11-12_2_alchemy_material_check.md b/.tasks/2025-11-12_2_alchemy_material_check.md
index be60d44..f602831 100644
--- a/.tasks/2025-11-12_2_alchemy_material_check.md
+++ b/.tasks/2025-11-12_2_alchemy_material_check.md
@@ -33,7 +33,14 @@ NewWPSBot 炼金系统。
- 更改:聚合材料数量后统一校验并扣减库存
- 原因:避免重复材料扣除时出现部分扣减和异常
- 阻碍因素:无
-- 状态:未确认
+- 状态:成功
+
+2025-11-12_17:46:36
+- 已修改:无
+- 更改:收到用户确认执行成功
+- 原因:流程确认
+- 阻碍因素:无
+- 状态:成功
# 最终审查
(待补充)
diff --git a/Plugins/WPSAPI.py b/Plugins/WPSAPI.py
index 33c8ee8..2e18a56 100644
--- a/Plugins/WPSAPI.py
+++ b/Plugins/WPSAPI.py
@@ -736,6 +736,8 @@ class MessageSender:
class BasicWPSInterface(PluginInterface):
+ user_id_to_username: Optional[Callable[[int], str]] = None
+
@override
def is_enable_plugin(self) -> bool:
return False
@@ -783,10 +785,13 @@ class BasicWPSInterface(PluginInterface):
if webhook_url == "" or webhook_url == None:
return None
- result = await self.get_message_sender_function(webhook_url, self.get_message_sender_type())(f"""
+ username: str = self.user_id_to_username(user_id) if self.user_id_to_username else ""
+ send_message = f"""## {username}
---
{message}
-""")
+"""
+
+ result = await self.get_message_sender_function(webhook_url, self.get_message_sender_type())(send_message)
if get_internal_verbose():
logger.Log("Info", f"Webhook URL: {webhook_url}, Message: {LimitStringLength(message)}, Result: {result}")
return None
diff --git a/Plugins/WPSConfigSystem.py b/Plugins/WPSConfigSystem.py
index bae4b63..1bb1627 100644
--- a/Plugins/WPSConfigSystem.py
+++ b/Plugins/WPSConfigSystem.py
@@ -7,7 +7,7 @@ from datetime import datetime
from PWF.CoreModules.plugin_interface import DatabaseModel, get_db
-from .WPSAPI import WPSAPI
+from .WPSAPI import *
logger = ProjectConfig()
CHECKIN_POINTS = logger.FindItem("checkin_points", 100)
@@ -74,6 +74,7 @@ class WPSConfigAPI(WPSAPI):
logger.Log("Info", f"{ConsoleFrontColor.GREEN}WPSConfigAPI 插件已加载{ConsoleFrontColor.RESET}")
self.register_plugin("config")
self.register_plugin("cfg")
+ BasicWPSInterface.user_id_to_username = self.get_user_name
async def do_callback(self, message: str, chat_id: int, user_id: int) -> Optional[str]:
tokens = [token.strip() for token in message.strip().split() if token.strip()]