fumiama/ReiBot
1
0
Fork 0
mirror of https://github.com/fumiama/ReiBot.git synced 2026-06-09 20:40:27 +08:00
Code Activity

fix: from.id

Browse Source
This commit is contained in:
源文雨
2022-07-07 16:16:54 +08:00
parent 4e50c08da3
commit a2b7157f73
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
event.go
View File

@@ -6,7 +6,6 @@ import (
base14 "github.com/fumiama/go-base16384" base14 "github.com/fumiama/go-base16384"
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"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/wdvxdr1123/ZeroBot/utils/helper" "github.com/wdvxdr1123/ZeroBot/utils/helper"
) )
@@ -78,7 +77,7 @@ func match(ctx *Ctx, matchers []*Matcher) {
} }
name := ctx.Caller.Self.String() name := ctx.Caller.Self.String()
if strings.HasPrefix(ctx.Message.Text, name) { if strings.HasPrefix(ctx.Message.Text, name) {
logrus.Debugln("[event] message before process:", ctx.Message.Text) log.Debugln("[event] message before process:", ctx.Message.Text)
if len(ctx.Message.Entities) > 0 { if len(ctx.Message.Entities) > 0 {
n := len(name) n := len(name)
c := 0 c := 0
@@ -114,7 +113,7 @@ func match(ctx *Ctx, matchers []*Matcher) {
} }
} }
ctx.Message.Text = ctx.Message.Text[len(name):] ctx.Message.Text = ctx.Message.Text[len(name):]
logrus.Debugln("[event] message after process:", ctx.Message.Text) log.Debugln("[event] message after process:", ctx.Message.Text)
return true return true
} }
u16txt, err := base14.UTF82UTF16BE(helper.StringToBytes(ctx.Message.Text)) u16txt, err := base14.UTF82UTF16BE(helper.StringToBytes(ctx.Message.Text))
@@ -131,7 +130,7 @@ func match(ctx *Ctx, matchers []*Matcher) {
continue continue
} }
if helper.BytesToString(n) == name { if helper.BytesToString(n) == name {
logrus.Debugln("[event] message before process:", ctx.Message.Text) log.Debugln("[event] message before process:", ctx.Message.Text)
n, err = base14.UTF16BE2UTF8(append(u16txt[:2*e.Offset], u16txt[b:]...)) n, err = base14.UTF16BE2UTF8(append(u16txt[:2*e.Offset], u16txt[b:]...))
if err != nil { if err != nil {
continue continue
@@ -181,7 +180,7 @@ func match(ctx *Ctx, matchers []*Matcher) {
} }
} }
} }
logrus.Debugln("[event] message after process:", ctx.Message.Text) log.Debugln("[event] message after process:", ctx.Message.Text)
return true return true
} }
} }

3
rule.go
View File

@@ -2,6 +2,7 @@ package rei
import ( import (
"fmt" "fmt"
"reflect"
"strconv" "strconv"
"strings" "strings"
"unsafe" "unsafe"
@@ -23,7 +24,7 @@ func newctrl(service string, o *ctrl.Options[*Ctx]) Rule {
if !ctx.Message.Chat.IsPrivate() { if !ctx.Message.Chat.IsPrivate() {
gid = ctx.Message.Chat.ID gid = ctx.Message.Chat.ID
} }
return c.Handler(uintptr(unsafe.Pointer(ctx)), gid, ctx.Message.From.ID) return c.Handler(uintptr(unsafe.Pointer(ctx)), gid, reflect.ValueOf(ctx.Value).FieldByName("From").FieldByName("ID").Int())
} }
} }