From ae0901004718d2737bfb9a3154f59f91e36998a3 Mon Sep 17 00:00:00 2001
From: 1-6 <a1-6@1-6deMacBook-Air.local>
Date: Wed, 19 Jul 2023 08:30:37 +0800
Subject: [PATCH] x

---
 core/adapter.go       | 7 ++++++-
 core/common/sender.go | 7 ++++---
 core/plugin_core.go   | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/adapter.go b/core/adapter.go
index 76e99af..b9f5b07 100644
--- a/core/adapter.go
+++ b/core/adapter.go
@@ -326,8 +326,10 @@ func (f *Factory) Push(msg map[string]string) map[string]string {
 		UserID: msg[USER_ID],
 		ChatID: msg[CHAT_ID],
 	}
+	if v, ok := msg[MESSAGE_ID]; ok {
+		fsps.MessageID = v
+	}
 	sender.SetFsps(fsps)
-
 	message_id, err := sender.Reply(msg[CONETNT], PUSH(""))
 	return map[string]string{
 		"message_id": message_id,
@@ -616,6 +618,9 @@ func (sender *CustomSender) GetChatName() string {
 	return sender.details.Chatname
 }
 func (sender *CustomSender) GetMessageID() string {
+	if sender.Fsps.MessageID != "" {
+		return sender.Fsps.MessageID
+	}
 	return sender.details.MessageID
 }
 func (sender *CustomSender) GetReplySenderUserID() int {
diff --git a/core/common/sender.go b/core/common/sender.go
index 4c4d22b..f79a739 100644
--- a/core/common/sender.go
+++ b/core/common/sender.go
@@ -55,7 +55,8 @@ type Sender interface {
 }
 
 type FakerSenderParams struct {
-	Content string
-	UserID  string
-	ChatID  string
+	Content   string
+	UserID    string
+	ChatID    string
+	MessageID string
 }
diff --git a/core/plugin_core.go b/core/plugin_core.go
index 3d0deb2..8fa9f96 100644
--- a/core/plugin_core.go
+++ b/core/plugin_core.go
@@ -169,7 +169,7 @@ func initPlugins() {
 						} else {
 							su.DeleteValue("rule")
 							su.DeleteValue("cron")
-							su.DeleteValue("admin")
+							// su.DeleteValue("admin")
 							su.DeleteValue("priority")
 							su.DeleteValue("platform")
 						}
@@ -177,7 +177,7 @@ func initPlugins() {
 						su.DeleteValue("rule")
 						su.DeleteValue("cron")
 						su.DeleteValue("web")
-						su.DeleteValue("admin")
+						// su.DeleteValue("admin")
 						su.DeleteValue("priority")
 						su.DeleteValue("platform")
 					}
@@ -185,7 +185,7 @@ func initPlugins() {
 					// su.DeleteValue("rule")
 					// su.DeleteValue("cron")
 					su.DeleteValue("web")
-					su.DeleteValue("admin")
+					// su.DeleteValue("admin")
 					su.DeleteValue("priority")
 					su.DeleteValue("platform")
 					su.DeleteValue("module")