v0.3.0

api.go

@@ -0,0 +1,68 @@
+package laniakea
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+)
+
+type ApiResponse struct {
+	Ok          bool   `json:"ok"`
+	Description string `json:"description,omitempty"`
+	Result      any    `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) {
+	var buf bytes.Buffer
+	err := json.NewEncoder(&buf).Encode(params)
+	if err != nil {
+		return nil, err
+	}
+
+	if b.debug && b.requestLogger != nil {
+		b.requestLogger.Debugln(strings.ReplaceAll(fmt.Sprintf(
+			"POST https://api.telegram.org/bot%s/%s %s",
+			"<TOKEN>",
+			methodName,
+			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)
+	err = json.Unmarshal(data, &response)
+	if err != nil {
+		return nil, err
+	}
+
+	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")
+}

bot.go

@@ -1,11 +1,9 @@
 package laniakea
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
+	"log"
 	"os"
 	"sort"
 	"strings"
@@ -36,6 +34,7 @@ type Bot struct {
 	plugins     []*Plugin
 	middlewares []*Middleware
 	prefixes    []string
+	runners     []Runner
 
 	dbContext *DatabaseContext
 
@@ -67,29 +66,18 @@ func LoadSettingsFromEnv() *BotSettings {
 	}
 }
 
-type MsgContext struct {
-	Bot           *Bot
-	Msg           *Message
-	Update        *Update
-	From          *User
-	CallbackMsgId int
-	FromID        int
-	Prefix        string
-	Text          string
-	Args          []string
+func LoadPrefixesFromEnv() []string {
+	prefixesS, exists := os.LookupEnv("PREFIXES")
+	if !exists {
+		return []string{"!"}
+	}
+	return strings.Split(prefixesS, ";")
 }
-
-type DatabaseContext struct {
-	PostgresSQL *sqlx.DB
-	MongoDB     *mongo.Client
-	Redis       *redis.Client
-}
-
 func NewBot(settings *BotSettings) *Bot {
 	updateQueue := CreateQueue[*Update](256)
 	bot := &Bot{
 		updateOffset: 0, plugins: make([]*Plugin, 0), debug: settings.Debug, errorTemplate: "%s",
-		prefixes: settings.Prefixes, updateTypes: make([]string, 0),
+		prefixes: settings.Prefixes, updateTypes: make([]string, 0), runners: make([]Runner, 0),
 		updateQueue: updateQueue,
 		token:       settings.Token,
 	}
@@ -97,10 +85,10 @@ func NewBot(settings *BotSettings) *Bot {
 	if len(settings.ErrorTemplate) > 0 {
 		bot.errorTemplate = settings.ErrorTemplate
 	}
-
 	if len(settings.LoggerBasePath) == 0 {
 		settings.LoggerBasePath = "./"
 	}
+
 	level := slog.FATAL
 	if settings.Debug {
 		level = slog.DEBUG
@@ -134,14 +122,22 @@ func NewBot(settings *BotSettings) *Bot {
 }
 
 func (b *Bot) Close() {
-	b.logger.Close()
-	b.requestLogger.Close()
+	err := b.logger.Close()
+	if err != nil {
+		log.Println(err)
+	}
+	err = b.requestLogger.Close()
+	if err != nil {
+		log.Println(err)
+	}
 }
 
-func (b *Bot) InitDatabaseContext(ctx *DatabaseContext) *Bot {
-	b.dbContext = ctx
-	return b
+type DatabaseContext struct {
+	PostgresSQL *sqlx.DB
+	MongoDB     *mongo.Client
+	Redis       *redis.Client
 }
+
 func (b *Bot) AddDatabaseLogger(writer func(db *DatabaseContext) slog.LoggerWriter) *Bot {
 	w := writer(b.dbContext)
 	b.logger.AddWriter(w)
@@ -151,6 +147,10 @@ func (b *Bot) AddDatabaseLogger(writer func(db *DatabaseContext) slog.LoggerWrit
 	return b
 }
 
+func (b *Bot) DatabaseContext(ctx *DatabaseContext) *Bot {
+	b.dbContext = ctx
+	return b
+}
 func (b *Bot) UpdateTypes(t ...string) *Bot {
 	b.updateTypes = make([]string, 0)
 	b.updateTypes = append(b.updateTypes, t...)
@@ -164,18 +164,11 @@ func (b *Bot) AddPrefixes(prefixes ...string) *Bot {
 	b.prefixes = append(b.prefixes, prefixes...)
 	return b
 }
-func LoadPrefixesFromEnv() []string {
-	prefixesS, exists := os.LookupEnv("PREFIXES")
-	if !exists {
-		return []string{"!"}
-	}
-	return strings.Split(prefixesS, ";")
-}
 func (b *Bot) ErrorTemplate(s string) *Bot {
 	b.errorTemplate = s
 	return b
 }
-func (b *Bot) Debugln(debug bool) *Bot {
+func (b *Bot) Debug(debug bool) *Bot {
 	b.debug = debug
 	return b
 }
@@ -202,6 +195,17 @@ func (b *Bot) AddMiddleware(middleware ...*Middleware) *Bot {
 	}
 	return b
 }
+func (b *Bot) AddRunner(runner Runner) *Bot {
+	b.runners = append(b.runners, runner)
+	b.logger.Debugln(fmt.Sprintf("runner with name \"%s\" registered", runner.Name))
+	return b
+}
+func (b *Bot) Logger() *slog.Logger {
+	return b.logger
+}
+func (b *Bot) GetDBContext() *DatabaseContext {
+	return b.dbContext
+}
 
 func (b *Bot) Run() {
 	if len(b.prefixes) == 0 {
@@ -214,15 +218,16 @@ func (b *Bot) Run() {
 		return
 	}
 
-	b.logger.Infoln("Bot running. Press CTRL+C to exit.")
+	b.logger.Infoln("Executing runners...")
+	b.ExecRunners()
 
+	b.logger.Infoln("Bot running. Press CTRL+C to exit.")
 	go func() {
 		for {
 			_, err := b.Updates()
 			if err != nil {
 				b.logger.Errorln(err)
 			}
-			time.Sleep(time.Millisecond * 10)
 		}
 	}()
 
@@ -239,8 +244,7 @@ func (b *Bot) Run() {
 			continue
 		}
 		ctx := &MsgContext{
-			Bot:    b,
-			Update: u,
+			Bot: b, Update: u,
 		}
 		for _, middleware := range b.middlewares {
 			middleware.Execute(ctx, b.dbContext)
@@ -263,25 +267,26 @@ 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) {
-	var text string
 	if update.Message == nil {
 		return
 	}
+
+	var text string
 	if len(update.Message.Text) > 0 {
 		text = update.Message.Text
 	} else {
 		text = update.Message.Caption
 	}
 
-	ctx.FromID = update.Message.From.ID
-	ctx.From = update.Message.From
-	ctx.Msg = update.Message
 	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):])
 
@@ -296,6 +301,7 @@ func (b *Bot) handleMessage(update *Update, ctx *MsgContext) {
 			ctx.Args = strings.Split(ctx.Text, " ")
 
 			go plugin.Execute(cmd, ctx, b.dbContext)
+			return
 		}
 	}
 }
@@ -320,7 +326,7 @@ func (b *Bot) handleCallback(update *Update, ctx *MsgContext) {
 			continue
 		}
 		go plugin.ExecutePayload(data.Command, ctx, b.dbContext)
-		break
+		return
 	}
 }
 
@@ -332,219 +338,3 @@ func (b *Bot) checkPrefixes(text string) (string, bool) {
 	}
 	return "", false
 }
-
-type AnswerMessage struct {
-	MessageID int
-	Text      string
-	IsMedia   bool
-	Keyboard  *InlineKeyboard
-	ctx       *MsgContext
-}
-
-func (ctx *MsgContext) edit(messageId int, text string, keyboard *InlineKeyboard) *AnswerMessage {
-	params := &EditMessageTextP{
-		MessageID: messageId,
-		ChatID:    ctx.Msg.Chat.ID,
-		Text:      text,
-		ParseMode: ParseMD,
-	}
-	if keyboard != nil {
-		params.ReplyMarkup = keyboard.Get()
-	}
-	msg, err := ctx.Bot.EditMessageText(params)
-	if err != nil {
-		ctx.Bot.logger.Errorln(err)
-		return nil
-	}
-	return &AnswerMessage{
-		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: false,
-	}
-}
-func (m *AnswerMessage) Edit(text string) *AnswerMessage {
-	return m.ctx.edit(m.MessageID, text, nil)
-}
-func (ctx *MsgContext) EditCallback(text string, keyboard *InlineKeyboard) *AnswerMessage {
-	if ctx.CallbackMsgId == 0 {
-		ctx.Bot.logger.Errorln("Can't edit non-callback update message")
-		return nil
-	}
-
-	return ctx.edit(ctx.CallbackMsgId, text, keyboard)
-}
-func (ctx *MsgContext) EditCallbackf(format string, keyboard *InlineKeyboard, args ...any) *AnswerMessage {
-	return ctx.EditCallback(fmt.Sprintf(format, args...), keyboard)
-}
-
-func (ctx *MsgContext) editPhotoText(messageId int, text string, kb *InlineKeyboard) *AnswerMessage {
-	params := &EditMessageCaptionP{
-		ChatID:    ctx.Msg.Chat.ID,
-		MessageID: messageId,
-		Caption:   text,
-		ParseMode: ParseMD,
-	}
-	if kb != nil {
-		params.ReplyMarkup = kb.Get()
-	}
-	msg, err := ctx.Bot.EditMessageCaption(params)
-	if err != nil {
-		ctx.Bot.logger.Errorln(err)
-	}
-	return &AnswerMessage{
-		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: true,
-	}
-}
-func (m *AnswerMessage) EditCaption(text string) *AnswerMessage {
-	return m.ctx.editPhotoText(m.MessageID, text, nil)
-}
-func (m *AnswerMessage) EditCaptionKeyboard(text string, kb *InlineKeyboard) *AnswerMessage {
-	return m.ctx.editPhotoText(m.MessageID, text, kb)
-}
-
-func (ctx *MsgContext) answer(text string, keyboard *InlineKeyboard) *AnswerMessage {
-	params := &SendMessageP{
-		ChatID:    ctx.Msg.Chat.ID,
-		Text:      text,
-		ParseMode: ParseMD,
-	}
-	if keyboard != nil {
-		params.ReplyMarkup = keyboard.Get()
-	}
-
-	msg, err := ctx.Bot.SendMessage(params)
-	if err != nil {
-		ctx.Bot.logger.Errorln(err)
-		return nil
-	}
-	return &AnswerMessage{
-		MessageID: msg.MessageID, ctx: ctx, IsMedia: false, Text: text,
-	}
-}
-func (ctx *MsgContext) Answer(text string) *AnswerMessage {
-	return ctx.answer(text, nil)
-}
-func (ctx *MsgContext) Answerf(template string, args ...any) *AnswerMessage {
-	return ctx.answer(fmt.Sprintf(template, args...), nil)
-}
-func (ctx *MsgContext) Keyboard(text string, kb *InlineKeyboard) *AnswerMessage {
-	return ctx.answer(text, kb)
-}
-
-func (ctx *MsgContext) answerPhoto(photoId, text string, kb *InlineKeyboard) *AnswerMessage {
-	params := &SendPhotoP{
-		ChatID:    ctx.Msg.Chat.ID,
-		Caption:   text,
-		Photo:     photoId,
-		ParseMode: ParseMD,
-	}
-	if kb != nil {
-		params.ReplyMarkup = kb.Get()
-	}
-	msg, err := ctx.Bot.SendPhoto(params)
-	if err != nil {
-		ctx.Bot.logger.Errorln(err)
-	}
-	return &AnswerMessage{
-		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: true,
-	}
-}
-func (ctx *MsgContext) AnswerPhoto(photoId, text string) *AnswerMessage {
-	return ctx.answerPhoto(photoId, text, nil)
-}
-func (ctx *MsgContext) AnswerPhotoKeyboard(photoId, text string, kb *InlineKeyboard) *AnswerMessage {
-	return ctx.answerPhoto(photoId, text, kb)
-}
-
-func (ctx *MsgContext) delete(messageId int) {
-	_, err := ctx.Bot.DeleteMessage(&DeleteMessageP{
-		ChatID:    ctx.Msg.Chat.ID,
-		MessageID: messageId,
-	})
-	if err != nil {
-		ctx.Bot.logger.Errorln(err)
-	}
-}
-func (m *AnswerMessage) Delete() {
-	m.ctx.delete(m.MessageID)
-}
-func (ctx *MsgContext) CallbackDelete() {
-	ctx.delete(ctx.CallbackMsgId)
-}
-
-func (ctx *MsgContext) Error(err error) {
-	_, sendErr := ctx.Bot.SendMessage(&SendMessageP{
-		ChatID: ctx.Msg.Chat.ID,
-		Text:   fmt.Sprintf(ctx.Bot.errorTemplate, EscapeMarkdown(err.Error())),
-	})
-	ctx.Bot.logger.Errorln(err)
-
-	if sendErr != nil {
-		ctx.Bot.logger.Errorln(sendErr)
-	}
-}
-
-func (b *Bot) Logger() *slog.Logger {
-	return b.logger
-}
-
-type ApiResponse struct {
-	Ok          bool           `json:"ok"`
-	Result      map[string]any `json:"result,omitempty"`
-	Description string         `json:"description,omitempty"`
-	ErrorCode   int            `json:"error_code,omitempty"`
-}
-
-type ApiResponseA struct {
-	Ok          bool   `json:"ok"`
-	Result      []any  `json:"result,omitempty"`
-	Description string `json:"description,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]interface{}, error) {
-	var buf bytes.Buffer
-	err := json.NewEncoder(&buf).Encode(params)
-	if err != nil {
-		return nil, err
-	}
-
-	if b.debug && b.requestLogger != nil {
-		b.requestLogger.Debugln(strings.ReplaceAll(fmt.Sprintf(
-			"POST https://api.telegram.org/bot%s/%s %s",
-			"<TOKEN>",
-			methodName,
-			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)
-
-	var result map[string]any
-
-	err = json.Unmarshal(data, &response)
-	if err != nil {
-		responseArray := new(ApiResponseA)
-		err = json.Unmarshal(data, responseArray)
-		if err != nil {
-			return nil, err
-		}
-		result = map[string]interface{}{
-			"data": responseArray.Result,
-		}
-	} else {
-		result = response.Result
-	}
-	if !response.Ok {
-		return nil, fmt.Errorf("[%d] %s", response.ErrorCode, response.Description)
-	}
-	return result, err
-}

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.33.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
 )

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=

methods.go

@@ -18,29 +18,21 @@ func (b *Bot) Updates() ([]*Update, error) {
 		return nil, err
 	}
 	res := make([]*Update, 0)
-	for _, u := range data["data"].([]any) {
-		updateObj := new(Update)
-		data, err := json.Marshal(u)
+	err = AnyToStruct(data["data"], &res)
+	if err != nil {
+		return res, err
+	}
+	
+	for _, u := range res {
+		b.updateOffset = u.UpdateID + 1
+		err = b.updateQueue.Enqueue(u)
 		if err != nil {
 			return res, err
 		}
-		err = json.Unmarshal(data, updateObj)
-		if err != nil {
-			return res, err
-		}
-		//err = MapToStruct(u.(map[string]any), updateObj)
-		//if err != nil {
-		//	return res, err
-		//}
-		b.updateOffset = updateObj.UpdateID + 1
-		err = b.updateQueue.Enqueue(updateObj)
-		if err != nil {
-			return res, err
-		}
-		res = append(res, updateObj)
+		res = append(res, u)
 
 		if b.debug && b.requestLogger != nil {
-			j, err := MapToJson(u.(map[string]interface{}))
+			j, err := json.Marshal(u)
 			if err != nil {
 				b.logger.Error(err)
 			}

msg_context.go

@@ -0,0 +1,164 @@
+package laniakea
+
+import "fmt"
+
+type MsgContext struct {
+	Bot           *Bot
+	Msg           *Message
+	Update        *Update
+	From          *User
+	CallbackMsgId int
+	FromID        int
+	Prefix        string
+	Text          string
+	Args          []string
+}
+
+type AnswerMessage struct {
+	MessageID int
+	Text      string
+	IsMedia   bool
+	Keyboard  *InlineKeyboard
+	ctx       *MsgContext
+}
+
+func (ctx *MsgContext) edit(messageId int, text string, keyboard *InlineKeyboard) *AnswerMessage {
+	params := &EditMessageTextP{
+		MessageID: messageId,
+		ChatID:    ctx.Msg.Chat.ID,
+		Text:      text,
+		ParseMode: ParseMD,
+	}
+	if keyboard != nil {
+		params.ReplyMarkup = keyboard.Get()
+	}
+	msg, err := ctx.Bot.EditMessageText(params)
+	if err != nil {
+		ctx.Bot.logger.Errorln(err)
+		return nil
+	}
+	return &AnswerMessage{
+		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: false,
+	}
+}
+func (m *AnswerMessage) Edit(text string) *AnswerMessage {
+	return m.ctx.edit(m.MessageID, text, nil)
+}
+func (ctx *MsgContext) EditCallback(text string, keyboard *InlineKeyboard) *AnswerMessage {
+	if ctx.CallbackMsgId == 0 {
+		ctx.Bot.logger.Errorln("Can't edit non-callback update message")
+		return nil
+	}
+
+	return ctx.edit(ctx.CallbackMsgId, text, keyboard)
+}
+func (ctx *MsgContext) EditCallbackf(format string, keyboard *InlineKeyboard, args ...any) *AnswerMessage {
+	return ctx.EditCallback(fmt.Sprintf(format, args...), keyboard)
+}
+
+func (ctx *MsgContext) editPhotoText(messageId int, text string, kb *InlineKeyboard) *AnswerMessage {
+	params := &EditMessageCaptionP{
+		ChatID:    ctx.Msg.Chat.ID,
+		MessageID: messageId,
+		Caption:   text,
+		ParseMode: ParseMD,
+	}
+	if kb != nil {
+		params.ReplyMarkup = kb.Get()
+	}
+	msg, err := ctx.Bot.EditMessageCaption(params)
+	if err != nil {
+		ctx.Bot.logger.Errorln(err)
+	}
+	return &AnswerMessage{
+		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: true,
+	}
+}
+func (m *AnswerMessage) EditCaption(text string) *AnswerMessage {
+	return m.ctx.editPhotoText(m.MessageID, text, nil)
+}
+func (m *AnswerMessage) EditCaptionKeyboard(text string, kb *InlineKeyboard) *AnswerMessage {
+	return m.ctx.editPhotoText(m.MessageID, text, kb)
+}
+
+func (ctx *MsgContext) answer(text string, keyboard *InlineKeyboard) *AnswerMessage {
+	params := &SendMessageP{
+		ChatID:    ctx.Msg.Chat.ID,
+		Text:      text,
+		ParseMode: ParseMD,
+	}
+	if keyboard != nil {
+		params.ReplyMarkup = keyboard.Get()
+	}
+
+	msg, err := ctx.Bot.SendMessage(params)
+	if err != nil {
+		ctx.Bot.logger.Errorln(err)
+		return nil
+	}
+	return &AnswerMessage{
+		MessageID: msg.MessageID, ctx: ctx, IsMedia: false, Text: text,
+	}
+}
+func (ctx *MsgContext) Answer(text string) *AnswerMessage {
+	return ctx.answer(text, nil)
+}
+func (ctx *MsgContext) Answerf(template string, args ...any) *AnswerMessage {
+	return ctx.answer(fmt.Sprintf(template, args...), nil)
+}
+func (ctx *MsgContext) Keyboard(text string, kb *InlineKeyboard) *AnswerMessage {
+	return ctx.answer(text, kb)
+}
+
+func (ctx *MsgContext) answerPhoto(photoId, text string, kb *InlineKeyboard) *AnswerMessage {
+	params := &SendPhotoP{
+		ChatID:    ctx.Msg.Chat.ID,
+		Caption:   text,
+		Photo:     photoId,
+		ParseMode: ParseMD,
+	}
+	if kb != nil {
+		params.ReplyMarkup = kb.Get()
+	}
+	msg, err := ctx.Bot.SendPhoto(params)
+	if err != nil {
+		ctx.Bot.logger.Errorln(err)
+	}
+	return &AnswerMessage{
+		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: true,
+	}
+}
+func (ctx *MsgContext) AnswerPhoto(photoId, text string) *AnswerMessage {
+	return ctx.answerPhoto(photoId, text, nil)
+}
+func (ctx *MsgContext) AnswerPhotoKeyboard(photoId, text string, kb *InlineKeyboard) *AnswerMessage {
+	return ctx.answerPhoto(photoId, text, kb)
+}
+
+func (ctx *MsgContext) delete(messageId int) {
+	_, err := ctx.Bot.DeleteMessage(&DeleteMessageP{
+		ChatID:    ctx.Msg.Chat.ID,
+		MessageID: messageId,
+	})
+	if err != nil {
+		ctx.Bot.logger.Errorln(err)
+	}
+}
+func (m *AnswerMessage) Delete() {
+	m.ctx.delete(m.MessageID)
+}
+func (ctx *MsgContext) CallbackDelete() {
+	ctx.delete(ctx.CallbackMsgId)
+}
+
+func (ctx *MsgContext) Error(err error) {
+	_, sendErr := ctx.Bot.SendMessage(&SendMessageP{
+		ChatID: ctx.Msg.Chat.ID,
+		Text:   fmt.Sprintf(ctx.Bot.errorTemplate, EscapeMarkdown(err.Error())),
+	})
+	ctx.Bot.logger.Errorln(err)
+
+	if sendErr != nil {
+		ctx.Bot.logger.Errorln(sendErr)
+	}
+}

runners.go

@@ -0,0 +1,80 @@
+package laniakea
+
+import (
+	"time"
+)
+
+type RunnerFn func(*Bot) error
+type RunnerBuilder struct {
+	name    string
+	onetime bool
+	async   bool
+	timeout time.Duration
+	fn      RunnerFn
+}
+type Runner struct {
+	Name    string
+	Onetime bool
+	Async   bool
+	Timeout time.Duration
+	Fn      RunnerFn
+}
+
+func NewRunner(name string, fn RunnerFn) *RunnerBuilder {
+	return &RunnerBuilder{
+		name: name, fn: fn, async: true,
+	}
+}
+func (b *RunnerBuilder) Onetime(onetime bool) *RunnerBuilder {
+	b.onetime = onetime
+	return b
+}
+func (b *RunnerBuilder) Async(async bool) *RunnerBuilder {
+	b.async = async
+	return b
+}
+func (b *RunnerBuilder) Timeout(timeout time.Duration) *RunnerBuilder {
+	b.timeout = timeout
+	return b
+}
+func (b *RunnerBuilder) Build() Runner {
+	return Runner{
+		Name: b.name, Onetime: b.onetime, Async: b.async, Fn: b.fn, Timeout: b.timeout,
+	}
+}
+
+func (b *Bot) ExecRunners() {
+	for _, runner := range b.runners {
+		if !runner.Onetime && !runner.Async {
+			b.logger.Warnf("Runner %s not onetime, but sync\n", runner.Name)
+			continue
+		}
+		if !runner.Onetime && runner.Async && runner.Timeout == (time.Second*0) {
+			b.logger.Warnf("Background runner \"%s\" should have timeout", runner.Name)
+		}
+
+		if runner.Async && runner.Onetime {
+			go func() {
+				err := runner.Fn(b)
+				if err != nil {
+					b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
+				}
+			}()
+		} else if !runner.Async && runner.Onetime {
+			err := runner.Fn(b)
+			if err != nil {
+				b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
+			}
+		} else if !runner.Onetime {
+			go func() {
+				for {
+					err := runner.Fn(b)
+					if err != nil {
+						b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
+					}
+					time.Sleep(runner.Timeout)
+				}
+			}()
+		}
+	}
+}

utils.go

@@ -6,7 +6,8 @@ import (
 	"strings"
 )
 
-func MapToStruct(m map[string]interface{}, s interface{}) error {
+// MapToStruct unsafe function
+func MapToStruct(m map[string]any, s any) error {
 	data, err := json.Marshal(m)
 	if err != nil {
 		return err
@@ -15,7 +16,27 @@ func MapToStruct(m map[string]interface{}, s interface{}) error {
 	return err
 }
 
-func MapToJson(m map[string]interface{}) (string, error) {
+// SliceToStruct unsafe function
+func SliceToStruct(sl []any, s any) error {
+	data, err := json.Marshal(sl)
+	if err != nil {
+		return err
+	}
+	err = json.Unmarshal(data, s)
+	return err
+}
+
+// AnyToStruct unsafe function
+func AnyToStruct(src, dest any) error {
+	data, err := json.Marshal(src)
+	if err != nil {
+		return err
+	}
+	err = json.Unmarshal(data, dest)
+	return err
+}
+
+func MapToJson(m map[string]any) (string, error) {
 	data, err := json.Marshal(m)
 	return string(data), err
 }

version.go

@@ -1,8 +1,8 @@
 package laniakea
 
 const (
-	VersionString = "0.2.5"
+	VersionString = "0.3.0"
 	VersionMajor  = 0
-	VersionMinor  = 2
-	VersionPatch  = 5
+	VersionMinor  = 3
+	VersionPatch  = 0
 )