core/tg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: fixed the infinite call loop in WidgetGo.Serve .

Browse source
This commit is contained in:
Andrey Parhomenko 2024-07-23 18:08:39 +05:00
parent 8b76e52e6f
commit 2d5acbd112
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/test/main.go
View file

@ -19,6 +19,10 @@ func ExtractSessionData(c tg.Context) *SessionData {
return c.SessionData().(*SessionData) return c.SessionData().(*SessionData)
} }
var BackWidget = tg.RenderFunc(func(c tg.Context) tg.UI{
return c.GoRet(tg.Back)
})
var beh = tg.NewBehaviour().SetInit(tg.Func(func(c tg.Context) { var beh = tg.NewBehaviour().SetInit(tg.Func(func(c tg.Context) {
// The session initialization. // The session initialization.
c.SetSessionData(&SessionData{}) c.SetSessionData(&SessionData{})

1
cmd/test/start.go
View file

@ -24,6 +24,7 @@ var StartWidget = tg.RenderFunc(func(c tg.Context) tg.UI {
tg.Messagef("Choose your interest").Reply( tg.Messagef("Choose your interest").Reply(
tg.NewKeyboard().List( tg.NewKeyboard().List(
tg.Buttonf("Back").Go(BackWidget),
tg.Buttonf("Inc/Dec").Go(IncDecWidget), tg.Buttonf("Inc/Dec").Go(IncDecWidget),
tg.Buttonf("Mutate messages").Go(MutateMessagesWidget), tg.Buttonf("Mutate messages").Go(MutateMessagesWidget),
tg.Buttonf("Send location").Go(LocationWidget), tg.Buttonf("Send location").Go(LocationWidget),

3
context.go
View file

@ -6,6 +6,7 @@ import (
"net/http" "net/http"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
//"path" //"path"
//"log"
) )
@ -316,7 +317,7 @@ func (c Context) Go(pth Widget) error {
var back bool var back bool
if pth == Back { if pth == Back {
if len(c.session.pathHistory) < 2 { if len(c.session.pathHistory) <= 1 {
return c.Go(nil) return c.Go(nil)
} }
pth = c.session.pathHistory[len(c.session.pathHistory)-2] pth = c.session.pathHistory[len(c.session.pathHistory)-2]

2
go.go
View file

@ -21,7 +21,7 @@ func (w WidgetGo) Act(c Context) {
// Implementing the Server interface. // Implementing the Server interface.
func (widget WidgetGo) Serve(c Context) { func (widget WidgetGo) Serve(c Context) {
c.input.Close() c.input.Close()
c.Go(widget) c.WithArg(widget.Path).Go(widget.Path)
} }
func (widget WidgetGo) Render(c Context) UI { func (widget WidgetGo) Render(c Context) UI {