Add new filters for handling payment-related updates

ext/context.go

@@ -64,6 +64,9 @@ func NewContext(update *gotgbot.Update, data map[string]interface{}) *Context {
 	case update.InlineQuery != nil:
 		user = &update.InlineQuery.From
 
+	case update.ChosenInlineResult != nil:
+		user = &update.ChosenInlineResult.From
+
 	case update.CallbackQuery != nil:
 		user = &update.CallbackQuery.From
 
@@ -74,15 +77,16 @@ func NewContext(update *gotgbot.Update, data map[string]interface{}) *Context {
 			sender = &gotgbot.Sender{User: user, ChatId: chat.Id}
 		}
 
-	case update.ChosenInlineResult != nil:
-		user = &update.ChosenInlineResult.From
-
 	case update.ShippingQuery != nil:
 		user = &update.ShippingQuery.From
 
 	case update.PreCheckoutQuery != nil:
 		user = &update.PreCheckoutQuery.From
 
+	case update.PollAnswer != nil:
+		user = update.PollAnswer.User
+		sender = &gotgbot.Sender{User: update.PollAnswer.User, Chat: update.PollAnswer.VoterChat}
+
 	case update.MyChatMember != nil:
 		user = &update.MyChatMember.From
 		chat = &update.MyChatMember.Chat

ext/handlers/filters/precheckoutquery/precheckoutquery.go

@@ -0,0 +1,24 @@
+package shippingquery
+
+import (
+	"strings"
+
+	"github.com/PaulSonOfLars/gotgbot/v2"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext/handlers/filters"
+)
+
+func All(_ *gotgbot.PreCheckoutQuery) bool {
+	return true
+}
+
+func FromUserID(id int64) filters.PreCheckoutQuery {
+	return func(p *gotgbot.PreCheckoutQuery) bool {
+		return p.From.Id == id
+	}
+}
+
+func HasPayloadPrefix(pre string) filters.PreCheckoutQuery {
+	return func(p *gotgbot.PreCheckoutQuery) bool {
+		return strings.HasPrefix(p.InvoicePayload, pre)
+	}
+}

ext/handlers/filters/shippingquery/shippingquery.go

@@ -0,0 +1,24 @@
+package shippingquery
+
+import (
+	"strings"
+
+	"github.com/PaulSonOfLars/gotgbot/v2"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext/handlers/filters"
+)
+
+func All(_ *gotgbot.ShippingQuery) bool {
+	return true
+}
+
+func FromUserID(id int64) filters.ShippingQuery {
+	return func(p *gotgbot.ShippingQuery) bool {
+		return p.From.Id == id
+	}
+}
+
+func HasPayloadPrefix(pre string) filters.ShippingQuery {
+	return func(p *gotgbot.ShippingQuery) bool {
+		return strings.HasPrefix(p.InvoicePayload, pre)
+	}
+}

ext/handlers/filters/types.go

@@ -4,11 +4,13 @@ import "github.com/PaulSonOfLars/gotgbot/v2"
 
 type (
 	CallbackQuery      func(cq *gotgbot.CallbackQuery) bool
+	ChatJoinRequest    func(cjr *gotgbot.ChatJoinRequest) bool
 	ChatMember         func(u *gotgbot.ChatMemberUpdated) bool
 	ChosenInlineResult func(cir *gotgbot.ChosenInlineResult) bool
 	InlineQuery        func(iq *gotgbot.InlineQuery) bool
 	Message            func(msg *gotgbot.Message) bool
 	Poll               func(poll *gotgbot.Poll) bool
 	PollAnswer         func(pa *gotgbot.PollAnswer) bool
-	ChatJoinRequest    func(cjr *gotgbot.ChatJoinRequest) bool
+	PreCheckoutQuery   func(pcq *gotgbot.PreCheckoutQuery) bool
+	ShippingQuery      func(sq *gotgbot.ShippingQuery) bool
 )

ext/handlers/precheckoutquery.go

@@ -0,0 +1,36 @@
+package handlers
+
+import (
+	"fmt"
+
+	"github.com/PaulSonOfLars/gotgbot/v2"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext/handlers/filters"
+)
+
+type PreCheckoutQuery struct {
+	Filter   filters.PreCheckoutQuery
+	Response Response
+}
+
+func NewPreCheckoutQuery(f filters.PreCheckoutQuery, r Response) PreCheckoutQuery {
+	return PreCheckoutQuery{
+		Filter:   f,
+		Response: r,
+	}
+}
+
+func (r PreCheckoutQuery) CheckUpdate(b *gotgbot.Bot, ctx *ext.Context) bool {
+	if ctx.PollAnswer == nil {
+		return false
+	}
+	return r.Filter == nil || r.Filter(ctx.PreCheckoutQuery)
+}
+
+func (r PreCheckoutQuery) HandleUpdate(b *gotgbot.Bot, ctx *ext.Context) error {
+	return r.Response(b, ctx)
+}
+
+func (r PreCheckoutQuery) Name() string {
+	return fmt.Sprintf("precheckoutquery_%p", r.Response)
+}

ext/handlers/shippingquery.go

@@ -0,0 +1,36 @@
+package handlers
+
+import (
+	"fmt"
+
+	"github.com/PaulSonOfLars/gotgbot/v2"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext"
+	"github.com/PaulSonOfLars/gotgbot/v2/ext/handlers/filters"
+)
+
+type ShippingQuery struct {
+	Filter   filters.ShippingQuery
+	Response Response
+}
+
+func NewShippingQuery(f filters.ShippingQuery, r Response) ShippingQuery {
+	return ShippingQuery{
+		Filter:   f,
+		Response: r,
+	}
+}
+
+func (r ShippingQuery) CheckUpdate(b *gotgbot.Bot, ctx *ext.Context) bool {
+	if ctx.PollAnswer == nil {
+		return false
+	}
+	return r.Filter == nil || r.Filter(ctx.ShippingQuery)
+}
+
+func (r ShippingQuery) HandleUpdate(b *gotgbot.Bot, ctx *ext.Context) error {
+	return r.Response(b, ctx)
+}
+
+func (r ShippingQuery) Name() string {
+	return fmt.Sprintf("shippingquery_%p", r.Response)
+}