From 03c0bc0cab2e889a623efbf532d4916be9baeb38 Mon Sep 17 00:00:00 2001
From: cdle <798731886@qq.com>
Date: Thu, 21 Oct 2021 10:54:21 +0800
Subject: [PATCH] update

---
 core/function.go | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/core/function.go b/core/function.go
index 84a24a3..aa6992c 100644
--- a/core/function.go
+++ b/core/function.go
@@ -86,6 +86,25 @@ func AddCommand(prefix string, cmds []Function) {
 
 func handleMessage(sender Sender) {
 	defer sender.Finish()
+	recall := sillyGirl.Get("recall")
+	recalled := false
+	if recall != "" {
+		for _, v := range strings.Split(recall, "&") {
+			reg, err := regexp.Compile(v)
+			if err == nil {
+				if reg.FindString(sender.GetContent()) != "" {
+					if !sender.IsAdmin() {
+						sender.Delete()
+						recalled = true
+						break
+					}
+				}
+			}
+		}
+	}
+	if recalled == true {
+		return
+	}
 	defer func() {
 		logs.Info("%v ==> %v", sender.GetContent(), "finished")
 	}()
@@ -183,20 +202,6 @@ func handleMessage(sender Sender) {
 		return nil
 	})
 
-	recall := sillyGirl.Get("recall")
-	if recall != "" {
-		for _, v := range strings.Split(recall, "&") {
-			reg, err := regexp.Compile(v)
-			if err == nil {
-				if reg.FindString(sender.GetContent()) != "" {
-					if !sender.IsAdmin() {
-						sender.Delete()
-					}
-				}
-			}
-		}
-	}
-
 }
 
 func FetchCookieValue(ps ...string) string {