extend regex to callbackquery

README.md

@@ -59,11 +59,11 @@ func main() {
 package main
 
 import (
-	"log"
 	"strings"
 
 	rei "github.com/fumiama/ReiBot"
 	tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	log "github.com/sirupsen/logrus"
 )
 
 func main() {
@@ -86,7 +86,7 @@ func main() {
 				}
 				_, err := bot.Send(tgba.NewMessage(msg.Chat.ID, msg.Text[len("测试"):]))
 				if err != nil {
-					log.Println("[ERRO]", err)
+					log.Errorln(err)
 				}
 			},
 			OnEditedMessage: func(updateid int, bot *rei.TelegramClient, msg *tgba.Message) {
@@ -98,7 +98,7 @@ func main() {
 				}
 				_, err := bot.Send(tgba.NewMessage(msg.Chat.ID, "已编辑："+msg.Text[len("测试"):]))
 				if err != nil {
-					log.Println("[ERRO]", err)
+					log.Errorln(err)
 				}
 			},
 		},

client.go

@@ -1,7 +1,6 @@
 package rei
 
 import (
-	"log"
 	"reflect"
 	"sync"
 	"time"
@@ -9,7 +8,7 @@ import (
 
 	"github.com/RomiChan/syncx"
 	tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 // TelegramClient ...
@@ -25,7 +24,7 @@ var (
 
 func init() {
 	logsetter.Do(func() {
-		_ = tgba.SetLogger(logrus.StandardLogger())
+		_ = tgba.SetLogger(log.StandardLogger())
 	})
 }
 
@@ -42,7 +41,7 @@ func NewTelegramClient(c *Bot) (tc TelegramClient) {
 				continue
 			}
 			tp := t.Field(i).Name[2:]
-			log.Println("[INFO] register handler", tp)
+			log.Println("register handler", tp)
 			handler := f.Interface()
 			tc.b.handlers[tp] = *(*GeneralHandleType)(unsafe.Add(unsafe.Pointer(&handler), unsafe.Sizeof(uintptr(0))))
 		}
@@ -52,11 +51,11 @@ func NewTelegramClient(c *Bot) (tc TelegramClient) {
 
 // Connect ...
 func (tc *TelegramClient) Connect() {
-	log.Println("[INFO] 开始尝试连接到Telegram服务器, token:", tc.b.Token)
+	log.Println("开始尝试连接到Telegram服务器, token:", tc.b.Token)
 	for {
 		ba, err := tgba.NewBotAPI(tc.b.Token)
 		if err != nil {
-			log.Println("[WARN] 连接到Telegram服务器时出现错误:", err, ", token:", tc.b.Token)
+			log.Warnln("连接到Telegram服务器时出现错误:", err, ", token:", tc.b.Token)
 			time.Sleep(2 * time.Second) // 等待两秒后重新连接
 			continue
 		}
@@ -66,18 +65,18 @@ func (tc *TelegramClient) Connect() {
 		break
 	}
 	clients.Store(tc.Self.ID, tc)
-	log.Println("[INFO] 连接到Telegram服务器成功, token:", tc.b.Token)
+	log.Println("连接到Telegram服务器成功, token:", tc.b.Token)
 }
 
 // Listen 开始监听事件
 func (tc *TelegramClient) Listen() {
-	log.Println("[INFO] 开始监听", tc.Self.UserName, "的事件")
+	log.Println("开始监听", tc.Self.UserName, "的事件")
 	for {
 		updates := tc.GetUpdatesChan(tc.b.UpdateConfig)
 		for update := range updates {
 			tc.processEvent(update)
 		}
-		log.Println("[WARN] Telegram服务器连接断开...")
+		log.Warnln("Telegram服务器连接断开...")
 		clients.Delete(tc.Self.ID)
 		time.Sleep(time.Millisecond * time.Duration(3))
 		tc.Connect()

engine.go

@@ -226,7 +226,7 @@ func OnMessageRegex(regexPattern string, rules ...Rule) *Matcher {
 	return defaultEngine.OnMessageRegex(regexPattern, rules...)
 }
 
-// OnRegex 正则触发器
+// OnMessageRegex 正则触发器
 func (e *Engine) OnMessageRegex(regexPattern string, rules ...Rule) *Matcher {
 	matcher := &Matcher{
 		Type:   "Message",
@@ -364,3 +364,14 @@ func (e *Engine) OnMessageShell(command string, model interface{}, rules ...Rule
 	e.matchers = append(e.matchers, matcher)
 	return StoreMatcher(matcher)
 }
+
+// OnCallbackQueryRegex 正则触发器
+func (e *Engine) OnCallbackQueryRegex(regexPattern string, rules ...Rule) *Matcher {
+	matcher := &Matcher{
+		Type:   "CallbackQuery",
+		Rules:  append([]Rule{RegexRule(regexPattern)}, rules...),
+		Engine: e,
+	}
+	e.matchers = append(e.matchers, matcher)
+	return StoreMatcher(matcher)
+}

event.go

@@ -1,10 +1,10 @@
 package rei
 
 import (
-	"log"
 	"reflect"
 
 	tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	log "github.com/sirupsen/logrus"
 )
 
 // Event ...
@@ -33,7 +33,7 @@ func (tc *TelegramClient) processEvent(update tgba.Update) {
 				matcherLock.RUnlock()
 				continue
 			}
-			log.Println("[INFO] pass", tp, "event to plugins")
+			log.Println("pass", tp, "event to plugins")
 			matchers := make([]*Matcher, n)
 			copy(matchers, matcherMap[tp])
 			matcherLock.RUnlock()
@@ -46,8 +46,11 @@ func (tc *TelegramClient) processEvent(update tgba.Update) {
 				State:  State{},
 				Caller: tc,
 			}
-			if tp == "Message" {
+			switch tp {
+			case "Message":
 				ctx.Message = (*tgba.Message)(f.UnsafePointer())
+			case "CallbackQuery":
+				ctx.Message = (*tgba.CallbackQuery)(f.UnsafePointer()).Message
 			}
 			match(ctx, matchers)
 			continue
@@ -56,7 +59,7 @@ func (tc *TelegramClient) processEvent(update tgba.Update) {
 		if !ok {
 			continue
 		}
-		log.Println("[INFO] process", tp, "event")
+		log.Println("process", tp, "event")
 		go h(update.UpdateID, tc, f.UnsafePointer())
 	}
 }

example/handler/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"log"
 	"strings"
 
 	rei "github.com/fumiama/ReiBot"
 	tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	log "github.com/sirupsen/logrus"
 )
 
 func main() {
@@ -28,7 +28,7 @@ func main() {
 				}
 				_, err := bot.Send(tgba.NewMessage(msg.Chat.ID, msg.Text[len("测试"):]))
 				if err != nil {
-					log.Println("[ERRO]", err)
+					log.Errorln(err)
 				}
 			},
 			OnEditedMessage: func(updateid int, bot *rei.TelegramClient, msg *tgba.Message) {
@@ -40,7 +40,7 @@ func main() {
 				}
 				_, err := bot.Send(tgba.NewMessage(msg.Chat.ID, "已编辑："+msg.Text[len("测试"):]))
 				if err != nil {
-					log.Println("[ERRO]", err)
+					log.Errorln(err)
 				}
 			},
 		},

rules.go

@@ -100,15 +100,28 @@ func CommandRule(commands ...string) Rule {
 func RegexRule(regexPattern string) Rule {
 	regex := regexp.MustCompile(regexPattern)
 	return func(ctx *Ctx) bool {
-		msg, ok := ctx.Value.(*tgba.Message)
+		switch msg := ctx.Value.(type) {
-		if !ok || msg.Text == "" { // 确保无空
+		case *tgba.Message:
+			if msg.Text == "" { // 确保无空
+				return false
+			}
+			if matched := regex.FindStringSubmatch(msg.Text); matched != nil {
+				ctx.State["regex_matched"] = matched
+				return true
+			}
+			return false
+		case *tgba.CallbackQuery:
+			if msg.Data == "" {
+				return false
+			}
+			if matched := regex.FindStringSubmatch(msg.Data); matched != nil {
+				ctx.State["regex_matched"] = matched
+				return true
+			}
+			return false
+		default:
 			return false
 		}
-		if matched := regex.FindStringSubmatch(msg.Text); matched != nil {
-			ctx.State["regex_matched"] = matched
-			return true
-		}
-		return false
 	}
 }