Merge branch 'v3'

Author: rusq

buttons.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	tb "gopkg.in/tucnak/telebot.v2"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 type buttons struct {
@@ -20,8 +20,7 @@ func (b *buttons) SetMaxButtons(n int) {
 
 type PostButtons struct {
 	*buttons
-	b    Boter
-	cbFn func(cb *tb.Callback)
+	cbFn tb.HandlerFunc
 }
 
 type PBOption func(*PostButtons)
@@ -35,9 +34,8 @@ func PBOptMaxButtons(n int) PBOption {
 // NewPostButtons creates an instance of PostButtons.  The callbackFunction is
 // the function that will be assigned and called for each button press, so it
 // should handle all possible values.
-func NewPostButtons(b Boter, callbackFn func(cb *tb.Callback), opts ...PBOption) *PostButtons {
+func NewPostButtons(callbackFn func(c tb.Context) error, opts ...PBOption) *PostButtons {
 	pb := &PostButtons{
-		b:       b,
 		cbFn:    callbackFn,
 		buttons: &buttons{maxButtons: defNumButtons},
 	}
@@ -48,11 +46,11 @@ func NewPostButtons(b Boter, callbackFn func(cb *tb.Callback), opts ...PBOption)
 }
 
 // Markup returns the markup with buttons labeled with labels.
-func (pb *PostButtons) Markup(labels []string, pattern ...uint) (*tb.ReplyMarkup, error) {
+func (pb *PostButtons) Markup(c tb.Context, labels []string, pattern ...uint) (*tb.ReplyMarkup, error) {
 	if len(pattern) == 0 {
-		return ButtonMarkup(pb.b, labels, pb.maxButtons, pb.cbFn), nil
+		return ButtonMarkup(c, labels, pb.maxButtons, pb.cbFn), nil
 	}
-	markup, err := ButtonPatternMarkup(pb.b, labels, pattern, pb.cbFn)
+	markup, err := ButtonPatternMarkup(c, labels, pattern, pb.cbFn)
 	if err != nil {
 		panic(err)
 	}
@@ -62,17 +60,17 @@ func (pb *PostButtons) Markup(labels []string, pattern ...uint) (*tb.ReplyMarkup
 // ButtonMarkup returns the button markup for the message.  It creates handlers
 // for all the buttons assigning the cbFn callback function to each of them.
 // Values must be unique.  maxRowButtons is maximum number of buttons in a row.
-func ButtonMarkup(b Boter, values []string, maxRowButtons int, cbFn func(*tb.Callback)) *tb.ReplyMarkup {
+func ButtonMarkup(c tb.Context, values []string, maxRowButtons int, cbFn func(c tb.Context) error) *tb.ReplyMarkup {
 	if maxRowButtons <= 0 || defNumButtons < maxRowButtons {
 		maxRowButtons = defNumButtons
 	}
-	markup, btns := createButtons(b, values, cbFn)
+	markup, btns := createButtons(c, values, cbFn)
 	markup.Inline(organizeButtons(btns, maxRowButtons)...)
 	return markup
 }
 
-func ButtonPatternMarkup(b Boter, values []string, pattern []uint, cbFn func(*tb.Callback)) (*tb.ReplyMarkup, error) {
-	markup, btns := createButtons(b, values, cbFn)
+func ButtonPatternMarkup(c tb.Context, values []string, pattern []uint, cbFn func(c tb.Context) error) (*tb.ReplyMarkup, error) {
+	markup, btns := createButtons(c, values, cbFn)
 	rows, err := organizeButtonsPattern(btns, pattern)
 	if err != nil {
 		return nil, err
@@ -81,13 +79,13 @@ func ButtonPatternMarkup(b Boter, values []string, pattern []uint, cbFn func(*tb
 	return markup, nil
 }
 
-func createButtons(b Boter, values []string, cbFn func(*tb.Callback)) (*tb.ReplyMarkup, []tb.Btn) {
+func createButtons(c tb.Context, values []string, cbFn func(c tb.Context) error) (*tb.ReplyMarkup, []tb.Btn) {
 	markup := new(tb.ReplyMarkup)
 	var btns []tb.Btn
 	for _, label := range values {
 		btn := markup.Data(label, hash(label), label)
 		btns = append(btns, btn)
-		b.Handle(&btn, cbFn)
+		c.Bot().Handle(&btn, cbFn)
 	}
 	return markup, btns
 }

buttons_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	tb "gopkg.in/tucnak/telebot.v2"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 func Test_organizeButtons(t *testing.T) {

examples/input/main.go

@@ -8,15 +8,15 @@ import (
 	"time"
 
 	"github.com/joho/godotenv"
-	"github.com/rusq/tbcomctl"
-	tb "gopkg.in/tucnak/telebot.v2"
+	"github.com/rusq/tbcomctl/v3"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 var _ = godotenv.Load()
 
 var (
 	token = os.Getenv("TOKEN")
-	chat  = os.Getenv("CHAT")
+	// chat  = os.Getenv("CHAT")
 )
 
 func main() {
@@ -28,25 +28,26 @@ func main() {
 		log.Fatal(err)
 	}
 
-	nameIp := tbcomctl.NewInputText(b, "name", "Input your name:", processInput(b))
-	ageIp := tbcomctl.NewInputText(b, "age", "Input your age", processInput(b))
+	nameIp := tbcomctl.NewInputText("name", "Input your name:", processInput(b))
+	ageIp := tbcomctl.NewInputText("age", "Input your age", processInput(b))
 
 	handler := tbcomctl.NewControllerChain(nameIp, ageIp)
 	form := tbcomctl.NewForm(nameIp, ageIp)
 
 	b.Handle("/input", handler)
 	b.Handle("/form", form.Handler)
 	// b.Handle(tb.OnText, tbcomctl.NewMiddlewareChain(onText, nameIp.OnTextMw, ageIp.OnTextMw))
-	b.Handle(tb.OnText, form.OnTextMiddleware(func(m *tb.Message) {
-		log.Printf("onText is called: %q\nuser data: %v", m.Text, form.Data(m.Sender))
+	b.Handle(tb.OnText, form.OnTextMiddleware(func(c tb.Context) error {
+		log.Printf("onText is called: %q\nuser data: %v", c.Message().Text, form.Data(c.Sender()))
+		return nil
 	}))
 
 	b.Start()
 }
 
-func processInput(b *tb.Bot) func(context.Context, *tb.Message) error {
-	return func(ctx context.Context, m *tb.Message) error {
-		val := m.Text
+func processInput(b *tb.Bot) func(ctx context.Context, c tb.Context) error {
+	return func(ctx context.Context, c tb.Context) error {
+		val := c.Message().Text
 		log.Println("msgCb function is called, input value:", val)
 		switch val {
 		case "error":
@@ -55,7 +56,7 @@ func processInput(b *tb.Bot) func(context.Context, *tb.Message) error {
 			return tbcomctl.NewInputError("wrong input")
 		}
 		if ctrl, ok := tbcomctl.ControllerFromCtx(ctx); ok {
-			log.Println("form values so far: ", ctrl.Form().Data(m.Sender))
+			log.Println("form values so far: ", ctrl.Form().Data(c.Sender()))
 		}
 		return nil
 	}

examples/picklist/main.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/joho/godotenv"
-	"github.com/rusq/tbcomctl"
-	tb "gopkg.in/tucnak/telebot.v2"
+	"github.com/rusq/tbcomctl/v3"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 var _ = godotenv.Load()
@@ -28,31 +28,30 @@ func main() {
 		log.Fatal(err)
 	}
 	p1 := tbcomctl.NewPicklistText(
-		b,
 		"1",
 		"first picklist",
 		[]string{"1", "2", "3", "4"},
-		func(ctx context.Context, cb *tb.Callback) error {
-			fmt.Println(tbcomctl.Sdump(cb))
+		func(ctx context.Context, c tb.Context) error {
+			fmt.Println(tbcomctl.Sdump(c.Callback()))
 			return nil
 		},
 	)
 	p2 := tbcomctl.NewPicklistText(
-		b,
 		"2",
 		"second picklist",
 		[]string{"5", "6", "7", "8"},
-		func(ctx context.Context, cb *tb.Callback) error {
-			fmt.Println(tbcomctl.Sdump(cb))
+		func(ctx context.Context, c tb.Context) error {
+			fmt.Println(tbcomctl.Sdump(c.Callback()))
 			return nil
 		},
 		tbcomctl.PickOptBtnPattern([]uint{1, 2, 1}),
 	)
-	m := tbcomctl.NewMessageText(b, "msg", "all ok")
+	m := tbcomctl.NewMessageText("msg", "all ok")
 	form := tbcomctl.NewForm(p1, p2, m).
 		SetOverwrite(true).
 		SetRemoveButtons(true)
 	b.Handle("/picklist", form.Handler)
 
+	log.Println("ready, send /picklist")
 	b.Start()
 }

examples/rating/main.go

@@ -3,11 +3,12 @@ package main
 import (
 	"log"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/joho/godotenv"
-	"github.com/rusq/tbcomctl"
-	tb "gopkg.in/tucnak/telebot.v2"
+	"github.com/rusq/tbcomctl/v3"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 var _ = godotenv.Load()
@@ -29,7 +30,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	rb := tbcomctl.NewRating(b,
+	rb := tbcomctl.NewRating(
 		func(e tb.Editable, r *tb.User, idx int) ([2]tbcomctl.Button, error) {
 			mid, cid := e.MessageSig()
 			log.Printf("%s, %d: u: %s, idx %d", mid, cid, r.Recipient(), idx)
@@ -41,12 +42,17 @@ func main() {
 		tbcomctl.RBOptShowVoteCounter(true),
 	)
 
+	iChat, err := strconv.ParseInt(chat, 10, 64)
+	if err != nil {
+		log.Fatal(err)
+	}
+
 	go func() {
-		ch, err := b.ChatByID(chat)
+		ch, err := b.ChatByID(iChat)
 		if err != nil {
 			log.Fatal(err)
 		}
-		if _, err := b.Send(ch, "rating test", rb.Markup(ratingButtons())); err != nil {
+		if _, err := b.Send(ch, "rating test", rb.Markup(b, ratingButtons())); err != nil {
 			log.Fatal(err)
 		}
 	}()

examples/subcheck/main.go

@@ -6,15 +6,16 @@ import (
 	"time"
 
 	"github.com/joho/godotenv"
-	"github.com/rusq/tbcomctl"
-	tb "gopkg.in/tucnak/telebot.v2"
+	"github.com/rusq/osenv"
+	"github.com/rusq/tbcomctl/v3"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 var _ = godotenv.Load()
 
 var (
 	token = os.Getenv("TOKEN")
-	chat  = os.Getenv("CHAT")
+	chat  = osenv.Int64("CHAT", 0)
 )
 
 func main() {
@@ -27,7 +28,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	sc := tbcomctl.NewSubChecker(b, "sc", tbcomctl.TextFn("test sub"), []string{chat})
+	sc := tbcomctl.NewSubChecker("sc", tbcomctl.TextFn("test sub"), []int64{chat})
 
 	b.Handle("/subcheck", sc.Handler)
 

examples/template/main.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/joho/godotenv"
-	tb "gopkg.in/tucnak/telebot.v2"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 var _ = godotenv.Load()

form.go

@@ -1,7 +1,7 @@
 package tbcomctl
 
 import (
-	tb "gopkg.in/tucnak/telebot.v2"
+	tb "gopkg.in/tucnak/telebot.v3"
 )
 
 type Form struct {
@@ -59,8 +59,8 @@ func (fm *Form) SetRemoveButtons(b bool) *Form {
 	return fm
 }
 
-func (fm *Form) Handler(m *tb.Message) {
-	fm.ctrls[0].Handler(m)
+func (fm *Form) Handler(c tb.Context) error {
+	return fm.ctrls[0].Handler(c)
 }
 
 // Controller returns the Form Controller by it's name.
@@ -70,11 +70,11 @@ func (fm *Form) Controller(name string) (Controller, bool) {
 }
 
 type onTexter interface {
-	OnTextMw(fn func(m *tb.Message)) func(*tb.Message)
+	OnTextMw(fn tb.HandlerFunc) tb.HandlerFunc
 }
 
 // OnTextMiddleware returns the middleware for OnText handler.
-func (fm *Form) OnTextMiddleware(onText func(m *tb.Message)) func(m *tb.Message) {
+func (fm *Form) OnTextMiddleware(onText tb.HandlerFunc) tb.HandlerFunc {
 	var mwfn []MiddlewareFunc
 	for _, ctrl := range fm.ctrls {
 		otmw, ok := ctrl.(onTexter) // if the control satisfies onTexter, it contains middleware function
@@ -86,7 +86,7 @@ func (fm *Form) OnTextMiddleware(onText func(m *tb.Message)) func(m *tb.Message)
 	return middlewareChain(onText, mwfn...)
 }
 
-func middlewareChain(final func(m *tb.Message), mw ...MiddlewareFunc) func(m *tb.Message) {
+func middlewareChain(final tb.HandlerFunc, mw ...MiddlewareFunc) tb.HandlerFunc {
 	var handler = final
 	for i := len(mw) - 1; i >= 0; i-- {
 		handler = mw[i](handler)

go.mod

@@ -1,12 +1,14 @@
-module github.com/rusq/tbcomctl
+module github.com/rusq/tbcomctl/v3
 
 go 1.15
 
 require (
-	github.com/google/uuid v1.2.0
-	github.com/joho/godotenv v1.3.0
-	github.com/rusq/dlog v1.3.0
+	github.com/google/uuid v1.3.0
+	github.com/joho/godotenv v1.4.0
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rusq/dlog v1.3.3
+	github.com/rusq/osenv v0.1.1
 	github.com/stretchr/testify v1.5.1
-	golang.org/x/text v0.3.5
-	gopkg.in/tucnak/telebot.v2 v2.3.5
+	golang.org/x/text v0.3.7
+	gopkg.in/tucnak/telebot.v3 v3.0.0-20210930165304-9a08d98f4ee7
 )