Merge pull request 'v0.3.2' (#3 ) from dev into main

Reviewed-on: #3
license; v0.3.2
2026-01-29 11:47:29 +03:00 · 2026-01-29 11:46:54 +03:00 · 2026-01-29 11:45:35 +03:00 · 2026-01-29 10:50:43 +03:00 · 2026-01-29 10:05:17 +03:00 · 2026-01-29 09:51:50 +03:00
9 changed files with 186 additions and 207 deletions
--- a/api.go
+++ b/api.go
@@ -3,48 +3,56 @@ package laniakea
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"strings"
 )

-type ApiResponse struct {
+type ApiResponse[R any] struct {
 	Ok          bool   `json:"ok"`
 	Description string `json:"description,omitempty"`
-	Result      any    `json:"result,omitempty"`
+	Result      R      `json:"result,omitempty"`
 	ErrorCode   int    `json:"error_code,omitempty"`
 }

-// request is a low-level call to api.
-func (b *Bot) request(methodName string, params any) (map[string]any, error) {
+type TelegramRequest[R, P any] struct {
+	method string
+	params P
+}
+
+func NewRequest[R, P any](method string, params P) TelegramRequest[R, P] {
+	return TelegramRequest[R, P]{method: method, params: params}
+}
+func (r TelegramRequest[R, P]) Do(bot *Bot) (*R, error) {
 	var buf bytes.Buffer
-	err := json.NewEncoder(&buf).Encode(params)
+	err := json.NewEncoder(&buf).Encode(r.params)
 	if err != nil {
 		return nil, err
 	}

-	if b.debug && b.requestLogger != nil {
-		b.requestLogger.Debugln(strings.ReplaceAll(fmt.Sprintf(
+	if bot.requestLogger != nil {
+		bot.requestLogger.Debugln(strings.ReplaceAll(fmt.Sprintf(
 			"POST https://api.telegram.org/bot%s/%s %s",
-			"<TOKEN>",
-			methodName,
-			buf.String(),
+			"<TOKEN>", r.method, buf.String(),
 		), "\n", ""))
 	}
-	r, err := http.Post(fmt.Sprintf("https://api.telegram.org/bot%s/%s", b.token, methodName), "application/json", &buf)
-	if err != nil {
-		return nil, err
-	}
-	defer r.Body.Close()
-	data, err := io.ReadAll(r.Body)
-	if err != nil {
-		return nil, err
-	}
-	b.requestLogger.Debugln(fmt.Sprintf("RES %s %s", methodName, string(data)))

-	response := new(ApiResponse)
+	req, err := http.Post(fmt.Sprintf("https://api.telegram.org/bot%s/%s", bot.token, r.method), "application/json", &buf)
+	if err != nil {
+		return nil, err
+	}
+	defer req.Body.Close()
+	data, err := io.ReadAll(req.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	if bot.requestLogger != nil {
+		bot.requestLogger.Debugln(fmt.Sprintf("RES %s %s", r.method, string(data)))
+	}
+
+	response := new(ApiResponse[R])
 	err = json.Unmarshal(data, &response)
 	if err != nil {
 		return nil, err
@@ -53,16 +61,5 @@ func (b *Bot) request(methodName string, params any) (map[string]any, error) {
 	if !response.Ok {
 		return nil, fmt.Errorf("[%d] %s", response.ErrorCode, response.Description)
 	}
-	if res, ok := response.Result.(bool); ok {
-		return map[string]any{
-			"data": res,
-		}, nil
-	} else if res, ok := response.Result.([]any); ok {
-		return map[string]any{
-			"data": res,
-		}, nil
-	} else if res, ok := response.Result.(map[string]any); ok {
-		return res, nil
-	}
-	return map[string]any{}, errors.New("can't parse response")
+	return &response.Result, nil
 }
--- a/bot.go
+++ b/bot.go
@@ -1,7 +1,6 @@
 package laniakea

 import (
-	"encoding/json"
 	"fmt"
 	"log"
 	"os"
@@ -180,19 +179,20 @@ func (b *Bot) AddPlugins(plugin ...*Plugin) *Bot {
 	return b
 }
 func (b *Bot) AddMiddleware(middleware ...*Middleware) *Bot {
-	sort.Slice(middleware, func(a, b int) bool {
-		first := middleware[a]
-		second := middleware[b]
-		if first.Order == second.Order {
-			return first.Name < second.Name
-		}
-		return middleware[a].Order < middleware[b].Order
-	})
-
 	b.middlewares = append(b.middlewares, middleware...)
 	for _, m := range middleware {
 		b.logger.Debugln(fmt.Sprintf("middleware with name \"%s\" registered", m.Name))
 	}
+
+	sort.Slice(&b.middlewares, func(i, j int) bool {
+		first := b.middlewares[i]
+		second := b.middlewares[j]
+		if first.Order == second.Order {
+			return first.Name < second.Name
+		}
+		return first.Order < second.Order
+	})
+
 	return b
 }
 func (b *Bot) AddRunner(runner Runner) *Bot {
@@ -243,6 +243,7 @@ func (b *Bot) Run() {
 			b.logger.Errorln("update is nil")
 			continue
 		}
+
 		ctx := &MsgContext{
 			Bot: b, Update: u,
 		}
@@ -263,78 +264,3 @@ func (b *Bot) Run() {
 		}
 	}
 }
-
-// {"callback_query":{"chat_instance":"6202057960757700762","data":"aboba","from":{"first_name":"scuroneko","id":314834933,"is_bot":false,"language_code":"ru","username":"scuroneko"},"id":"1352205741990111553","message":{"chat":{"first_name":"scuroneko","id":314834933,"type":"private","username":"scuroneko"},"date":1734338107,"from":{"first_name":"Kurumi","id":7718900880,"is_bot":true,"username":"kurumi_game_bot"},"message_id":19,"reply_markup":{"inline_keyboard":[[{"callback_data":"aboba","text":"Test"},{"callback_data":"another","text":"Another"}]]},"text":"Aboba"}},"update_id":350979488}
-
-func (b *Bot) handleMessage(update *Update, ctx *MsgContext) {
-	if update.Message == nil {
-		return
-	}
-
-	var text string
-	if len(update.Message.Text) > 0 {
-		text = update.Message.Text
-	} else {
-		text = update.Message.Caption
-	}
-
-	text = strings.TrimSpace(text)
-	prefix, hasPrefix := b.checkPrefixes(text)
-	if !hasPrefix {
-		return
-	}
-	ctx.Prefix = prefix
-	ctx.FromID = update.Message.From.ID
-	ctx.From = update.Message.From
-	ctx.Msg = update.Message
-
-	text = strings.TrimSpace(text[len(prefix):])
-
-	for _, plugin := range b.plugins {
-		// Check every command
-		for cmd := range plugin.Commands {
-			if !strings.HasPrefix(text, cmd) {
-				continue
-			}
-
-			ctx.Text = strings.TrimSpace(text[len(cmd):])
-			ctx.Args = strings.Split(ctx.Text, " ")
-
-			go plugin.Execute(cmd, ctx, b.dbContext)
-			return
-		}
-	}
-}
-
-func (b *Bot) handleCallback(update *Update, ctx *MsgContext) {
-	data := new(CallbackData)
-	err := json.Unmarshal([]byte(update.CallbackQuery.Data), data)
-	if err != nil {
-		b.logger.Errorln(err)
-		return
-	}
-
-	ctx.FromID = update.CallbackQuery.From.ID
-	ctx.From = update.CallbackQuery.From
-	ctx.Msg = update.CallbackQuery.Message
-	ctx.CallbackMsgId = update.CallbackQuery.Message.MessageID
-	ctx.Args = data.Args
-
-	for _, plugin := range b.plugins {
-		_, ok := plugin.Payloads[data.Command]
-		if !ok {
-			continue
-		}
-		go plugin.ExecutePayload(data.Command, ctx, b.dbContext)
-		return
-	}
-}
-
-func (b *Bot) checkPrefixes(text string) (string, bool) {
-	for _, prefix := range b.prefixes {
-		if strings.HasPrefix(text, prefix) {
-			return prefix, true
-		}
-	}
-	return "", false
-}
--- a/go.mod
+++ b/go.mod
@@ -6,24 +6,23 @@ require (
 	git.nix13.pw/scuroneko/slog v1.0.0
 	github.com/redis/go-redis/v9 v9.17.3
 	github.com/vinovest/sqlx v1.7.1
-	go.mongodb.org/mongo-driver/v2 v2.4.2
+	go.mongodb.org/mongo-driver/v2 v2.5.0
 )

 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/color v1.18.0 // indirect
-	github.com/golang/snappy v1.0.0 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/compress v1.18.3 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/muir/sqltoken v0.1.0 // indirect
+	github.com/muir/sqltoken v0.2.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/scram v1.2.0 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
 	golang.org/x/sys v0.40.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -16,12 +16,10 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
 github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
 github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=
-github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
-github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
-github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw=
+github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
@@ -30,39 +28,39 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/muir/sqltoken v0.1.0 h1:edosEGsOClOZNfgGQNQSgxR9O6LiVefm2rDRqp2InuI=
-github.com/muir/sqltoken v0.1.0/go.mod h1:lgOIORnKekMsuc/ZwdPOfwz/PtWLPCke43cEbT3uDuY=
+github.com/muir/sqltoken v0.2.1 h1:19KvJrCj9aOMfU921hjnizWPlQmPTe+tb36zupOY2FA=
+github.com/muir/sqltoken v0.2.1/go.mod h1:sSlj5M0VqQ4OuedmxwWs1TmzzRXaH3DLf5ukzg6meIo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4=
 github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/vinovest/sqlx v1.7.1 h1:kdq4v0N9kRLpytWGSWOw4aulOGdQPmIoMR6Y+cTBxow=
 github.com/vinovest/sqlx v1.7.1/go.mod h1:3fAv74r4iDMv2PpFomADb+vex5ukzfYn4GseC9KngD8=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
+github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs=
+github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8=
 github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.mongodb.org/mongo-driver/v2 v2.4.2 h1:HrJ+Auygxceby9MLp3YITobef5a8Bv4HcPFIkml1U7U=
-go.mongodb.org/mongo-driver/v2 v2.4.2/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
+go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE=
+go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -77,8 +75,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
--- a/handler.go
+++ b/handler.go
@@ -0,0 +1,79 @@
+package laniakea
+
+import (
+	"encoding/json"
+	"strings"
+)
+
+func (b *Bot) handleMessage(update *Update, ctx *MsgContext) {
+	if update.Message == nil {
+		return
+	}
+
+	var text string
+	if len(update.Message.Text) > 0 {
+		text = update.Message.Text
+	} else {
+		text = update.Message.Caption
+	}
+
+	text = strings.TrimSpace(text)
+	prefix, hasPrefix := b.checkPrefixes(text)
+	if !hasPrefix {
+		return
+	}
+	ctx.Prefix = prefix
+	ctx.FromID = update.Message.From.ID
+	ctx.From = update.Message.From
+	ctx.Msg = update.Message
+
+	text = strings.TrimSpace(text[len(prefix):])
+
+	for _, plugin := range b.plugins {
+		// Check every command
+		for cmd := range plugin.Commands {
+			if !strings.HasPrefix(text, cmd) {
+				continue
+			}
+
+			ctx.Text = strings.TrimSpace(text[len(cmd):])
+			ctx.Args = strings.Split(ctx.Text, " ")
+
+			go plugin.Execute(cmd, ctx, b.dbContext)
+			return
+		}
+	}
+}
+
+func (b *Bot) handleCallback(update *Update, ctx *MsgContext) {
+	data := new(CallbackData)
+	err := json.Unmarshal([]byte(update.CallbackQuery.Data), data)
+	if err != nil {
+		b.logger.Errorln(err)
+		return
+	}
+
+	ctx.FromID = update.CallbackQuery.From.ID
+	ctx.From = update.CallbackQuery.From
+	ctx.Msg = update.CallbackQuery.Message
+	ctx.CallbackMsgId = update.CallbackQuery.Message.MessageID
+	ctx.Args = data.Args
+
+	for _, plugin := range b.plugins {
+		_, ok := plugin.Payloads[data.Command]
+		if !ok {
+			continue
+		}
+		go plugin.ExecutePayload(data.Command, ctx, b.dbContext)
+		return
+	}
+}
+
+func (b *Bot) checkPrefixes(text string) (string, bool) {
+	for _, prefix := range b.prefixes {
+		if strings.HasPrefix(text, prefix) {
+			return prefix, true
+		}
+	}
+	return "", false
+}
--- a/methods.go
+++ b/methods.go
@@ -5,31 +5,36 @@ import (
 	"fmt"
 )

-var NoParams = make(map[string]any)
+type EmptyParams struct{}
+
+var NoParams = EmptyParams{}
+
+type UpdateParams struct {
+	Offset         int      `json:"offset"`
+	Timeout        int      `json:"timeout"`
+	AllowedUpdates []string `json:"allowed_updates"`
+}

 func (b *Bot) Updates() ([]*Update, error) {
-	params := make(map[string]any)
-	params["offset"] = b.updateOffset
-	params["timeout"] = 30
-	params["allowed_updates"] = b.updateTypes
+	params := UpdateParams{
+		Offset:         b.updateOffset,
+		Timeout:        30,
+		AllowedUpdates: b.updateTypes,
+	}

-	data, err := b.request("getUpdates", params)
+	req := NewRequest[[]*Update]("getUpdates", params)
+	res, err := req.Do(b)
 	if err != nil {
-		return nil, err
+		return []*Update{}, err
 	}
-	res := make([]*Update, 0)
-	err = AnyToStruct(data["data"], &res)
-	if err != nil {
-		return res, err
-	}
-	
-	for _, u := range res {
+	updates := *res
+
+	for _, u := range updates {
 		b.updateOffset = u.UpdateID + 1
 		err = b.updateQueue.Enqueue(u)
 		if err != nil {
-			return res, err
+			return updates, err
 		}
-		res = append(res, u)

 		if b.debug && b.requestLogger != nil {
 			j, err := json.Marshal(u)
@@ -39,17 +44,12 @@ func (b *Bot) Updates() ([]*Update, error) {
 			b.requestLogger.Debugln(fmt.Sprintf("UPDATE %s", j))
 		}
 	}
-	return res, err
+	return updates, err
 }

 func (b *Bot) GetMe() (*User, error) {
-	data, err := b.request("getMe", NoParams)
-	if err != nil {
-		return nil, err
-	}
-	user := new(User)
-	err = MapToStruct(data, user)
-	return user, err
+	req := NewRequest[User, EmptyParams]("getMe", NoParams)
+	return req.Do(b)
 }

 type SendMessageP struct {
@@ -69,13 +69,8 @@ type SendMessageP struct {
 }

 func (b *Bot) SendMessage(params *SendMessageP) (*Message, error) {
-	data, err := b.request("sendMessage", params)
-	if err != nil {
-		return nil, err
-	}
-	message := new(Message)
-	err = MapToStruct(data, message)
-	return message, err
+	req := NewRequest[Message, SendMessageP]("sendMessage", *params)
+	return req.Do(b)
 }

 type SendPhotoP struct {
@@ -96,13 +91,8 @@ type SendPhotoP struct {
 }

 func (b *Bot) SendPhoto(params *SendPhotoP) (*Message, error) {
-	data, err := b.request("sendPhoto", params)
-	if err != nil {
-		return nil, err
-	}
-	message := new(Message)
-	err = MapToStruct(data, message)
-	return message, err
+	req := NewRequest[Message]("sendPhoto", params)
+	return req.Do(b)
 }

 type EditMessageTextP struct {
@@ -116,13 +106,8 @@ type EditMessageTextP struct {
 }

 func (b *Bot) EditMessageText(params *EditMessageTextP) (*Message, error) {
-	data, err := b.request("editMessageText", params)
-	if err != nil {
-		return nil, err
-	}
-	message := new(Message)
-	err = MapToStruct(data, message)
-	return message, err
+	req := NewRequest[Message]("editMessageText", params)
+	return req.Do(b)
 }

 type EditMessageCaptionP struct {
@@ -136,13 +121,8 @@ type EditMessageCaptionP struct {
 }

 func (b *Bot) EditMessageCaption(params *EditMessageCaptionP) (*Message, error) {
-	data, err := b.request("editMessageCaption", params)
-	if err != nil {
-		return nil, err
-	}
-	message := new(Message)
-	err = MapToStruct(data, message)
-	return message, err
+	req := NewRequest[Message]("editMessageCaption", params)
+	return req.Do(b)
 }

 type DeleteMessageP struct {
@@ -151,11 +131,6 @@ type DeleteMessageP struct {
 }

 func (b *Bot) DeleteMessage(params *DeleteMessageP) (*Message, error) {
-	data, err := b.request("deleteMessage", params)
-	if err != nil {
-		return nil, err
-	}
-	message := new(Message)
-	err = MapToStruct(data, message)
-	return message, err
+	req := NewRequest[Message]("deleteMessage", params)
+	return req.Do(b)
 }
--- a/queue.go
+++ b/queue.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 )

-var QueueFullErr = errors.New("queue is full")
+var QueueFullErr = errors.New("queue full")

 type Queue[T any] struct {
 	size  uint64
--- a/runners.go
+++ b/runners.go
@@ -61,10 +61,15 @@ func (b *Bot) ExecRunners() {
 				}
 			}()
 		} else if !runner.Async && runner.Onetime {
+			t := time.Now()
 			err := runner.Fn(b)
 			if err != nil {
 				b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
 			}
+			elapsed := time.Since(t)
+			if elapsed > time.Second*2 {
+				b.logger.Warnf("Runner %s too slow. Elapsed time %s>=2s", runner.Name, elapsed)
+			}
 		} else if !runner.Onetime {
 			go func() {
 				for {
--- a/version.go
+++ b/version.go
@@ -1,8 +1,8 @@
 package laniakea

 const (
-	VersionString = "0.3.0"
+	VersionString = "0.3.2"
 	VersionMajor  = 0
 	VersionMinor  = 3
-	VersionPatch  = 0
+	VersionPatch  = 2
 )
Author	SHA1	Message	Date
ScuroNeko	6d6f5738cd	Merge pull request 'v0.3.2' (#3 ) from dev into main Reviewed-on: #3	2026-01-29 11:47:29 +03:00
ScuroNeko	95516480b0	license; v0.3.2	2026-01-29 11:46:54 +03:00
ScuroNeko	9da4115fe7	license	2026-01-29 11:45:35 +03:00
ScuroNeko	f0483564f2	new request syntax	2026-01-29 10:50:43 +03:00
ScuroNeko	f1bb4b62c1	new request system	2026-01-29 10:05:17 +03:00
ScuroNeko	fef718438a	v0.3.0	2026-01-29 09:51:50 +03:00
ScuroNeko	ce9952340f	deps version bump	2026-01-28 21:57:21 +03:00
ScuroNeko	7f248fff62	fix	2025-11-05 11:38:09 +03:00