fumiama/ReiBot
1
0
Fork 0
mirror of https://github.com/fumiama/ReiBot.git synced 2026-06-05 00:50:25 +08:00
Code Activity

add more log

Browse Source
This commit is contained in:
源文雨
2022-07-07 15:18:31 +08:00
parent 1645369ed3
commit 4e50c08da3
4 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
event.go
View File

@@ -37,7 +37,7 @@ func (tc *TelegramClient) processEvent(update tgba.Update) {
matcherLock.RUnlock() matcherLock.RUnlock()
continue continue
} }
log.Println("pass", tp, "event to plugins") log.Debugln("pass", tp, "event to plugins")
matchers := make([]*Matcher, n) matchers := make([]*Matcher, n)
copy(matchers, matcherMap[tp]) copy(matchers, matcherMap[tp])
matcherLock.RUnlock() matcherLock.RUnlock()
@@ -53,8 +53,10 @@ func (tc *TelegramClient) processEvent(update tgba.Update) {
switch tp { switch tp {
case "Message": case "Message":
ctx.Message = (*tgba.Message)(f.UnsafePointer()) ctx.Message = (*tgba.Message)(f.UnsafePointer())
log.Println("receive Message Text:", ctx.Message.Text)
case "CallbackQuery": case "CallbackQuery":
ctx.Message = (*tgba.CallbackQuery)(f.UnsafePointer()).Message ctx.Message = (*tgba.CallbackQuery)(f.UnsafePointer()).Message
log.Println("receive CallbackQuery Data:", (*tgba.CallbackQuery)(f.UnsafePointer()).Data)
} }
go match(ctx, matchers) go match(ctx, matchers)
continue continue

4
go.mod
View File

@@ -4,9 +4,9 @@ go 1.18
require ( require (
github.com/FloatTech/zbpctrl v1.4.1-0.20220706075314-7fdbbc2a2345 github.com/FloatTech/zbpctrl v1.4.1-0.20220706075314-7fdbbc2a2345
github.com/FloatTech/zbputils v1.4.1-0.20220706075514-0ba0bb2b8953 github.com/FloatTech/zbputils v1.4.1-0.20220706162215-fd9437e83a63
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c
github.com/fumiama/go-base16384 v1.5.3 github.com/fumiama/go-base16384 v1.5.4
github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
github.com/sirupsen/logrus v1.8.1 github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.1 github.com/stretchr/testify v1.7.1

13
go.sum
View File

@@ -1,12 +1,9 @@
github.com/FloatTech/sqlite v0.3.2 h1:iTg2ZKnzjjZAdlSN3hXmpCBn15odc4Ud484OoM3yXGA= github.com/FloatTech/sqlite v0.3.2 h1:iTg2ZKnzjjZAdlSN3hXmpCBn15odc4Ud484OoM3yXGA=
github.com/FloatTech/sqlite v0.3.2/go.mod h1:VFtLofV5qxw5eBneZRbWwD451SLSm50o9J3J43iB1iw= github.com/FloatTech/sqlite v0.3.2/go.mod h1:VFtLofV5qxw5eBneZRbWwD451SLSm50o9J3J43iB1iw=
github.com/FloatTech/zbpctrl v1.4.1-0.20220706065402-bff8398fa802 h1:hrQxxW3qfsqMK+02pShaIKHHv6Lsz/Che7VMyBWNBFY= github.com/FloatTech/zbpctrl v1.4.1-0.20220706075314-7fdbbc2a2345 h1:xH5RNhsObtWjnxsbT+hIEL++s6Li+jdX79aWM/y5DTc=
github.com/FloatTech/zbpctrl v1.4.1-0.20220706065402-bff8398fa802/go.mod h1:5FDkrlVaQCxUfeqH7XJPTfej0q+y9fzImhvZI4ofu9Y=
github.com/FloatTech/zbpctrl v1.4.1-0.20220706075314-7fdbbc2a2345/go.mod h1:5FDkrlVaQCxUfeqH7XJPTfej0q+y9fzImhvZI4ofu9Y= github.com/FloatTech/zbpctrl v1.4.1-0.20220706075314-7fdbbc2a2345/go.mod h1:5FDkrlVaQCxUfeqH7XJPTfej0q+y9fzImhvZI4ofu9Y=
github.com/FloatTech/zbputils v1.4.1-0.20220706065627-1b541c2dc28f h1:rdVNb3J9DxtuQP+Muyu1fSqsJwGmKJq7sildY1zfn9w= github.com/FloatTech/zbputils v1.4.1-0.20220706162215-fd9437e83a63 h1:9o68KisqiI3NPo19tsJqNmHiVpRwMjLEHsaiLFAuxz4=
github.com/FloatTech/zbputils v1.4.1-0.20220706065627-1b541c2dc28f/go.mod h1:F//acBR/aFg4DrcC8CPWJMA/4FS5P0HM5rKGm8ySFOA= github.com/FloatTech/zbputils v1.4.1-0.20220706162215-fd9437e83a63/go.mod h1:abmL/F2O2+14KQ1Ba9+aohAl9vgwcPP8Nij1m1t84x0=
github.com/FloatTech/zbputils v1.4.1-0.20220706075514-0ba0bb2b8953 h1:+mcUb2mBjt0r/ZqlY5I7k6eFsXDHe0+IfRx26MGXufY=
github.com/FloatTech/zbputils v1.4.1-0.20220706075514-0ba0bb2b8953/go.mod h1:fkyUT0CW9DOcCLTiV5oKIf7Mhxa7OlBp5qpYraqlkC0=
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=
github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE= github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -17,8 +14,8 @@ github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo= github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY= github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
github.com/fumiama/go-base16384 v1.5.3 h1:IUZUlm2ajJB1nEJzauP6yD5IeJoVHyBEkzKJf9O82zs= github.com/fumiama/go-base16384 v1.5.4 h1:UKx925X7cTsqsVWBlBLBs1v38epFT/q3AGjvyP5E0PM=
github.com/fumiama/go-base16384 v1.5.3/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM= github.com/fumiama/go-base16384 v1.5.4/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
github.com/fumiama/go-registry v0.1.6 h1:Ee/tXCCIR/xt8celhbbw0W/xDMdhAXLwy2YFBB/LWFk= github.com/fumiama/go-registry v0.1.6 h1:Ee/tXCCIR/xt8celhbbw0W/xDMdhAXLwy2YFBB/LWFk=
github.com/fumiama/go-registry v0.1.6/go.mod h1:dIUVbiOgfk9oZcsgwDvNLC72i+ctibVukSXR/9bLviI= github.com/fumiama/go-registry v0.1.6/go.mod h1:dIUVbiOgfk9oZcsgwDvNLC72i+ctibVukSXR/9bLviI=
github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ= github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=

8
rules.go
View File

@@ -7,6 +7,7 @@ import (
"time" "time"
tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5" tgba "github.com/go-telegram-bot-api/telegram-bot-api/v5"
"github.com/sirupsen/logrus"
) )
// PrefixRule check if the text message has the prefix and trim the prefix // PrefixRule check if the text message has the prefix and trim the prefix
@@ -103,23 +104,30 @@ func RegexRule(regexPattern string) Rule {
switch msg := ctx.Value.(type) { switch msg := ctx.Value.(type) {
case *tgba.Message: case *tgba.Message:
if msg.Text == "" { // 确保无空 if msg.Text == "" { // 确保无空
logrus.Debugln("RegexRule: null message text")
return false return false
} }
if matched := regex.FindStringSubmatch(msg.Text); matched != nil { if matched := regex.FindStringSubmatch(msg.Text); matched != nil {
ctx.State["regex_matched"] = matched ctx.State["regex_matched"] = matched
logrus.Debugln("RegexRule: match message text", matched)
return true return true
} }
logrus.Debugln("RegexRule: no match message")
return false return false
case *tgba.CallbackQuery: case *tgba.CallbackQuery:
if msg.Data == "" { if msg.Data == "" {
logrus.Debugln("RegexRule: null query data")
return false return false
} }
if matched := regex.FindStringSubmatch(msg.Data); matched != nil { if matched := regex.FindStringSubmatch(msg.Data); matched != nil {
ctx.State["regex_matched"] = matched ctx.State["regex_matched"] = matched
logrus.Debugln("RegexRule: match query data", matched)
return true return true
} }
logrus.Debugln("RegexRule: no match query data")
return false return false
default: default:
logrus.Debugln("RegexRule: stub type")
return false return false
} }
} }