Merge pull request 'v0.3.10' (#7) from dev into main

Reviewed-on: https://git.nix13.pw/ScuroNeko/Laniakea/pulls/7

api.go

@@ -0,0 +1,80 @@
+package laniakea
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+)
+
+type ApiResponse[R any] struct {
+	Ok          bool   `json:"ok"`
+	Description string `json:"description,omitempty"`
+	Result      R      `json:"result,omitempty"`
+	ErrorCode   int    `json:"error_code,omitempty"`
+}
+
+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(r.params)
+	if err != nil {
+		return nil, err
+	}
+
+	if bot.requestLogger != nil {
+		bot.requestLogger.Debugln(strings.ReplaceAll(fmt.Sprintf(
+			"POST https://api.telegram.org/bot%s/%s %s",
+			"<TOKEN>", r.method, buf.String(),
+		), "\n", ""))
+	}
+
+	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
+	}
+
+	if !response.Ok {
+		return nil, fmt.Errorf("[%d] %s", response.ErrorCode, response.Description)
+	}
+	return &response.Result, nil
+}
+
+func (b *Bot) GetFileByLink(link string) ([]byte, error) {
+	c := http.DefaultClient
+	u := fmt.Sprintf("https://api.telegram.org/file/bot%s/%s", b.token, link)
+	req, err := http.NewRequest("GET", u, nil)
+	if err != nil {
+		return nil, err
+	}
+	res, err := c.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+	return io.ReadAll(res.Body)
+}

bot.go

@@ -1,173 +1,103 @@
 package laniakea
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"os"
 	"sort"
-	"strconv"
 	"strings"
-	"sync"
+	"time"
 
 	"git.nix13.pw/scuroneko/extypes"
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
 	"git.nix13.pw/scuroneko/slog"
-	"github.com/alitto/pond/v2"
+	"github.com/redis/go-redis/v9"
-	"golang.org/x/time/rate"
+	"github.com/vinovest/sqlx"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
-type BotOpts struct {
+type ParseMode string
-	Token       string
-	UpdateTypes []string
 
-	Debug         bool
+const (
-	ErrorTemplate string
+	ParseMDV2 ParseMode = "MarkdownV2"
-	Prefixes      []string
+	ParseHTML ParseMode = "HTML"
+	ParseMD   ParseMode = "Markdown"
+)
 
-	LoggerBasePath   string
+type Bot struct {
-	UseRequestLogger bool
-	WriteToFile      bool
-
-	UseTestServer bool
-	APIUrl        string
-
-	RateLimit      int
-	DropRLOverflow bool
-}
-
-func NewOpts() *BotOpts { return new(BotOpts) }
-func LoadOptsFromEnv() *BotOpts {
-	rateLimit := 30
-	if rl := os.Getenv("RATE_LIMIT"); rl != "" {
-		rateLimit, _ = strconv.Atoi(rl)
-	}
-
-	return &BotOpts{
-		Token:       os.Getenv("TG_TOKEN"),
-		UpdateTypes: strings.Split(os.Getenv("UPDATE_TYPES"), ";"),
-
-		Debug:         os.Getenv("DEBUG") == "true",
-		ErrorTemplate: os.Getenv("ERROR_TEMPLATE"),
-		Prefixes:      LoadPrefixesFromEnv(),
-
-		UseRequestLogger: os.Getenv("USE_REQ_LOG") == "true",
-		WriteToFile:      os.Getenv("WRITE_TO_FILE") == "true",
-
-		UseTestServer: os.Getenv("USE_TEST_SERVER") == "true",
-		APIUrl:        os.Getenv("API_URL"),
-
-		RateLimit:      rateLimit,
-		DropRLOverflow: os.Getenv("DROP_RL_OVERFLOW") == "true",
-	}
-}
-func LoadPrefixesFromEnv() []string {
-	prefixesS, exists := os.LookupEnv("PREFIXES")
-	if !exists {
-		return []string{"/"}
-	}
-	return strings.Split(prefixesS, ";")
-}
-
-type DbContext interface{}
-type NoDB struct{ DbContext }
-type Bot[T DbContext] struct {
 	token         string
 	debug         bool
 	errorTemplate string
 
 	logger        *slog.Logger
-	RequestLogger *slog.Logger
+	requestLogger *slog.Logger
-	extraLoggers  extypes.Slice[*slog.Logger]
 
-	plugins     []Plugin[T]
+	plugins     []Plugin
-	middlewares []Middleware[T]
+	middlewares []Middleware
 	prefixes    []string
-	runners     []Runner[T]
+	runners     []Runner
 
-	api       *tgapi.API
+	dbContext *DatabaseContext
-	uploader  *tgapi.Uploader
-	dbContext *T
-	l10n      *L10n
 
-	updateOffsetMu sync.Mutex
 	updateOffset int
-	updateTypes    []tgapi.UpdateType
+	updateTypes  []string
-	updateQueue    chan *tgapi.Update
+	updateQueue  *extypes.Queue[*Update]
 }
 
-func NewBot[T any](opts *BotOpts) *Bot[T] {
+type BotSettings struct {
-	updateQueue := make(chan *tgapi.Update, 512)
+	Token            string
+	Debug            bool
+	ErrorTemplate    string
+	Prefixes         []string
+	UpdateTypes      []string
+	LoggerBasePath   string
+	UseRequestLogger bool
+	WriteToFile      bool
+}
 
-	var limiter *rate.Limiter
+func LoadSettingsFromEnv() *BotSettings {
-	if opts.RateLimit > 0 {
+	return &BotSettings{
-		limiter = rate.NewLimiter(rate.Limit(opts.RateLimit), opts.RateLimit)
+		Token:            os.Getenv("TG_TOKEN"),
+		Debug:            os.Getenv("DEBUG") == "true",
+		ErrorTemplate:    os.Getenv("ERROR_TEMPLATE"),
+		Prefixes:         LoadPrefixesFromEnv(),
+		UpdateTypes:      strings.Split(os.Getenv("UPDATE_TYPES"), ";"),
+		UseRequestLogger: os.Getenv("USE_REQ_LOG") == "true",
+		WriteToFile:      os.Getenv("WRITE_TO_FILE") == "true",
 	}
+}
 
-	apiOpts := tgapi.NewAPIOpts(opts.Token).SetAPIUrl(opts.APIUrl).UseTestServer(opts.UseTestServer).SetLimiter(limiter)
+func LoadPrefixesFromEnv() []string {
-	api := tgapi.NewAPI(apiOpts)
+	prefixesS, exists := os.LookupEnv("PREFIXES")
-
+	if !exists {
-	uploader := tgapi.NewUploader(api)
+		return []string{"!"}
-
+	}
-	bot := &Bot[T]{
+	return strings.Split(prefixesS, ";")
-		updateOffset:  0,
+}
-		errorTemplate: "%s",
+func NewBot(settings *BotSettings) *Bot {
+	updateQueue := extypes.CreateQueue[*Update](256)
+	bot := &Bot{
+		updateOffset: 0, plugins: make([]Plugin, 0), debug: settings.Debug, errorTemplate: "%s",
+		prefixes: settings.Prefixes, updateTypes: make([]string, 0), runners: make([]Runner, 0),
 		updateQueue: updateQueue,
-		api:           api,
+		token:       settings.Token,
-		uploader:      uploader,
-		debug:         opts.Debug,
-		prefixes:      opts.Prefixes,
-		token:         opts.Token,
-		plugins:       make([]Plugin[T], 0),
-		updateTypes:   make([]tgapi.UpdateType, 0),
-		runners:       make([]Runner[T], 0),
-		extraLoggers:  make([]*slog.Logger, 0),
-		l10n:          &L10n{},
 	}
-	bot.extraLoggers = bot.extraLoggers.Push(api.GetLogger()).Push(uploader.GetLogger())
 
-	if len(opts.ErrorTemplate) > 0 {
+	if len(settings.ErrorTemplate) > 0 {
-		bot.errorTemplate = opts.ErrorTemplate
+		bot.errorTemplate = settings.ErrorTemplate
 	}
-	if len(opts.LoggerBasePath) == 0 {
+	if len(settings.LoggerBasePath) == 0 {
-		opts.LoggerBasePath = "./"
+		settings.LoggerBasePath = "./"
 	}
-	bot.initLoggers(opts)
 
-	u, err := api.GetMe()
-	if err != nil {
-		_ = bot.Close()
-		bot.logger.Fatal(err)
-	}
-	bot.logger.Infof("Authorized as %s\n", u.FirstName)
-
-	return bot
-}
-func (bot *Bot[T]) Close() error {
-	if err := bot.uploader.Close(); err != nil {
-		bot.logger.Errorln(err)
-	}
-	if err := bot.api.CloseApi(); err != nil {
-		bot.logger.Errorln(err)
-	}
-	if err := bot.RequestLogger.Close(); err != nil {
-		bot.logger.Errorln(err)
-	}
-	if err := bot.logger.Close(); err != nil {
-		return err
-	}
-	return nil
-}
-func (bot *Bot[T]) initLoggers(opts *BotOpts) {
 	level := slog.FATAL
-	if opts.Debug {
+	if settings.Debug {
 		level = slog.DEBUG
 	}
 
 	bot.logger = slog.CreateLogger().Level(level).Prefix("BOT")
 	bot.logger.AddWriter(bot.logger.CreateJsonStdoutWriter())
-	if opts.WriteToFile {
+	if settings.WriteToFile {
-		path := fmt.Sprintf("%s/main.log", strings.TrimRight(opts.LoggerBasePath, "/"))
+		path := fmt.Sprintf("%s/main.log", strings.TrimRight(settings.LoggerBasePath, "/"))
 		fileWriter, err := bot.logger.CreateTextFileWriter(path)
 		if err != nil {
 			bot.logger.Fatal(err)
@@ -175,162 +105,167 @@ func (bot *Bot[T]) initLoggers(opts *BotOpts) {
 		bot.logger.AddWriter(fileWriter)
 	}
 
-	if opts.UseRequestLogger {
+	if settings.UseRequestLogger {
-		bot.RequestLogger = slog.CreateLogger().Level(level).Prefix("REQUESTS")
+		bot.requestLogger = slog.CreateLogger().Level(level).Prefix("REQUESTS")
-		bot.RequestLogger.AddWriter(bot.RequestLogger.CreateJsonStdoutWriter())
+		bot.requestLogger.AddWriter(bot.requestLogger.CreateJsonStdoutWriter())
-		if opts.WriteToFile {
+		if settings.WriteToFile {
-			path := fmt.Sprintf("%s/requests.log", strings.TrimRight(opts.LoggerBasePath, "/"))
+			path := fmt.Sprintf("%s/requests.log", strings.TrimRight(settings.LoggerBasePath, "/"))
-			fileWriter, err := bot.RequestLogger.CreateTextFileWriter(path)
+			fileWriter, err := bot.requestLogger.CreateTextFileWriter(path)
 			if err != nil {
 				bot.logger.Fatal(err)
 			}
-			bot.RequestLogger.AddWriter(fileWriter)
+			bot.requestLogger.AddWriter(fileWriter)
 		}
 	}
-}
 
-func (bot *Bot[T]) GetUpdateOffset() int {
+	u, err := bot.GetMe()
-	bot.updateOffsetMu.Lock()
+	if err != nil {
-	defer bot.updateOffsetMu.Unlock()
+		bot.logger.Fatal(err)
-	return bot.updateOffset
-}
-func (bot *Bot[T]) SetUpdateOffset(offset int) {
-	bot.updateOffsetMu.Lock()
-	defer bot.updateOffsetMu.Unlock()
-	bot.updateOffset = offset
-}
-func (bot *Bot[T]) GetUpdateTypes() []tgapi.UpdateType { return bot.updateTypes }
-func (bot *Bot[T]) GetLogger() *slog.Logger            { return bot.logger }
-func (bot *Bot[T]) GetDBContext() *T                   { return bot.dbContext }
-func (bot *Bot[T]) L10n(lang, key string) string       { return bot.l10n.Translate(lang, key) }
-
-type DbLogger[T DbContext] func(db *T) slog.LoggerWriter
-
-func (bot *Bot[T]) AddDatabaseLoggerWriter(writer DbLogger[T]) *Bot[T] {
-	w := writer(bot.dbContext)
-	bot.logger.AddWriter(w)
-	if bot.RequestLogger != nil {
-		bot.RequestLogger.AddWriter(w)
-	}
-	for _, l := range bot.extraLoggers {
-		l.AddWriter(w)
 	}
+	bot.logger.Infof("Authorized as %s\n", u.FirstName)
+
 	return bot
 }
 
-func (bot *Bot[T]) DatabaseContext(ctx *T) *Bot[T] {
+func (b *Bot) Close() {
-	bot.dbContext = ctx
+	err := b.logger.Close()
-	return bot
+	if err != nil {
+		log.Println(err)
+	}
+	err = b.requestLogger.Close()
+	if err != nil {
+		log.Println(err)
+	}
 }
-func (bot *Bot[T]) UpdateTypes(t ...tgapi.UpdateType) *Bot[T] {
+
-	bot.updateTypes = make([]tgapi.UpdateType, 0)
+type DatabaseContext struct {
-	bot.updateTypes = append(bot.updateTypes, t...)
+	PostgresSQL *sqlx.DB
-	return bot
+	MongoDB     *mongo.Client
+	Redis       *redis.Client
 }
-func (bot *Bot[T]) AddUpdateType(t ...tgapi.UpdateType) *Bot[T] {
+
-	bot.updateTypes = append(bot.updateTypes, t...)
+func (b *Bot) AddDatabaseLogger(writer func(db *DatabaseContext) slog.LoggerWriter) *Bot {
-	return bot
+	w := writer(b.dbContext)
+	b.logger.AddWriter(w)
+	if b.requestLogger != nil {
+		b.requestLogger.AddWriter(w)
+	}
+	return b
 }
-func (bot *Bot[T]) AddPrefixes(prefixes ...string) *Bot[T] {
+
-	bot.prefixes = append(bot.prefixes, prefixes...)
+func (b *Bot) DatabaseContext(ctx *DatabaseContext) *Bot {
-	return bot
+	b.dbContext = ctx
+	return b
 }
-func (bot *Bot[T]) ErrorTemplate(s string) *Bot[T] {
+func (b *Bot) UpdateTypes(t ...string) *Bot {
-	bot.errorTemplate = s
+	b.updateTypes = make([]string, 0)
-	return bot
+	b.updateTypes = append(b.updateTypes, t...)
+	return b
 }
-func (bot *Bot[T]) Debug(debug bool) *Bot[T] {
+func (b *Bot) AddUpdateType(t ...string) *Bot {
-	bot.debug = debug
+	b.updateTypes = append(b.updateTypes, t...)
-	return bot
+	return b
 }
-func (bot *Bot[T]) AddPlugins(plugin ...*Plugin[T]) *Bot[T] {
+func (b *Bot) AddPrefixes(prefixes ...string) *Bot {
+	b.prefixes = append(b.prefixes, prefixes...)
+	return b
+}
+func (b *Bot) ErrorTemplate(s string) *Bot {
+	b.errorTemplate = s
+	return b
+}
+func (b *Bot) Debug(debug bool) *Bot {
+	b.debug = debug
+	return b
+}
+func (b *Bot) AddPlugins(plugin ...Plugin) *Bot {
+	b.plugins = append(b.plugins, plugin...)
 	for _, p := range plugin {
-		bot.plugins = append(bot.plugins, *p)
+		b.logger.Debugln(fmt.Sprintf("plugins with name \"%s\" registered", p.Name))
-		bot.logger.Debugln(fmt.Sprintf("plugins with name \"%s\" registered", p.name))
 	}
-	return bot
+	return b
 }
-func (bot *Bot[T]) AddMiddleware(middleware ...Middleware[T]) *Bot[T] {
+func (b *Bot) AddMiddleware(middleware ...Middleware) *Bot {
-	bot.middlewares = append(bot.middlewares, middleware...)
+	b.middlewares = append(b.middlewares, middleware...)
 	for _, m := range middleware {
-		bot.logger.Debugln(fmt.Sprintf("middleware with name \"%s\" registered", m.name))
+		b.logger.Debugln(fmt.Sprintf("middleware with name \"%s\" registered", m.Name))
 	}
 
-	sort.Slice(bot.middlewares, func(i, j int) bool {
+	sort.Slice(b.middlewares, func(i, j int) bool {
-		first := bot.middlewares[i]
+		first := b.middlewares[i]
-		second := bot.middlewares[j]
+		second := b.middlewares[j]
-		if first.order == second.order {
+		if first.Order == second.Order {
-			return first.name < second.name
+			return first.Name < second.Name
 		}
-		return first.order < second.order
+		return first.Order < second.Order
 	})
 
-	return bot
+	return b
 }
-func (bot *Bot[T]) AddRunner(runner Runner[T]) *Bot[T] {
+func (b *Bot) AddRunner(runner Runner) *Bot {
-	bot.runners = append(bot.runners, runner)
+	b.runners = append(b.runners, runner)
-	bot.logger.Debugln(fmt.Sprintf("runner with name \"%s\" registered", runner.name))
+	b.logger.Debugln(fmt.Sprintf("runner with name \"%s\" registered", runner.Name))
-	return bot
+	return b
 }
-func (bot *Bot[T]) AddL10n(l *L10n) *Bot[T] {
+func (b *Bot) Logger() *slog.Logger {
-	bot.l10n = l
+	return b.logger
-	return bot
+}
+func (b *Bot) GetDBContext() *DatabaseContext {
+	return b.dbContext
 }
 
-func (bot *Bot[T]) enqueueUpdate(u *tgapi.Update) error {
+func (b *Bot) Run() {
-	select {
+	if len(b.prefixes) == 0 {
-	case bot.updateQueue <- u:
+		b.logger.Fatalln("no prefixes defined")
-		return nil
-	default:
-		return extypes.QueueFullErr
-	}
-}
-func (bot *Bot[T]) RunWithContext(ctx context.Context) {
-	if len(bot.prefixes) == 0 {
-		bot.logger.Fatalln("no prefixes defined")
 		return
 	}
 
-	if len(bot.plugins) == 0 {
+	if len(b.plugins) == 0 {
-		bot.logger.Fatalln("no plugins defined")
+		b.logger.Fatalln("no plugins defined")
 		return
 	}
 
-	bot.ExecRunners()
+	b.logger.Infoln("Executing runners...")
+	b.ExecRunners()
 
-	bot.logger.Infoln("Bot running. Press CTRL+C to exit.")
+	b.logger.Infoln("Bot running. Press CTRL+C to exit.")
 	go func() {
 		for {
-			select {
+			_, err := b.Updates()
-			case <-ctx.Done():
-				return
-			default:
-				updates, err := bot.Updates()
 			if err != nil {
-					bot.logger.Errorln(err)
+				b.logger.Errorln(err)
-					continue
-				}
-
-				for _, u := range updates {
-					select {
-					case bot.updateQueue <- new(u):
-					case <-ctx.Done():
-						return
-					}
-				}
 			}
 		}
 	}()
 
-	pool := pond.NewPool(16)
+	for {
-	for update := range bot.updateQueue {
+		queue := b.updateQueue
-		update := update
+		if queue.IsEmpty() {
-		log.Println(update)
+			time.Sleep(time.Millisecond * 25)
-		pool.Submit(func() {
+			continue
-			bot.handle(update)
+		}
-		})
+
+		u := queue.Dequeue()
+		if u == nil {
+			b.logger.Errorln("update is nil")
+			continue
+		}
+
+		ctx := &MsgContext{Bot: b, Update: u}
+		for _, middleware := range b.middlewares {
+			middleware.Execute(ctx, b.dbContext)
+		}
+
+		for _, plugin := range b.plugins {
+			if plugin.UpdateListener != nil {
+				(*plugin.UpdateListener)(ctx, b.dbContext)
+			}
+		}
+
+		if u.CallbackQuery != nil {
+			b.handleCallback(u, ctx)
+		} else {
+			b.handleMessage(u, ctx)
+		}
 	}
 }
-func (bot *Bot[T]) Run() {
-	bot.RunWithContext(context.Background())
-}

cmd_generator.go

@@ -1,72 +0,0 @@
-package laniakea
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
-)
-
-func generateBotCommand[T any](cmd Command[T]) tgapi.BotCommand {
-	desc := cmd.command
-	if len(cmd.description) > 0 {
-		desc = cmd.description
-	}
-	var descArgs []string
-	for _, a := range cmd.args {
-		if a.required {
-			descArgs = append(descArgs, fmt.Sprintf("%s", a.text))
-		} else {
-			descArgs = append(descArgs, fmt.Sprintf("[%s]", a.text))
-		}
-	}
-	desc = fmt.Sprintf("%s. Usage: /%s %s", desc, cmd.command, strings.Join(descArgs, " "))
-	return tgapi.BotCommand{Command: cmd.command, Description: desc}
-}
-
-func generateBotCommandForPlugin[T any](pl Plugin[T]) []tgapi.BotCommand {
-	commands := make([]tgapi.BotCommand, 0)
-	for _, cmd := range pl.commands {
-		if cmd.skipAutoCmd {
-			continue
-		}
-		commands = append(commands, generateBotCommand(cmd))
-	}
-	return commands
-}
-
-var ErrTooManyCommands = errors.New("too many commands. max 100")
-
-func (bot *Bot[T]) AutoGenerateCommands() error {
-	_, err := bot.api.DeleteMyCommands(tgapi.DeleteMyCommandsP{})
-	if err != nil {
-		return err
-	}
-
-	commands := make([]tgapi.BotCommand, 0)
-	for _, pl := range bot.plugins {
-		if pl.skipAutoCmd {
-			continue
-		}
-
-		commands = append(commands, generateBotCommandForPlugin(pl)...)
-	}
-	if len(commands) > 100 {
-		return ErrTooManyCommands
-	}
-
-	privateChatsScope := &tgapi.BotCommandScope{Type: tgapi.BotCommandScopePrivateType}
-	groupChatsScope := &tgapi.BotCommandScope{Type: tgapi.BotCommandScopeGroupType}
-	chatAdminsScope := &tgapi.BotCommandScope{Type: tgapi.BotCommandScopeAllChatAdministratorsType}
-	_, err = bot.api.SetMyCommands(tgapi.SetMyCommandsP{Commands: commands, Scope: privateChatsScope})
-	if err != nil {
-		return err
-	}
-	_, err = bot.api.SetMyCommands(tgapi.SetMyCommandsP{Commands: commands, Scope: groupChatsScope})
-	if err != nil {
-		return err
-	}
-	_, err = bot.api.SetMyCommands(tgapi.SetMyCommandsP{Commands: commands, Scope: chatAdminsScope})
-	return err
-}

go.mod

@@ -1,17 +1,29 @@
 module git.nix13.pw/scuroneko/laniakea
 
-go 1.26
+go 1.25.6
 
 require (
-	git.nix13.pw/scuroneko/extypes v1.2.1
+	git.nix13.pw/scuroneko/extypes v1.0.2
 	git.nix13.pw/scuroneko/slog v1.0.2
-	github.com/alitto/pond/v2 v2.6.2
+	github.com/redis/go-redis/v9 v9.17.3
-	golang.org/x/time v0.14.0
+	github.com/vinovest/sqlx v1.7.1
+	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/klauspost/compress v1.18.3 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.41.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.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.47.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
 )

go.sum

@@ -1,17 +1,87 @@
-git.nix13.pw/scuroneko/extypes v1.2.1 h1:IYrOjnWKL2EAuJYtYNa+luB1vBe6paE8VY/YD+5/RpQ=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-git.nix13.pw/scuroneko/extypes v1.2.1/go.mod h1:uZVs8Yo3RrYAG9dMad6qR6lsYY67t+459D9c65QAYAw=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+git.nix13.pw/scuroneko/extypes v1.0.2 h1:Qz1InLccaB9crXY33oGrSetPHePKfQAUqW/p/iYXmJk=
+git.nix13.pw/scuroneko/extypes v1.0.2/go.mod h1:uZVs8Yo3RrYAG9dMad6qR6lsYY67t+459D9c65QAYAw=
 git.nix13.pw/scuroneko/slog v1.0.2 h1:vZyUROygxC2d5FJHUQM/30xFEHY1JT/aweDZXA4rm2g=
 git.nix13.pw/scuroneko/slog v1.0.2/go.mod h1:3Qm2wzkR5KjwOponMfG7TcGSDjmYaFqRAmLvSPTuWJI=
-github.com/alitto/pond/v2 v2.6.2 h1:Sphe40g0ILeM1pA2c2K+Th0DGU+pt0A/Kprr+WB24Pw=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/alitto/pond/v2 v2.6.2/go.mod h1:xkjYEgQ05RSpWdfSd1nM3OVv7TBhLdy7rMp3+2Nq+yE=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 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/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.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=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 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.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.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.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.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.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.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=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+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.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=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

handler.go

@@ -1,27 +1,11 @@
 package laniakea
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"strings"
-
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
 )
 
-func (bot *Bot[T]) handle(u *tgapi.Update) {
+func (b *Bot) handleMessage(update *Update, ctx *MsgContext) {
-	ctx := &MsgContext{Update: *u, Api: bot.api, botLogger: bot.logger, errorTemplate: bot.errorTemplate, l10n: bot.l10n}
-	for _, middleware := range bot.middlewares {
-		middleware.Execute(ctx, bot.dbContext)
-	}
-
-	if u.CallbackQuery != nil {
-		bot.handleCallback(u, ctx)
-	} else {
-		bot.handleMessage(u, ctx)
-	}
-}
-
-func (bot *Bot[T]) handleMessage(update *tgapi.Update, ctx *MsgContext) {
 	if update.Message == nil {
 		return
 	}
@@ -34,7 +18,7 @@ func (bot *Bot[T]) handleMessage(update *tgapi.Update, ctx *MsgContext) {
 	}
 
 	text = strings.TrimSpace(text)
-	prefix, hasPrefix := bot.checkPrefixes(text)
+	prefix, hasPrefix := b.checkPrefixes(text)
 	if !hasPrefix {
 		return
 	}
@@ -45,104 +29,59 @@ func (bot *Bot[T]) handleMessage(update *tgapi.Update, ctx *MsgContext) {
 
 	text = strings.TrimSpace(text[len(prefix):])
 
-	for _, plugin := range bot.plugins {
+	for _, plugin := range b.plugins {
-		for cmd := range plugin.commands {
+		// Check every command
+		for cmd := range plugin.Commands {
 			if !strings.HasPrefix(text, cmd) {
 				continue
 			}
-			requestParts := strings.Split(text, " ")
-			cmdParts := strings.Split(cmd, " ")
-			isValid := true
-			for i, part := range cmdParts {
-				if part != requestParts[i] {
-					isValid = false
-					break
-				}
-			}
-
-			if !isValid {
-				continue
-			}
 
 			ctx.Text = strings.TrimSpace(text[len(cmd):])
-			if ctx.Text == "" {
-				ctx.Args = []string{}
-			} else {
 			ctx.Args = strings.Split(ctx.Text, " ")
-			}
 
-			if !plugin.executeMiddlewares(ctx, bot.dbContext) {
+			if !plugin.executeMiddlewares(ctx, b.dbContext) {
 				return
 			}
-			go plugin.executeCmd(cmd, ctx, bot.dbContext)
+			go plugin.Execute(cmd, ctx, b.dbContext)
 			return
 		}
 	}
 }
 
-func (bot *Bot[T]) handleCallback(update *tgapi.Update, ctx *MsgContext) {
+func (b *Bot) handleCallback(update *Update, ctx *MsgContext) {
 	data := new(CallbackData)
 	err := json.Unmarshal([]byte(update.CallbackQuery.Data), data)
 	if err != nil {
-		bot.logger.Errorln(err)
+		b.logger.Errorln(err)
 		return
 	}
 
 	ctx.FromID = update.CallbackQuery.From.ID
-	ctx.From = &update.CallbackQuery.From
+	ctx.From = update.CallbackQuery.From
-	ctx.Msg = &update.CallbackQuery.Message
+	ctx.Msg = update.CallbackQuery.Message
 	ctx.CallbackMsgId = update.CallbackQuery.Message.MessageID
 	ctx.CallbackQueryId = update.CallbackQuery.ID
 	ctx.Args = data.Args
 
-	for _, plugin := range bot.plugins {
+	for _, plugin := range b.plugins {
-		_, ok := plugin.payloads[data.Command]
+		_, ok := plugin.Payloads[data.Command]
 		if !ok {
 			continue
 		}
 
-		if !plugin.executeMiddlewares(ctx, bot.dbContext) {
+		if !plugin.executeMiddlewares(ctx, b.dbContext) {
 			return
 		}
-		go plugin.executePayload(data.Command, ctx, bot.dbContext)
+		go plugin.ExecutePayload(data.Command, ctx, b.dbContext)
 		return
 	}
 }
 
-func (bot *Bot[T]) checkPrefixes(text string) (string, bool) {
+func (b *Bot) checkPrefixes(text string) (string, bool) {
-	for _, prefix := range bot.prefixes {
+	for _, prefix := range b.prefixes {
 		if strings.HasPrefix(text, prefix) {
 			return prefix, true
 		}
 	}
 	return "", false
 }
-
-func encodeJsonPayload(d CallbackData) (string, error) {
-	b, err := json.Marshal(d)
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}
-func decodeJsonPayload(s string) (CallbackData, error) {
-	var data CallbackData
-	err := json.Unmarshal([]byte(s), &data)
-	return data, err
-}
-func encodeBase64Payload(d CallbackData) (string, error) {
-	data, err := encodeJsonPayload(d)
-	if err != nil {
-		return "", err
-	}
-	dst := make([]byte, base64.StdEncoding.EncodedLen(len([]byte(data))))
-	base64.StdEncoding.Encode(dst, []byte(data))
-	return string(dst), nil
-}
-func decodeBase64Payload(s string) (CallbackData, error) {
-	b, err := base64.StdEncoding.DecodeString(s)
-	if err != nil {
-		return CallbackData{}, err
-	}
-	return decodeJsonPayload(string(b))
-}

keyboard.go

@@ -3,111 +3,51 @@ package laniakea
 import (
 	"encoding/json"
 	"fmt"
-
-	"git.nix13.pw/scuroneko/extypes"
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
 )
 
-const (
-	ButtonStyleDanger  tgapi.KeyboardButtonStyle = "danger"
-	ButtonStyleSuccess tgapi.KeyboardButtonStyle = "success"
-	ButtonStylePrimary tgapi.KeyboardButtonStyle = "primary"
-)
-
-type InlineKbButtonBuilder struct {
-	text              string
-	iconCustomEmojiID string
-	style             tgapi.KeyboardButtonStyle
-	url               string
-	callbackData      string
-}
-
-func NewInlineKbButton(text string) InlineKbButtonBuilder {
-	return InlineKbButtonBuilder{text: text}
-}
-func (b InlineKbButtonBuilder) SetIconCustomEmojiId(id string) InlineKbButtonBuilder {
-	b.iconCustomEmojiID = id
-	return b
-}
-func (b InlineKbButtonBuilder) SetStyle(style tgapi.KeyboardButtonStyle) InlineKbButtonBuilder {
-	b.style = style
-	return b
-}
-func (b InlineKbButtonBuilder) SetUrl(url string) InlineKbButtonBuilder {
-	b.url = url
-	return b
-}
-func (b InlineKbButtonBuilder) SetCallbackData(cmd string, args ...any) InlineKbButtonBuilder {
-	b.callbackData = NewCallbackData(cmd, args...).ToJson()
-	return b
-}
-
-func (b InlineKbButtonBuilder) build() tgapi.InlineKeyboardButton {
-	return tgapi.InlineKeyboardButton{
-		Text:              b.text,
-		URL:               b.url,
-		Style:             b.style,
-		IconCustomEmojiID: b.iconCustomEmojiID,
-		CallbackData:      b.callbackData,
-	}
-}
-
 type InlineKeyboard struct {
-	CurrentLine extypes.Slice[tgapi.InlineKeyboardButton]
+	CurrentLine []InlineKeyboardButton
-	Lines       [][]tgapi.InlineKeyboardButton
+	Lines       [][]InlineKeyboardButton
 	maxRow      int
 }
 
 func NewInlineKeyboard(maxRow int) *InlineKeyboard {
 	return &InlineKeyboard{
-		CurrentLine: make(extypes.Slice[tgapi.InlineKeyboardButton], 0),
+		CurrentLine: make([]InlineKeyboardButton, 0),
-		Lines:       make([][]tgapi.InlineKeyboardButton, 0),
+		Lines:       make([][]InlineKeyboardButton, 0),
 		maxRow:      maxRow,
 	}
 }
 
-func (in *InlineKeyboard) append(button tgapi.InlineKeyboardButton) *InlineKeyboard {
+func (in *InlineKeyboard) append(button InlineKeyboardButton) *InlineKeyboard {
-	if in.CurrentLine.Len() == in.maxRow {
+	if len(in.CurrentLine) == in.maxRow {
 		in.AddLine()
 	}
-	in.CurrentLine = in.CurrentLine.Push(button)
+	in.CurrentLine = append(in.CurrentLine, button)
 	return in
 }
-
 func (in *InlineKeyboard) AddUrlButton(text, url string) *InlineKeyboard {
-	return in.append(tgapi.InlineKeyboardButton{Text: text, URL: url})
+	return in.append(InlineKeyboardButton{Text: text, URL: url})
-}
-func (in *InlineKeyboard) AddUrlButtonStyle(text string, style tgapi.KeyboardButtonStyle, url string) *InlineKeyboard {
-	return in.append(tgapi.InlineKeyboardButton{Text: text, Style: style, URL: url})
 }
 func (in *InlineKeyboard) AddCallbackButton(text string, cmd string, args ...any) *InlineKeyboard {
-	return in.append(tgapi.InlineKeyboardButton{
+	return in.append(InlineKeyboardButton{Text: text, CallbackData: NewCallbackData(cmd, args...).ToJson()})
-		Text: text, CallbackData: NewCallbackData(cmd, args...).ToJson(),
-	})
-}
-func (in *InlineKeyboard) AddCallbackButtonStyle(text string, style tgapi.KeyboardButtonStyle, cmd string, args ...any) *InlineKeyboard {
-	return in.append(tgapi.InlineKeyboardButton{
-		Text: text, Style: style,
-		CallbackData: NewCallbackData(cmd, args...).ToJson(),
-	})
-}
-func (in *InlineKeyboard) AddButton(b InlineKbButtonBuilder) *InlineKeyboard {
-	return in.append(b.build())
 }
 
 func (in *InlineKeyboard) AddLine() *InlineKeyboard {
-	if in.CurrentLine.Len() == 0 {
+	if len(in.CurrentLine) == 0 {
 		return in
 	}
 	in.Lines = append(in.Lines, in.CurrentLine)
-	in.CurrentLine = make(extypes.Slice[tgapi.InlineKeyboardButton], 0)
+	in.CurrentLine = make([]InlineKeyboardButton, 0)
 	return in
 }
-func (in *InlineKeyboard) Get() *tgapi.ReplyMarkup {
+func (in *InlineKeyboard) Get() InlineKeyboardMarkup {
-	if in.CurrentLine.Len() > 0 {
+	if len(in.CurrentLine) > 0 {
 		in.Lines = append(in.Lines, in.CurrentLine)
 	}
-	return &tgapi.ReplyMarkup{InlineKeyboard: in.Lines}
+	return InlineKeyboardMarkup{
+		InlineKeyboard: in.Lines,
+	}
 }
 
 type CallbackData struct {

l10n.go

@@ -1,26 +0,0 @@
-package laniakea
-
-// DictEntry {key:{ru:123,en:123}}
-type DictEntry map[string]string
-type L10n struct {
-	entries      map[string]DictEntry
-	fallbackLang string
-}
-
-func NewL10n(fallbackLanguage string) *L10n {
-	return &L10n{make(map[string]DictEntry), fallbackLanguage}
-}
-func (l *L10n) AddDictEntry(key string, value DictEntry) *L10n {
-	l.entries[key] = value
-	return l
-}
-func (l *L10n) GetFallbackLanguage() string {
-	return l.fallbackLang
-}
-func (l *L10n) Translate(lang, key string) string {
-	s, ok := l.entries[key]
-	if !ok {
-		return key
-	}
-	return s[lang]
-}

methods.go

@@ -2,34 +2,242 @@ package laniakea
 
 import (
 	"encoding/json"
-
+	"fmt"
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
 )
 
-func (bot *Bot[T]) Updates() ([]tgapi.Update, error) {
+type EmptyParams struct{}
-	offset := bot.GetUpdateOffset()
+
-	params := tgapi.UpdateParams{
+var NoParams = EmptyParams{}
-		Offset:         Ptr(offset),
+
-		Timeout:        Ptr(30),
+type UpdateParams struct {
-		AllowedUpdates: bot.GetUpdateTypes(),
+	Offset         int      `json:"offset"`
+	Timeout        int      `json:"timeout"`
+	AllowedUpdates []string `json:"allowed_updates"`
+}
+
+func (b *Bot) Updates() ([]*Update, error) {
+	params := UpdateParams{
+		Offset:         b.updateOffset,
+		Timeout:        30,
+		AllowedUpdates: b.updateTypes,
 	}
 
-	updates, err := bot.api.GetUpdates(params)
+	req := NewRequest[[]*Update]("getUpdates", params)
+	res, err := req.Do(b)
 	if err != nil {
-		return nil, err
+		return []*Update{}, err
+	}
+	updates := *res
+
+	for _, u := range updates {
+		b.updateOffset = u.UpdateID + 1
+		err = b.updateQueue.Enqueue(u)
+		if err != nil {
+			return updates, err
 		}
 
-	if bot.RequestLogger != nil {
+		if b.debug && b.requestLogger != nil {
-		for _, u := range updates {
 			j, err := json.Marshal(u)
 			if err != nil {
-				bot.GetLogger().Error(err)
+				b.logger.Error(err)
 			}
-			bot.RequestLogger.Debugf("UPDATE %s\n", j)
+			b.requestLogger.Debugln(fmt.Sprintf("UPDATE %s", j))
 		}
 	}
-	if len(updates) > 0 {
-		bot.SetUpdateOffset(updates[len(updates)-1].UpdateID + 1)
-	}
 	return updates, err
 }
+
+func (b *Bot) GetMe() (*User, error) {
+	req := NewRequest[User, EmptyParams]("getMe", NoParams)
+	return req.Do(b)
+}
+
+type SendMessageP struct {
+	BusinessConnectionID string               `json:"business_connection_id,omitempty"`
+	ChatID               int                  `json:"chat_id"`
+	MessageThreadID      int                  `json:"message_thread_id,omitempty"`
+	ParseMode            ParseMode            `json:"parse_mode,omitempty"`
+	Text                 string               `json:"text"`
+	Entities             []*MessageEntity     `json:"entities,omitempty"`
+	LinkPreviewOptions   *LinkPreviewOptions  `json:"link_preview_options,omitempty"`
+	DisableNotifications bool                 `json:"disable_notifications,omitempty"`
+	ProtectContent       bool                 `json:"protect_content,omitempty"`
+	AllowPaidBroadcast   bool                 `json:"allow_paid_broadcast,omitempty"`
+	MessageEffectID      string               `json:"message_effect_id,omitempty"`
+	ReplyParameters      *ReplyParameters     `json:"reply_parameters,omitempty"`
+	ReplyMarkup          InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+}
+
+func (b *Bot) SendMessage(params *SendMessageP) (*Message, error) {
+	req := NewRequest[Message, SendMessageP]("sendMessage", *params)
+	return req.Do(b)
+}
+
+type SendPhotoBaseP struct {
+	BusinessConnectionID  string                `json:"business_connection_id,omitempty"`
+	ChatID                int                   `json:"chat_id"`
+	MessageThreadID       int                   `json:"message_thread_id,omitempty"`
+	ParseMode             ParseMode             `json:"parse_mode,omitempty"`
+	Caption               string                `json:"caption,omitempty"`
+	CaptionEntities       []*MessageEntity      `json:"caption_entities,omitempty"`
+	ShowCaptionAboveMedia bool                  `json:"show_caption_above_media,omitempty"`
+	HasSpoiler            bool                  `json:"has_spoiler,omitempty"`
+	DisableNotifications  bool                  `json:"disable_notifications,omitempty"`
+	ProtectContent        bool                  `json:"protect_content,omitempty"`
+	AllowPaidBroadcast    bool                  `json:"allow_paid_broadcast,omitempty"`
+	MessageEffectID       string                `json:"message_effect_id,omitempty"`
+	ReplyMarkup           *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+}
+type SendPhotoP struct {
+	BusinessConnectionID  string               `json:"business_connection_id,omitempty"`
+	ChatID                int                  `json:"chat_id"`
+	MessageThreadID       int                  `json:"message_thread_id,omitempty"`
+	ParseMode             ParseMode            `json:"parse_mode,omitempty"`
+	Caption               string               `json:"caption,omitempty"`
+	CaptionEntities       []*MessageEntity     `json:"caption_entities,omitempty"`
+	ShowCaptionAboveMedia bool                 `json:"show_caption_above_media,omitempty"`
+	HasSpoiler            bool                 `json:"has_spoiler,omitempty"`
+	DisableNotifications  bool                 `json:"disable_notifications,omitempty"`
+	ProtectContent        bool                 `json:"protect_content,omitempty"`
+	AllowPaidBroadcast    bool                 `json:"allow_paid_broadcast,omitempty"`
+	MessageEffectID       string               `json:"message_effect_id,omitempty"`
+	ReplyMarkup           InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+	Photo                 string               `json:"photo"`
+}
+
+func (b *Bot) SendPhoto(params *SendPhotoP) (*Message, error) {
+	req := NewRequest[Message]("sendPhoto", params)
+	return req.Do(b)
+}
+
+type EditMessageTextP struct {
+	BusinessConnectionID string               `json:"business_connection_id,omitempty"`
+	ChatID               int                  `json:"chat_id,omitempty"`
+	MessageID            int                  `json:"message_id,omitempty"`
+	InlineMessageID      string               `json:"inline_message_id,omitempty"`
+	Text                 string               `json:"text"`
+	ParseMode            ParseMode            `json:"parse_mode,omitempty"`
+	ReplyMarkup          InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+}
+
+func (b *Bot) EditMessageText(params *EditMessageTextP) (*Message, error) {
+	req := NewRequest[Message]("editMessageText", params)
+	return req.Do(b)
+}
+
+type EditMessageCaptionP struct {
+	BusinessConnectionID string               `json:"business_connection_id,omitempty"`
+	ChatID               int                  `json:"chat_id,omitempty"`
+	MessageID            int                  `json:"message_id,omitempty"`
+	InlineMessageID      string               `json:"inline_message_id,omitempty"`
+	Caption              string               `json:"caption"`
+	ParseMode            ParseMode            `json:"parse_mode,omitempty"`
+	ReplyMarkup          InlineKeyboardMarkup `json:"reply_markup,omitempty"`
+}
+
+func (b *Bot) EditMessageCaption(params *EditMessageCaptionP) (*Message, error) {
+	req := NewRequest[Message]("editMessageCaption", params)
+	return req.Do(b)
+}
+
+type DeleteMessageP struct {
+	ChatID    int `json:"chat_id"`
+	MessageID int `json:"message_id"`
+}
+
+func (b *Bot) DeleteMessage(params *DeleteMessageP) (bool, error) {
+	req := NewRequest[bool]("deleteMessage", params)
+	ok, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *ok, err
+}
+
+type AnswerCallbackQueryP struct {
+	CallbackQueryID string `json:"callback_query_id"`
+	Text            string `json:"text,omitempty"`
+	ShowAlert       bool   `json:"show_alert,omitempty"`
+	URL             string `json:"url,omitempty"`
+	CacheTime       int    `json:"cache_time,omitempty"`
+}
+
+func (b *Bot) AnswerCallbackQuery(params *AnswerCallbackQueryP) (bool, error) {
+	req := NewRequest[bool]("answerCallbackQuery", params)
+	ok, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *ok, err
+}
+
+type GetFileP struct {
+	FileId string `json:"file_id"`
+}
+
+func (b *Bot) GetFile(params *GetFileP) (*File, error) {
+	req := NewRequest[File]("getFile", params)
+	return req.Do(b)
+}
+
+type SendChatActionP struct {
+	BusinessConnectionID string      `json:"business_connection_id,omitempty"`
+	ChatID               int         `json:"chat_id"`
+	MessageThreadID      int         `json:"message_thread_id,omitempty"`
+	Action               ChatActions `json:"action"`
+}
+
+func (b *Bot) SendChatAction(params SendChatActionP) (bool, error) {
+	req := NewRequest[bool]("sendChatAction", params)
+	res, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *res, err
+}
+
+type SetMessageReactionP struct {
+	ChatId    int  `json:"chat_id"`
+	MessageId int  `json:"message_id"`
+	IsBig     bool `json:"is_big,omitempty"`
+}
+type SetMessageReactionEmojiP struct {
+	SetMessageReactionP
+	Reaction []ReactionTypeEmoji `json:"reaction"`
+}
+
+func (b *Bot) SetMessageReactionEmoji(params SetMessageReactionEmojiP) (bool, error) {
+	req := NewRequest[bool]("setMessageReaction", params)
+	res, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *res, err
+}
+
+type SetMessageReactionCustomEmojiP struct {
+	SetMessageReactionP
+	Reaction []ReactionTypeCustomEmoji `json:"reaction"`
+}
+
+func (b *Bot) SetMessageReactionCustom(params SetMessageReactionCustomEmojiP) (bool, error) {
+	req := NewRequest[bool]("setMessageReaction", params)
+	res, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *res, err
+}
+
+type SetMessageReactionPaidP struct {
+	SetMessageReactionP
+}
+
+func (b *Bot) SetMessageReactionPaid(params SetMessageReactionPaidP) (bool, error) {
+	req := NewRequest[bool]("setMessageReaction", params)
+	res, err := req.Do(b)
+	if err != nil {
+		return false, err
+	}
+	return *res, err
+}

msg_context.go

@@ -1,51 +1,41 @@
 package laniakea
 
-import (
+import "fmt"
-	"fmt"
-
-	"git.nix13.pw/scuroneko/laniakea/tgapi"
-	"git.nix13.pw/scuroneko/laniakea/utils"
-	"git.nix13.pw/scuroneko/slog"
-)
 
 type MsgContext struct {
-	Api *tgapi.API
+	Bot             *Bot
-
+	Msg             *Message
-	Msg             *tgapi.Message
+	Update          *Update
-	Update          tgapi.Update
+	From            *User
-	From            *tgapi.User
 	CallbackMsgId   int
 	CallbackQueryId string
 	FromID          int
 	Prefix          string
 	Text            string
 	Args            []string
-
-	errorTemplate string
-	botLogger     *slog.Logger
-	l10n          *L10n
 }
 
 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 := tgapi.EditMessageTextP{
+	params := &EditMessageTextP{
 		MessageID: messageId,
 		ChatID:    ctx.Msg.Chat.ID,
 		Text:      text,
-		ParseMode: tgapi.ParseMD,
+		ParseMode: ParseMD,
 	}
 	if keyboard != nil {
 		params.ReplyMarkup = keyboard.Get()
 	}
-	msg, _, err := ctx.Api.EditMessageText(params)
+	msg, err := ctx.Bot.EditMessageText(params)
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 		return nil
 	}
 	return &AnswerMessage{
@@ -57,7 +47,7 @@ func (m *AnswerMessage) Edit(text string) *AnswerMessage {
 }
 func (ctx *MsgContext) EditCallback(text string, keyboard *InlineKeyboard) *AnswerMessage {
 	if ctx.CallbackMsgId == 0 {
-		ctx.botLogger.Errorln("Can't edit non-callback update message")
+		ctx.Bot.logger.Errorln("Can't edit non-callback update message")
 		return nil
 	}
 
@@ -68,18 +58,18 @@ func (ctx *MsgContext) EditCallbackf(format string, keyboard *InlineKeyboard, ar
 }
 
 func (ctx *MsgContext) editPhotoText(messageId int, text string, kb *InlineKeyboard) *AnswerMessage {
-	params := tgapi.EditMessageCaptionP{
+	params := &EditMessageCaptionP{
 		ChatID:    ctx.Msg.Chat.ID,
 		MessageID: messageId,
 		Caption:   text,
-		ParseMode: tgapi.ParseMD,
+		ParseMode: ParseMD,
 	}
 	if kb != nil {
 		params.ReplyMarkup = kb.Get()
 	}
-	msg, _, err := ctx.Api.EditMessageCaption(params)
+	msg, err := ctx.Bot.EditMessageCaption(params)
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 	}
 	return &AnswerMessage{
 		MessageID: msg.MessageID, ctx: ctx, Text: text, IsMedia: true,
@@ -87,7 +77,7 @@ func (ctx *MsgContext) editPhotoText(messageId int, text string, kb *InlineKeybo
 }
 func (m *AnswerMessage) EditCaption(text string) *AnswerMessage {
 	if m.MessageID == 0 {
-		m.ctx.botLogger.Errorln("Can't edit caption message, message id is zero")
+		m.ctx.Bot.logger.Errorln("Can't edit caption message, message id is zero")
 		return m
 	}
 	return m.ctx.editPhotoText(m.MessageID, text, nil)
@@ -97,18 +87,18 @@ func (m *AnswerMessage) EditCaptionKeyboard(text string, kb *InlineKeyboard) *An
 }
 
 func (ctx *MsgContext) answer(text string, keyboard *InlineKeyboard) *AnswerMessage {
-	params := tgapi.SendMessageP{
+	params := &SendMessageP{
 		ChatID:    ctx.Msg.Chat.ID,
 		Text:      text,
-		ParseMode: tgapi.ParseMD,
+		ParseMode: ParseMD,
 	}
 	if keyboard != nil {
 		params.ReplyMarkup = keyboard.Get()
 	}
 
-	msg, err := ctx.Api.SendMessage(params)
+	msg, err := ctx.Bot.SendMessage(params)
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 		return nil
 	}
 	return &AnswerMessage{
@@ -126,18 +116,18 @@ func (ctx *MsgContext) Keyboard(text string, kb *InlineKeyboard) *AnswerMessage
 }
 
 func (ctx *MsgContext) answerPhoto(photoId, text string, kb *InlineKeyboard) *AnswerMessage {
-	params := tgapi.SendPhotoP{
+	params := &SendPhotoP{
 		ChatID:    ctx.Msg.Chat.ID,
 		Caption:   text,
-		ParseMode: tgapi.ParseMD,
+		ParseMode: ParseMD,
 		Photo:     photoId,
 	}
 	if kb != nil {
 		params.ReplyMarkup = kb.Get()
 	}
-	msg, err := ctx.Api.SendPhoto(params)
+	msg, err := ctx.Bot.SendPhoto(params)
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 		return &AnswerMessage{
 			ctx: ctx, Text: text, IsMedia: true,
 		}
@@ -154,12 +144,12 @@ func (ctx *MsgContext) AnswerPhotoKeyboard(photoId, text string, kb *InlineKeybo
 }
 
 func (ctx *MsgContext) delete(messageId int) {
-	_, err := ctx.Api.DeleteMessage(tgapi.DeleteMessageP{
+	_, err := ctx.Bot.DeleteMessage(&DeleteMessageP{
 		ChatID:    ctx.Msg.Chat.ID,
 		MessageID: messageId,
 	})
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 	}
 }
 func (m *AnswerMessage) Delete() {
@@ -173,12 +163,12 @@ func (ctx *MsgContext) answerCallbackQuery(url, text string, showAlert bool) {
 	if len(ctx.CallbackQueryId) == 0 {
 		return
 	}
-	_, err := ctx.Api.AnswerCallbackQuery(tgapi.AnswerCallbackQueryP{
+	_, err := ctx.Bot.AnswerCallbackQuery(&AnswerCallbackQueryP{
 		CallbackQueryID: ctx.CallbackQueryId,
 		Text:            text, ShowAlert: showAlert, URL: url,
 	})
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 	}
 }
 func (ctx *MsgContext) AnswerCbQuery() {
@@ -194,33 +184,25 @@ func (ctx *MsgContext) AnswerCbQueryUrl(u string) {
 	ctx.answerCallbackQuery(u, "", false)
 }
 
-func (ctx *MsgContext) SendAction(action tgapi.ChatActionType) {
+func (ctx *MsgContext) SendAction(action ChatActions) {
-	_, err := ctx.Api.SendChatAction(tgapi.SendChatActionP{
+	_, err := ctx.Bot.SendChatAction(SendChatActionP{
 		ChatID: ctx.Msg.Chat.ID, Action: action,
 	})
 	if err != nil {
-		ctx.botLogger.Errorln(err)
+		ctx.Bot.logger.Errorln(err)
 	}
 }
 
 func (ctx *MsgContext) error(err error) {
-	text := fmt.Sprintf(ctx.errorTemplate, utils.EscapeMarkdown(err.Error()))
+	text := fmt.Sprintf(ctx.Bot.errorTemplate, EscapeMarkdown(err.Error()))
 
 	if ctx.CallbackQueryId != "" {
 		ctx.answerCallbackQuery("", text, false)
 	} else {
 		ctx.answer(text, nil)
 	}
-	ctx.botLogger.Errorln(err)
+	ctx.Bot.logger.Errorln(err)
 }
 func (ctx *MsgContext) Error(err error) {
 	ctx.error(err)
 }
-
-func (ctx *MsgContext) Translate(key string) string {
-	if ctx.From == nil {
-		return key
-	}
-	lang := Val(ctx.From.LanguageCode, ctx.l10n.GetFallbackLanguage())
-	return ctx.l10n.Translate(lang, key)
-}

multipart.go

@@ -1,4 +1,4 @@
-package utils
+package laniakea
 
 import (
 	"encoding/json"
@@ -78,6 +78,7 @@ func Encode[T any](w *multipart.Writer, req T) error {
 			if err == nil {
 				_, err = fw.Write([]byte(strconv.FormatBool(field.Bool())))
 			}
+
 		case reflect.Slice:
 			if field.Type().Elem().Kind() == reflect.Uint8 && !field.IsNil() {
 				filename := fieldType.Tag.Get("filename")

plugins.go

@@ -1,150 +1,84 @@
 package laniakea
 
 import (
-	"errors"
+	"log"
-	"regexp"
 
 	"git.nix13.pw/scuroneko/extypes"
 )
 
-const (
+type CommandExecutor func(ctx *MsgContext, dbContext *DatabaseContext)
-	CommandValueStringType CommandValueType = "string"
-	CommandValueIntType    CommandValueType = "int"
-	CommandValueBoolType   CommandValueType = "bool"
-	CommandValueAnyType    CommandValueType = "any"
-)
 
-var (
+type PluginBuilder struct {
-	CommandRegexInt    = regexp.MustCompile("\\d+")
-	CommandRegexString = regexp.MustCompile(".+")
-)
-
-var (
-	ErrCmdArgCountMismatch  = errors.New("command arg count mismatch")
-	ErrCmdArgRegexpMismatch = errors.New("command arg regexp mismatch")
-)
-
-type CommandValueType string
-type CommandArg struct {
-	valueType CommandValueType
-	text      string
-	regex     *regexp.Regexp
-	required  bool
-}
-
-func NewCommandArg(text string, valueType CommandValueType) *CommandArg {
-	regex := CommandRegexString
-	switch valueType {
-	case CommandValueIntType:
-		regex = CommandRegexInt
-	}
-	return &CommandArg{valueType, text, regex, false}
-}
-func (c *CommandArg) SetRequired() *CommandArg {
-	c.required = true
-	return c
-}
-
-type CommandExecutor[T DbContext] func(ctx *MsgContext, dbContext *T)
-
-type Command[T DbContext] struct {
-	command     string
-	description string
-	exec        CommandExecutor[T]
-	args        extypes.Slice[CommandArg]
-	middlewares extypes.Slice[Middleware[T]]
-	skipAutoCmd bool
-}
-
-func NewCommand[T any](exec CommandExecutor[T], command string, args ...CommandArg) *Command[T] {
-	return &Command[T]{command, "", exec, args, make(extypes.Slice[Middleware[T]], 0), false}
-}
-func (c *Command[T]) Use(m Middleware[T]) *Command[T] {
-	c.middlewares = c.middlewares.Push(m)
-	return c
-}
-func (c *Command[T]) SetDescription(desc string) *Command[T] {
-	c.description = desc
-	return c
-}
-func (c *Command[T]) SkipCommandAutoGen() *Command[T] {
-	c.skipAutoCmd = true
-	return c
-}
-func (c *Command[T]) validateArgs(args []string) error {
-	cmdArgs := c.args.Filter(func(e CommandArg) bool { return !e.required })
-	if len(args) < cmdArgs.Len() {
-		return ErrCmdArgCountMismatch
-	}
-
-	for i, arg := range args {
-		if i >= c.args.Len() {
-			break
-		}
-		cmdArg := c.args.Get(i)
-		if cmdArg.regex == nil {
-			continue
-		}
-		if !cmdArg.regex.MatchString(arg) {
-			return ErrCmdArgRegexpMismatch
-		}
-	}
-	return nil
-}
-
-type Plugin[T DbContext] struct {
 	name           string
-	commands    map[string]Command[T]
+	commands       map[string]*CommandExecutor
-	payloads    map[string]Command[T]
+	payloads       map[string]*CommandExecutor
-	middlewares extypes.Slice[Middleware[T]]
+	updateListener *CommandExecutor
-	skipAutoCmd bool
+	middlewares    extypes.Slice[*PluginMiddleware]
 }
 
-func NewPlugin[T DbContext](name string) *Plugin[T] {
+type Plugin struct {
-	return &Plugin[T]{
+	Name           string
-		name, map[string]Command[T]{},
+	Commands       map[string]*CommandExecutor
-		map[string]Command[T]{}, extypes.Slice[Middleware[T]]{}, false,
+	Payloads       map[string]*CommandExecutor
+	UpdateListener *CommandExecutor
+	Middlewares    extypes.Slice[*PluginMiddleware]
+}
+
+func NewPlugin(name string) *PluginBuilder {
+	return &PluginBuilder{
+		name:     name,
+		commands: make(map[string]*CommandExecutor),
+		payloads: make(map[string]*CommandExecutor),
 	}
 }
 
-func (p *Plugin[T]) AddCommand(command *Command[T]) *Plugin[T] {
+func (p *PluginBuilder) Command(f CommandExecutor, cmd ...string) *PluginBuilder {
-	p.commands[command.command] = *command
+	for _, c := range cmd {
+		p.commands[c] = &f
+	}
 	return p
 }
-func (p *Plugin[T]) NewCommand(exec CommandExecutor[T], command string, args ...CommandArg) *Command[T] {
+
-	return NewCommand(exec, command, args...)
+func (p *PluginBuilder) Payload(f CommandExecutor, payloads ...string) *PluginBuilder {
-}
+	for _, payload := range payloads {
-func (p *Plugin[T]) AddPayload(command *Command[T]) *Plugin[T] {
+		p.payloads[payload] = &f
-	p.payloads[command.command] = *command
+	}
 	return p
 }
-func (p *Plugin[T]) AddMiddleware(middleware Middleware[T]) *Plugin[T] {
+
+func (p *PluginBuilder) UpdateListener(listener CommandExecutor) *PluginBuilder {
+	p.updateListener = &listener
+	return p
+}
+
+func (p *PluginBuilder) Middleware(middleware *PluginMiddleware) *PluginBuilder {
 	p.middlewares = p.middlewares.Push(middleware)
 	return p
 }
-func (p *Plugin[T]) SkipCommandAutoGen() *Plugin[T] {
+
-	p.skipAutoCmd = true
+func (p *PluginBuilder) Build() Plugin {
-	return p
+	if len(p.commands) == 0 && len(p.payloads) == 0 {
+		log.Println("no command or payloads")
+	}
+	return Plugin{
+		Name:           p.name,
+		Commands:       p.commands,
+		Payloads:       p.payloads,
+		UpdateListener: p.updateListener,
+		Middlewares:    p.middlewares,
+	}
 }
 
-func (p *Plugin[T]) executeCmd(cmd string, ctx *MsgContext, dbContext *T) {
+func (p *Plugin) Execute(cmd string, ctx *MsgContext, dbContext *DatabaseContext) {
-	command := p.commands[cmd]
+	(*p.Commands[cmd])(ctx, dbContext)
-	if err := command.validateArgs(ctx.Args); err != nil {
-		ctx.error(err)
-		return
-	}
-	command.exec(ctx, dbContext)
 }
-func (p *Plugin[T]) executePayload(payload string, ctx *MsgContext, dbContext *T) {
+
-	pl := p.payloads[payload]
+func (p *Plugin) ExecutePayload(payload string, ctx *MsgContext, dbContext *DatabaseContext) {
-	if err := pl.validateArgs(ctx.Args); err != nil {
+	(*p.Payloads[payload])(ctx, dbContext)
-		ctx.error(err)
-		return
-	}
-	pl.exec(ctx, dbContext)
 }
-func (p *Plugin[T]) executeMiddlewares(ctx *MsgContext, db *T) bool {
+
-	for _, m := range p.middlewares {
+func (p *Plugin) executeMiddlewares(ctx *MsgContext, db *DatabaseContext) bool {
+	for _, m := range p.Middlewares {
 		if !m.Execute(ctx, db) {
 			return false
 		}
@@ -152,29 +86,80 @@ func (p *Plugin[T]) executeMiddlewares(ctx *MsgContext, db *T) bool {
 	return true
 }
 
-type MiddlewareExecutor[T DbContext] func(ctx *MsgContext, db *T) bool
+type Middleware struct {
-
+	Name     string
-// Middleware
+	Executor CommandExecutor
-// When async, returned value ignored
+	Order    int
-type Middleware[T DbContext] struct {
+	Async    bool
+}
+type MiddlewareBuilder struct {
 	name     string
-	executor MiddlewareExecutor[T]
+	executor CommandExecutor
 	order    int
 	async    bool
 }
 
-func NewMiddleware[T DbContext](name string, executor MiddlewareExecutor[T]) *Middleware[T] {
+func NewMiddleware(name string, executor CommandExecutor) *MiddlewareBuilder {
-	return &Middleware[T]{name, executor, 0, false}
+	return &MiddlewareBuilder{name: name, executor: executor, order: 0, async: false}
 }
-func (m *Middleware[T]) SetOrder(order int) *Middleware[T] {
+func (m *MiddlewareBuilder) SetName(name string) *MiddlewareBuilder {
+	m.name = name
+	return m
+}
+func (m *MiddlewareBuilder) SetExecutor(executor CommandExecutor) *MiddlewareBuilder {
+	m.executor = executor
+	return m
+}
+func (m *MiddlewareBuilder) SetOrder(order int) *MiddlewareBuilder {
 	m.order = order
 	return m
 }
-func (m *Middleware[T]) SetAsync(async bool) *Middleware[T] {
+func (m *MiddlewareBuilder) SetAsync(async bool) *MiddlewareBuilder {
 	m.async = async
 	return m
 }
-func (m *Middleware[T]) Execute(ctx *MsgContext, db *T) bool {
+func (m *MiddlewareBuilder) Build() Middleware {
+	return Middleware{
+		Name:     m.name,
+		Executor: m.executor,
+		Order:    m.order,
+		Async:    m.async,
+	}
+}
+func (m Middleware) Execute(ctx *MsgContext, db *DatabaseContext) {
+	if m.Async {
+		go m.Executor(ctx, db)
+	} else {
+		m.Execute(ctx, db)
+	}
+}
+
+type PluginMiddlewareExecutor func(ctx *MsgContext, db *DatabaseContext) bool
+
+// PluginMiddleware
+// When async, returned value ignored
+type PluginMiddleware struct {
+	executor PluginMiddlewareExecutor
+	order    int
+	async    bool
+}
+
+func NewPluginMiddleware(executor PluginMiddlewareExecutor) *PluginMiddleware {
+	return &PluginMiddleware{
+		executor: executor,
+		order:    0,
+		async:    false,
+	}
+}
+func (m *PluginMiddleware) SetOrder(order int) *PluginMiddleware {
+	m.order = order
+	return m
+}
+func (m *PluginMiddleware) SetAsync(async bool) *PluginMiddleware {
+	m.async = async
+	return m
+}
+func (m *PluginMiddleware) Execute(ctx *MsgContext, db *DatabaseContext) bool {
 	if m.async {
 		go m.executor(ctx, db)
 		return true

runners.go

@@ -4,69 +4,80 @@ import (
 	"time"
 )
 
-type RunnerFn[T DbContext] func(*Bot[T]) error
+type RunnerFn func(*Bot) error
-type Runner[T DbContext] struct {
+type RunnerBuilder struct {
 	name    string
 	onetime bool
 	async   bool
 	timeout time.Duration
-	fn      RunnerFn[T]
+	fn      RunnerFn
+}
+type Runner struct {
+	Name    string
+	Onetime bool
+	Async   bool
+	Timeout time.Duration
+	Fn      RunnerFn
 }
 
-func NewRunner[T DbContext](name string, fn RunnerFn[T]) *Runner[T] {
+func NewRunner(name string, fn RunnerFn) *RunnerBuilder {
-	return &Runner[T]{
+	return &RunnerBuilder{
 		name: name, fn: fn, async: true,
 	}
 }
-func (b *Runner[T]) Onetime(onetime bool) *Runner[T] {
+func (b *RunnerBuilder) Onetime(onetime bool) *RunnerBuilder {
 	b.onetime = onetime
 	return b
 }
-func (b *Runner[T]) Async(async bool) *Runner[T] {
+func (b *RunnerBuilder) Async(async bool) *RunnerBuilder {
 	b.async = async
 	return b
 }
-func (b *Runner[T]) Timeout(timeout time.Duration) *Runner[T] {
+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 (bot *Bot[T]) ExecRunners() {
+func (b *Bot) ExecRunners() {
-	bot.logger.Infoln("Executing runners...")
+	for _, runner := range b.runners {
-	for _, runner := range bot.runners {
+		if !runner.Onetime && !runner.Async {
-		if !runner.onetime && !runner.async {
+			b.logger.Warnf("Runner %s not onetime, but sync\n", runner.Name)
-			bot.logger.Warnf("Runner %s not onetime, but sync\n", runner.name)
 			continue
 		}
-		if !runner.onetime && runner.async && runner.timeout == (time.Second*0) {
+		if !runner.Onetime && runner.Async && runner.Timeout == (time.Second*0) {
-			bot.logger.Warnf("Background runner \"%s\" should have timeout", runner.name)
+			b.logger.Warnf("Background runner \"%s\" should have timeout", runner.Name)
 		}
 
-		if runner.async && runner.onetime {
+		if runner.Async && runner.Onetime {
 			go func() {
-				err := runner.fn(bot)
+				err := runner.Fn(b)
 				if err != nil {
-					bot.logger.Warnf("Runner %s failed: %s\n", runner.name, err)
+					b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
 				}
 			}()
-		} else if !runner.async && runner.onetime {
+		} else if !runner.Async && runner.Onetime {
 			t := time.Now()
-			err := runner.fn(bot)
+			err := runner.Fn(b)
 			if err != nil {
-				bot.logger.Warnf("Runner %s failed: %s\n", runner.name, err)
+				b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
 			}
 			elapsed := time.Since(t)
 			if elapsed > time.Second*2 {
-				bot.logger.Warnf("Runner %s too slow. Elapsed time %s>=2s", runner.name, elapsed)
+				b.logger.Warnf("Runner %s too slow. Elapsed time %s>=2s", runner.Name, elapsed)
 			}
-		} else if !runner.onetime {
+		} else if !runner.Onetime {
 			go func() {
 				for {
-					err := runner.fn(bot)
+					err := runner.Fn(b)
 					if err != nil {
-						bot.logger.Warnf("Runner %s failed: %s\n", runner.name, err)
+						b.logger.Warnf("Runner %s failed: %s\n", runner.Name, err)
 					}
-					time.Sleep(runner.timeout)
+					time.Sleep(runner.Timeout)
 				}
 			}()
 		}

tgapi/api.go

@@ -1,198 +0,0 @@
-package tgapi
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"git.nix13.pw/scuroneko/laniakea/utils"
-	"git.nix13.pw/scuroneko/slog"
-	"golang.org/x/time/rate"
-)
-
-type APIOpts struct {
-	token         string
-	client        *http.Client
-	useTestServer bool
-	apiUrl        string
-
-	limiter           *rate.Limiter
-	dropOverflowLimit bool
-}
-
-var ErrPoolUnexpected = errors.New("unexpected response from pool")
-
-func NewAPIOpts(token string) *APIOpts {
-	return &APIOpts{token: token, client: nil, useTestServer: false, apiUrl: "https://api.telegram.org"}
-}
-func (opts *APIOpts) SetHTTPClient(client *http.Client) *APIOpts {
-	if client != nil {
-		opts.client = client
-	}
-	return opts
-}
-func (opts *APIOpts) UseTestServer(use bool) *APIOpts {
-	opts.useTestServer = use
-	return opts
-}
-func (opts *APIOpts) SetAPIUrl(apiUrl string) *APIOpts {
-	if apiUrl != "" {
-		opts.apiUrl = apiUrl
-	}
-	return opts
-}
-func (opts *APIOpts) SetLimiter(limiter *rate.Limiter) *APIOpts {
-	opts.limiter = limiter
-	return opts
-}
-func (opts *APIOpts) SetLimiterDrop(b bool) *APIOpts {
-	opts.dropOverflowLimit = b
-	return opts
-}
-
-type API struct {
-	token         string
-	client        *http.Client
-	logger        *slog.Logger
-	useTestServer bool
-	apiUrl        string
-
-	pool              *WorkerPool
-	limiter           *rate.Limiter
-	dropOverflowLimit bool
-}
-
-func NewAPI(opts *APIOpts) *API {
-	l := slog.CreateLogger().Level(utils.GetLoggerLevel()).Prefix("API")
-	l.AddWriter(l.CreateJsonStdoutWriter())
-	client := opts.client
-	if client == nil {
-		client = &http.Client{Timeout: time.Second * 45}
-	}
-	pool := NewWorkerPool(16, 256)
-	pool.Start(context.Background())
-	return &API{
-		opts.token, client, l,
-		opts.useTestServer, opts.apiUrl,
-		pool, opts.limiter, opts.dropOverflowLimit,
-	}
-}
-func (api *API) CloseApi() error {
-	api.pool.Stop()
-	return api.logger.Close()
-}
-func (api *API) GetLogger() *slog.Logger { return api.logger }
-
-type ApiResponse[R any] struct {
-	Ok          bool   `json:"ok"`
-	Description string `json:"description,omitempty"`
-	Result      R      `json:"result,omitempty"`
-	ErrorCode   int    `json:"error_code,omitempty"`
-}
-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]) doRequest(ctx context.Context, api *API) (R, error) {
-	var zero R
-	if api.limiter != nil {
-		if api.dropOverflowLimit {
-			if !api.limiter.Allow() {
-				return zero, errors.New("rate limited")
-			}
-		} else {
-			if err := api.limiter.Wait(ctx); err != nil {
-				return zero, err
-			}
-		}
-	}
-
-	data, err := json.Marshal(r.params)
-	if err != nil {
-		return zero, err
-	}
-	buf := bytes.NewBuffer(data)
-
-	methodPrefix := ""
-	if api.useTestServer {
-		methodPrefix = "/test"
-	}
-	url := fmt.Sprintf("%s/bot%s%s/%s", api.apiUrl, api.token, methodPrefix, r.method)
-	req, err := http.NewRequestWithContext(ctx, "POST", url, buf)
-	if err != nil {
-		return zero, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Accept", "application/json")
-	req.Header.Set("User-Agent", fmt.Sprintf("Laniakea/%s", utils.VersionString))
-
-	api.logger.Debugln("REQ", api.apiUrl, r.method, buf.String())
-	res, err := api.client.Do(req)
-	if err != nil {
-		return zero, err
-	}
-	defer func(Body io.ReadCloser) {
-		_ = Body.Close()
-	}(res.Body)
-
-	data, err = readBody(res.Body)
-	if err != nil {
-		return zero, err
-	}
-	api.logger.Debugln("RES", r.method, string(data))
-	if res.StatusCode != http.StatusOK {
-		return zero, fmt.Errorf("unexpected status code: %d, %s", res.StatusCode, string(data))
-	}
-	return parseBody[R](data)
-}
-func (r TelegramRequest[R, P]) DoWithContext(ctx context.Context, api *API) (R, error) {
-	var zero R
-	result, err := api.pool.Submit(ctx, func(ctx context.Context) (any, error) {
-		return r.doRequest(ctx, api)
-	})
-	if err != nil {
-		return zero, err
-	}
-
-	select {
-	case <-ctx.Done():
-		return zero, ctx.Err()
-	case res := <-result:
-		if res.Err != nil {
-			return zero, res.Err
-		}
-		if val, ok := res.Value.(R); ok {
-			return val, nil
-		}
-		return zero, ErrPoolUnexpected
-	}
-}
-func (r TelegramRequest[R, P]) Do(api *API) (R, error) {
-	return r.DoWithContext(context.Background(), api)
-}
-
-func readBody(body io.ReadCloser) ([]byte, error) {
-	reader := io.LimitReader(body, 10<<20)
-	return io.ReadAll(reader)
-}
-func parseBody[R any](data []byte) (R, error) {
-	var zero R
-	var resp ApiResponse[R]
-	err := json.Unmarshal(data, &resp)
-	if err != nil {
-		return zero, err
-	}
-	if !resp.Ok {
-		return zero, fmt.Errorf("[%d] %s", resp.ErrorCode, resp.Description)
-	}
-	return resp.Result, nil
-}

tgapi/attachments_methods.go

@@ -1,246 +0,0 @@
-package tgapi
-
-type SendPhotoP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Photo           string          `json:"photo"`
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	ShowCaptionAboveMedia bool   `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool   `json:"has_spoiler,omitempty"`
-	DisableNotifications  bool   `json:"disable_notifications,omitempty"`
-	ProtectContent        bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendPhoto(params SendPhotoP) (Message, error) {
-	req := NewRequest[Message]("sendPhoto", params)
-	return req.Do(api)
-}
-
-type SendAudioP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Audio           string          `json:"audio"`
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-	Duration        int             `json:"duration,omitempty"`
-	Performer       string          `json:"performer,omitempty"`
-	Title           string          `json:"title,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendAudio(params SendAudioP) (Message, error) {
-	req := NewRequest[Message]("sendAudio", params)
-	return req.Do(api)
-}
-
-type SendDocumentP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Document        string          `json:"document"`
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendDocument(params SendDocumentP) (Message, error) {
-	req := NewRequest[Message]("sendDocument", params)
-	return req.Do(api)
-}
-
-type SendVideoP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Video    string `json:"video"`
-	Duration int    `json:"duration,omitempty"`
-	Width    int    `json:"width,omitempty"`
-	Height   int    `json:"height,omitempty"`
-	Cover    int    `json:"cover,omitempty"`
-
-	StartTimestamp  int             `json:"start_timestamp,omitempty"`
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	ShowCaptionAboveMedia bool   `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool   `json:"has_spoiler,omitempty"`
-	SupportsStreaming     bool   `json:"supports_streaming,omitempty"`
-	DisableNotification   bool   `json:"disable_notification,omitempty"`
-	ProtectContent        bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendVideo(params SendVideoP) (Message, error) {
-	req := NewRequest[Message]("sendVideo", params)
-	return req.Do(api)
-}
-
-type SendAnimationP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Animation string `json:"animation"`
-	Duration  int    `json:"duration,omitempty"`
-	Width     int    `json:"width,omitempty"`
-	Height    int    `json:"height,omitempty"`
-
-	Caption               string          `json:"caption,omitempty"`
-	ParseMode             ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities       []MessageEntity `json:"caption_entities,omitempty"`
-	ShowCaptionAboveMedia bool            `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool            `json:"has_spoiler,omitempty"`
-	DisableNotification   bool            `json:"disable_notification,omitempty"`
-	ProtectContent        bool            `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool            `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string          `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendAnimation(params SendAnimationP) (Message, error) {
-	req := NewRequest[Message]("sendAnimation", params)
-	return req.Do(api)
-}
-
-type SendVoiceP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Voice               string          `json:"voice"`
-	Caption             string          `json:"caption,omitempty"`
-	ParseMode           ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities     []MessageEntity `json:"caption_entities,omitempty"`
-	Duration            int             `json:"duration,omitempty"`
-	DisableNotification bool            `json:"disable_notification,omitempty"`
-	ProtectContent      bool            `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool            `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string          `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendVoice(params *SendVoiceP) (Message, error) {
-	req := NewRequest[Message]("sendVoice", params)
-	return req.Do(api)
-}
-
-type SendVideoNoteP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	VideoNote           string `json:"video_note"`
-	Duration            int    `json:"duration,omitempty"`
-	Length              int    `json:"length,omitempty"`
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendVideoNote(params SendVideoNoteP) (Message, error) {
-	req := NewRequest[Message]("sendVideoNote", params)
-	return req.Do(api)
-}
-
-type SendPaidMediaP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-	StarCount             int    `json:"star_count,omitempty"`
-
-	Media                 []InputPaidMedia `json:"media"`
-	Payload               string           `json:"payload,omitempty"`
-	Caption               string           `json:"caption,omitempty"`
-	ParseMode             ParseMode        `json:"parse_mode,omitempty"`
-	CaptionEntities       []MessageEntity  `json:"caption_entities,omitempty"`
-	ShowCaptionAboveMedia bool             `json:"show_caption_above_media,omitempty"`
-	DisableNotification   bool             `json:"disable_notification,omitempty"`
-	ProtectContent        bool             `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool             `json:"allow_paid_broadcast,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendPaidMedia(params SendPaidMediaP) (Message, error) {
-	req := NewRequest[Message]("sendPaidMedia", params)
-	return req.Do(api)
-}
-
-type SendMediaGroupP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Media               []InputMedia     `json:"media"`
-	DisableNotification bool             `json:"disable_notification,omitempty"`
-	ProtectContent      bool             `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool             `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string           `json:"message_effect_id,omitempty"`
-	ReplyParameters     *ReplyParameters `json:"reply_parameters,omitempty"`
-}
-
-func (api *API) SendMediaGroup(params SendMediaGroupP) (Message, error) {
-	req := NewRequest[Message]("sendMediaGroup", params)
-	return req.Do(api)
-}

tgapi/attachments_types.go

@@ -1,59 +0,0 @@
-package tgapi
-
-type InputMedia struct {
-	Type  InputMediaType `json:"type"`
-	Media string         `json:"media"`
-
-	Caption               *string         `json:"caption,omitempty"`
-	ParseMode             *ParseMode      `json:"parse_mode,omitempty"`
-	CaptionEntities       []MessageEntity `json:"caption_entities,omitempty"`
-	ShowCaptionAboveMedia *bool           `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            *bool           `json:"has_spoiler,omitempty"`
-
-	Cover             *string `json:"cover"`
-	StartTimestamp    *int    `json:"start_timestamp"`
-	Width             *int    `json:"width,omitempty"`
-	Height            *int    `json:"height,omitempty"`
-	Duration          *int    `json:"duration,omitempty"`
-	SupportsStreaming *bool   `json:"supports_streaming,omitempty"`
-
-	Performer *string `json:"performer,omitempty"`
-	Title     *string `json:"title,omitempty"`
-}
-
-type InputMediaType string
-
-const (
-	InputMediaTypeAnimation InputMediaType = "animation"
-	InputMediaTypeDocument  InputMediaType = "document"
-	InputMediaTypePhoto     InputMediaType = "photo"
-	InputMediaTypeVideo     InputMediaType = "video"
-	InputMediaTypeAudio     InputMediaType = "audio"
-)
-
-type InputPaidMediaType string
-
-const (
-	InputPaidMediaTypeVideo InputPaidMediaType = "video"
-	InputPaidMediaTypePhoto InputPaidMediaType = "photo"
-)
-
-type InputPaidMedia struct {
-	Type  InputPaidMediaType `json:"type"`
-	Media string             `json:"media"`
-
-	Cover             string `json:"cover"`
-	StartTimestamp    int64  `json:"start_timestamp"`
-	Width             int    `json:"width"`
-	Height            int    `json:"height"`
-	Duration          int    `json:"duration"`
-	SupportsStreaming bool   `json:"supports_streaming"`
-}
-
-type PhotoSize struct {
-	FileID       string `json:"file_id"`
-	FileUniqueID string `json:"file_unique_id"`
-	Width        int    `json:"width"`
-	Height       int    `json:"height"`
-	FileSize     int    `json:"file_size,omitempty"`
-}

tgapi/bot_methods.go

@@ -1,174 +0,0 @@
-package tgapi
-
-type SetMyCommandsP struct {
-	Commands []BotCommand     `json:"commands"`
-	Scope    *BotCommandScope `json:"scope,omitempty"`
-	Language string           `json:"language_code,omitempty"`
-}
-
-func (api *API) SetMyCommands(params SetMyCommandsP) (bool, error) {
-	req := NewRequest[bool]("setMyCommands", params)
-	return req.Do(api)
-}
-
-type DeleteMyCommandsP struct {
-	Scope    *BotCommandScope `json:"scope,omitempty"`
-	Language string           `json:"language_code,omitempty"`
-}
-
-func (api *API) DeleteMyCommands(params DeleteMyCommandsP) (bool, error) {
-	req := NewRequest[bool]("deleteMyCommands", params)
-	return req.Do(api)
-}
-
-type GetMyCommands struct {
-	Scope    *BotCommandScope `json:"scope,omitempty"`
-	Language string           `json:"language_code,omitempty"`
-}
-
-func (api *API) GetMyCommands(params GetMyCommands) ([]BotCommand, error) {
-	req := NewRequest[[]BotCommand]("getMyCommands", params)
-	return req.Do(api)
-}
-
-type SetMyName struct {
-	Name     string `json:"name"`
-	Language string `json:"language_code,omitempty"`
-}
-
-func (api *API) SetMyName(params SetMyName) (bool, error) {
-	req := NewRequest[bool]("setMyName", params)
-	return req.Do(api)
-}
-
-type GetMyName struct {
-	Language string `json:"language_code,omitempty"`
-}
-
-func (api *API) GetMyName(params GetMyName) (BotName, error) {
-	req := NewRequest[BotName]("getMyName", params)
-	return req.Do(api)
-}
-
-type SetMyDescription struct {
-	Description string `json:"description"`
-	Language    string `json:"language_code,omitempty"`
-}
-
-func (api *API) SetMyDescription(params SetMyDescription) (bool, error) {
-	req := NewRequest[bool]("setMyDescription", params)
-	return req.Do(api)
-}
-
-type GetMyDescription struct {
-	Language string `json:"language_code,omitempty"`
-}
-
-func (api *API) GetMyDescription(params GetMyDescription) (BotDescription, error) {
-	req := NewRequest[BotDescription]("getMyDescription", params)
-	return req.Do(api)
-}
-
-type SetMyShortDescription struct {
-	ShortDescription string `json:"short_description,omitempty"`
-	Language         string `json:"language_code,omitempty"`
-}
-
-func (api *API) SetMyShortDescription(params SetMyShortDescription) (bool, error) {
-	req := NewRequest[bool]("setMyShortDescription", params)
-	return req.Do(api)
-}
-
-type GetMyShortDescription struct {
-	Language string `json:"language_code,omitempty"`
-}
-
-func (api *API) GetMyShortDescription(params GetMyShortDescription) (BotShortDescription, error) {
-	req := NewRequest[BotShortDescription]("getMyShortDescription", params)
-	return req.Do(api)
-}
-
-type SetMyProfilePhotoP struct {
-	Photo InputProfilePhoto `json:"photo"`
-}
-
-func (api *API) SetMyProfilePhoto(params SetMyProfilePhotoP) (bool, error) {
-	req := NewRequest[bool]("setMyProfilePhoto", params)
-	return req.Do(api)
-}
-func (api *API) RemoveMyProfilePhoto() (bool, error) {
-	req := NewRequest[bool]("removeMyProfilePhoto", NoParams)
-	return req.Do(api)
-}
-
-type SetChatMenuButtonP struct {
-	ChatID     int            `json:"chat_id"`
-	MenuButton MenuButtonType `json:"menu_button"`
-}
-
-func (api *API) SetChatMenuButton(params SetChatMenuButtonP) (bool, error) {
-	req := NewRequest[bool]("setChatMenuButton", params)
-	return req.Do(api)
-}
-
-type GetChatMenuButtonP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) GetChatMenuButton(params GetChatMenuButtonP) (BaseMenuButton, error) {
-	req := NewRequest[BaseMenuButton]("getChatMenuButton", params)
-	return req.Do(api)
-}
-
-type SetMyDefaultAdministratorRightsP struct {
-	Rights      *ChatAdministratorRights `json:"rights"`
-	ForChannels bool                     `json:"for_channels"`
-}
-
-func (api *API) SetMyDefaultAdministratorRights(params SetMyDefaultAdministratorRightsP) (bool, error) {
-	req := NewRequest[bool]("setMyDefaultAdministratorRights", params)
-	return req.Do(api)
-}
-
-type GetMyDefaultAdministratorRightsP struct {
-	ForChannels bool `json:"for_channels"`
-}
-
-func (api *API) GetMyDefaultAdministratorRights(params GetMyDefaultAdministratorRightsP) (ChatAdministratorRights, error) {
-	req := NewRequest[ChatAdministratorRights]("getMyDefaultAdministratorRights", params)
-	return req.Do(api)
-}
-
-func (api *API) GetAvailableGifts() (Gifts, error) {
-	req := NewRequest[Gifts]("getAvailableGifts", NoParams)
-	return req.Do(api)
-}
-
-type SendGiftP struct {
-	UserID        int             `json:"user_id,omitempty"`
-	ChatID        int             `json:"chat_id,omitempty"`
-	GiftID        string          `json:"gift_id"`
-	PayForUpgrade bool            `json:"pay_for_upgrade"`
-	Text          string          `json:"text"`
-	TextParseMode ParseMode       `json:"text_parse_mode,omitempty"`
-	TextEntities  []MessageEntity `json:"text_entities,omitempty"`
-}
-
-func (api *API) SendGift(params SendGiftP) (bool, error) {
-	req := NewRequest[bool]("sendGift", params)
-	return req.Do(api)
-}
-
-type GiftPremiumSubscriptionP struct {
-	UserID        int             `json:"user_id"`
-	MonthCount    int             `json:"month_count"`
-	StarCount     int             `json:"star_count"`
-	Text          string          `json:"text,omitempty"`
-	TextParseMode ParseMode       `json:"text_parse_mode,omitempty"`
-	TextEntities  []MessageEntity `json:"text_entities,omitempty"`
-}
-
-func (api *API) GiftPremiumSubscription(params GiftPremiumSubscriptionP) (bool, error) {
-	req := NewRequest[bool]("giftPremiumSubscription", params)
-	return req.Do(api)
-}

tgapi/bot_types.go

@@ -1,64 +0,0 @@
-package tgapi
-
-type BotCommand struct {
-	Command     string `json:"command"`
-	Description string `json:"description"`
-}
-type BotCommandScopeType string
-
-const (
-	BotCommandScopeDefaultType               BotCommandScopeType = "default"
-	BotCommandScopePrivateType               BotCommandScopeType = "all_private_chats"
-	BotCommandScopeGroupType                 BotCommandScopeType = "all_group_chats"
-	BotCommandScopeAllChatAdministratorsType BotCommandScopeType = "all_chat_administrators"
-	BotCommandScopeChatType                  BotCommandScopeType = "chat"
-	BotCommandScopeChatAdministratorsType    BotCommandScopeType = "chat_administrators"
-	BotCommandScopeChatMemberType            BotCommandScopeType = "chat_member"
-)
-
-type BotCommandScope struct {
-	Type   BotCommandScopeType `json:"type"`
-	ChatID *int                `json:"chat_id,omitempty"`
-	UserID *int                `json:"user_id,omitempty"`
-}
-
-type BotName struct {
-	Name string `json:"name"`
-}
-type BotDescription struct {
-	Description string `json:"description"`
-}
-type BotShortDescription struct {
-	ShortDescription string `json:"short_description"`
-}
-
-const (
-	InputProfilePhotoStaticType   InputProfilePhotoType = "static"
-	InputProfilePhotoAnimatedType InputProfilePhotoType = "animated"
-)
-
-type InputProfilePhotoType string
-type InputProfilePhoto struct {
-	Type InputProfilePhotoType `json:"type"`
-
-	// Static
-	Photo *string `json:"photo,omitempty"`
-
-	// Animated
-	Animation          *string  `json:"animation,omitempty"`
-	MainFrameTimestamp *float64 `json:"main_frame_timestamp,omitempty"`
-}
-
-const (
-	MenuButtonCommandsType MenuButtonType = "commands"
-	MenuButtonWebAppType   MenuButtonType = "web_app"
-	MenuButtonDefaultType  MenuButtonType = "default"
-)
-
-type MenuButtonType string
-type BaseMenuButton struct {
-	Type MenuButtonType `json:"type"`
-	// WebApp
-	Text   string     `json:"text"`
-	WebApp WebAppInfo `json:"web_app"`
-}

tgapi/business_methods.go

@@ -1,258 +0,0 @@
-package tgapi
-
-type VerifyUserP struct {
-	UserID            int    `json:"user_id"`
-	CustomDescription string `json:"custom_description,omitempty"`
-}
-
-func (api *API) VerifyUser(params VerifyUserP) (bool, error) {
-	req := NewRequest[bool]("verifyUser", params)
-	return req.Do(api)
-}
-
-type VerifyChatP struct {
-	ChatID            int    `json:"chat_id"`
-	CustomDescription string `json:"custom_description,omitempty"`
-}
-
-func (api *API) VerifyChat(params VerifyChatP) (bool, error) {
-	req := NewRequest[bool]("verifyChat", params)
-	return req.Do(api)
-}
-
-type RemoveUserVerificationP struct {
-	UserID int `json:"user_id"`
-}
-
-func (api *API) RemoveUserVerification(params RemoveUserVerificationP) (bool, error) {
-	req := NewRequest[bool]("removeUserVerification", params)
-	return req.Do(api)
-}
-
-type RemoveChatVerificationP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) RemoveChatVerification(params RemoveChatVerificationP) (bool, error) {
-	req := NewRequest[bool]("removeChatVerification", params)
-	return req.Do(api)
-}
-
-type ReadBusinessMessageP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	ChatID               int    `json:"chat_id"`
-	MessageID            int    `json:"message_id"`
-}
-
-func (api *API) ReadBusinessMessage(params ReadBusinessMessageP) (bool, error) {
-	req := NewRequest[bool]("readBusinessMessage", params)
-	return req.Do(api)
-}
-
-type DeleteBusinessMessageP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	MessageIDs           []int  `json:"message_ids"`
-}
-
-func (api *API) DeleteBusinessMessage(params DeleteBusinessMessageP) (bool, error) {
-	req := NewRequest[bool]("deleteBusinessMessage", params)
-	return req.Do(api)
-}
-
-type SetBusinessAccountNameP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	FirstName            string `json:"first_name"`
-	LastName             string `json:"last_name,omitempty"`
-}
-
-func (api *API) SetBusinessAccountName(params SetBusinessAccountNameP) (bool, error) {
-	req := NewRequest[bool]("setBusinessAccountName", params)
-	return req.Do(api)
-}
-
-type SetBusinessAccountUsernameP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	Username             string `json:"username,omitempty"`
-}
-
-func (api *API) SetBusinessAccountUsername(params SetBusinessAccountUsernameP) (bool, error) {
-	req := NewRequest[bool]("setBusinessAccountUsername", params)
-	return req.Do(api)
-}
-
-type SetBusinessAccountBioP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	Bio                  string `json:"bio,omitempty"`
-}
-
-func (api *API) SetBusinessAccountBio(params SetBusinessAccountBioP) (bool, error) {
-	req := NewRequest[bool]("setBusinessAccountBio", params)
-	return req.Do(api)
-}
-
-type SetBusinessAccountProfilePhoto struct {
-	BusinessConnectionID string            `json:"business_connection_id"`
-	Photo                InputProfilePhoto `json:"photo,omitempty"`
-	IsPublic             bool              `json:"is_public,omitempty"`
-}
-
-func (api *API) SetBusinessAccountProfilePhoto(params SetBusinessAccountProfilePhoto) (bool, error) {
-	req := NewRequest[bool]("setBusinessAccountProfilePhoto", params)
-	return req.Do(api)
-}
-
-type RemoveBusinessAccountProfilePhotoP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	IsPublic             bool   `json:"is_public,omitempty"`
-}
-
-func (api *API) RemoveBusinessAccountProfilePhoto(params RemoveBusinessAccountProfilePhotoP) (bool, error) {
-	req := NewRequest[bool]("removeBusinessAccountProfilePhoto", params)
-	return req.Do(api)
-}
-
-type SetBusinessAccountGiftSettingsP struct {
-	BusinessConnectionID string            `json:"business_connection_id"`
-	ShowGiftButton       bool              `json:"show_gift_button"`
-	AcceptedGiftTypes    AcceptedGiftTypes `json:"accepted_gift_types"`
-}
-
-func (api *API) SetBusinessAccountGiftSettings(params SetBusinessAccountGiftSettingsP) (bool, error) {
-	req := NewRequest[bool]("setBusinessAccountGiftSettings", params)
-	return req.Do(api)
-}
-
-type GetBusinessAccountStarBalanceP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-}
-
-func (api *API) GetBusinessAccountStarBalance(params GetBusinessAccountStarBalanceP) (StarAmount, error) {
-	req := NewRequest[StarAmount]("getBusinessAccountGiftSettings", params)
-	return req.Do(api)
-}
-
-type TransferBusinessAccountStartP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	StarCount            int    `json:"star_count"`
-}
-
-func (api *API) TransferBusinessAccountStart(params TransferBusinessAccountStartP) (bool, error) {
-	req := NewRequest[bool]("transferBusinessAccountStart", params)
-	return req.Do(api)
-}
-
-type GetBusinessAccountGiftsP struct {
-	BusinessConnectionID        string `json:"business_connection_id"`
-	ExcludeUnsaved              bool   `json:"exclude_unsaved,omitempty"`
-	ExcludeSaved                bool   `json:"exclude_saved,omitempty"`
-	ExcludeUnlimited            bool   `json:"exclude_unlimited,omitempty"`
-	ExcludeLimitedUpgradable    bool   `json:"exclude_limited_upgradable,omitempty"`
-	ExcludeLimitedNonUpgradable bool   `json:"exclude_limited_non_upgradable,omitempty"`
-	ExcludeUnique               bool   `json:"exclude_unique,omitempty"`
-	ExcludeFromBlockchain       bool   `json:"exclude_from_blockchain,omitempty"`
-	SortByPrice                 bool   `json:"sort_by_price,omitempty"`
-	Offset                      string `json:"offset,omitempty"`
-	Limit                       int    `json:"limit,omitempty"`
-}
-
-func (api *API) GetBusinessAccountGifts(params GetBusinessAccountGiftsP) (OwnedGifts, error) {
-	req := NewRequest[OwnedGifts]("getBusinessAccountGifts", params)
-	return req.Do(api)
-}
-
-type ConvertGiftToStarsP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	OwnedGiftID          string `json:"owned_gift_id"`
-}
-
-func (api *API) ConvertGiftToStars(params ConvertGiftToStarsP) (bool, error) {
-	req := NewRequest[bool]("convertGiftToStars", params)
-	return req.Do(api)
-}
-
-type UpgradeGiftP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	OwnedGiftID          string `json:"owned_gift_id"`
-	KeepOriginalDetails  bool   `json:"keep_original_details,omitempty"`
-	StarCount            int    `json:"star_count,omitempty"`
-}
-
-func (api *API) UpgradeGift(params UpgradeGiftP) (bool, error) {
-	req := NewRequest[bool]("upgradeGift", params)
-	return req.Do(api)
-}
-
-type TransferGiftP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	OwnedGiftID          string `json:"owned_gift_id"`
-	NewOwnerChatID       int    `json:"new_owner_chat_id"`
-	StarCount            int    `json:"star_count,omitempty"`
-}
-
-func (api *API) TransferGift(params TransferGiftP) (bool, error) {
-	req := NewRequest[bool]("transferGift", params)
-	return req.Do(api)
-}
-
-type PostStoryP struct {
-	BusinessConnectionID string            `json:"business_connection_id"`
-	Content              InputStoryContent `json:"content"`
-	ActivePeriod         int               `json:"active_period"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-	Areas           []StoryArea     `json:"areas"`
-
-	PostToChatPage bool `json:"post_to_chat_page,omitempty"`
-	ProtectContent bool `json:"protect_content,omitempty"`
-}
-
-func (api *API) PostStoryPhoto(params PostStoryP) (Story, error) {
-	req := NewRequest[Story]("postStory", params)
-	return req.Do(api)
-}
-func (api *API) PostStoryVideo(params PostStoryP) (Story, error) {
-	req := NewRequest[Story]("postStory", params)
-	return req.Do(api)
-}
-
-type RepostStoryP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	FromChatID           int    `json:"from_chat_id"`
-	FromStoryID          int    `json:"from_story_id"`
-	ActivePeriod         int    `json:"active_period"`
-	PostToChatPage       bool   `json:"post_to_chat_page,omitempty"`
-	ProtectContent       bool   `json:"protect_content,omitempty"`
-}
-
-func (api *API) RepostStory(params RepostStoryP) (Story, error) {
-	req := NewRequest[Story]("repostStory", params)
-	return req.Do(api)
-}
-
-type EditStoryP struct {
-	BusinessConnectionID string            `json:"business_connection_id"`
-	StoryID              int               `json:"story_id"`
-	Content              InputStoryContent `json:"content"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-	Areas           []StoryArea     `json:"areas,omitempty"`
-}
-
-func (api *API) EditStory(params EditStoryP) (Story, error) {
-	req := NewRequest[Story]("editStory", params)
-	return req.Do(api)
-}
-
-type DeleteStoryP struct {
-	BusinessConnectionID string `json:"business_connection_id"`
-	StoryID              int    `json:"story_id"`
-}
-
-func (api *API) DeleteStory(params DeleteStoryP) (bool, error) {
-	req := NewRequest[bool]("deleteStory", params)
-	return req.Do(api)
-}

tgapi/business_types.go

@@ -1,104 +0,0 @@
-package tgapi
-
-type BusinessIntro struct {
-	Title   string   `json:"title,omitempty"`
-	Message string   `json:"message,omitempty"`
-	Sticker *Sticker `json:"sticker,omitempty"`
-}
-type BusinessLocation struct {
-	Address  string    `json:"address"`
-	Location *Location `json:"location,omitempty"`
-}
-type BusinessOpeningHoursInterval struct {
-	OpeningMinute int `json:"opening_minute"`
-	ClosingMinute int `json:"closing_minute"`
-}
-type BusinessOpeningHours struct {
-	TimeZoneName string      `json:"time_zone_name"`
-	OpeningHours []Birthdate `json:"opening_hours"`
-}
-
-type BusinessBotRights struct {
-	CanReply                   *bool `json:"can_reply,omitempty"`
-	CanReadMessages            *bool `json:"can_read_messages,omitempty"`
-	CanDeleteSentMessages      *bool `json:"can_delete_sent_messages,omitempty"`
-	CanDeleteAllMessages       *bool `json:"can_delete_all_messages,omitempty"`
-	CanEditName                *bool `json:"can_edit_name,omitempty"`
-	CanEditBio                 *bool `json:"can_edit_bio,omitempty"`
-	CanEditProfilePhoto        *bool `json:"can_edit_profile_photo,omitempty"`
-	CanEditUsername            *bool `json:"can_edit_username,omitempty"`
-	CanChangeGiftSettings      *bool `json:"can_change_gift_settings,omitempty"`
-	CanViewGiftsAndStars       *bool `json:"can_view_gifts_and_stars,omitempty"`
-	CanConvertGiftsToStars     *bool `json:"can_convert_gifts_to_stars,omitempty"`
-	CanTransferAndUpgradeGifts *bool `json:"can_transfer_and_upgrade_gifts,omitempty"`
-	CanTransferStars           *bool `json:"can_transfer_stars,omitempty"`
-	CanManageStories           *bool `json:"can_manage_stories,omitempty"`
-}
-type BusinessConnection struct {
-	ID         string             `json:"id"`
-	User       User               `json:"user"`
-	UserChatID int                `json:"user_chat_id"`
-	Date       int                `json:"date"`
-	Rights     *BusinessBotRights `json:"rights,omitempty"`
-	IsEnabled  bool               `json:"id_enabled"`
-}
-
-const (
-	InputStoryContentPhotoType InputStoryContentType = "photo"
-	InputStoryContentVideoType InputStoryContentType = "video"
-)
-
-type InputStoryContentType string
-type InputStoryContent struct {
-	Type InputStoryContentType `json:"type"`
-	// Photo
-	Photo *string `json:"photo,omitempty"`
-
-	// Video
-	Video               *string  `json:"video,omitempty"`
-	Duration            *float64 `json:"duration,omitempty"`
-	CoverFrameTimestamp *float64 `json:"cover_frame_timestamp,omitempty"`
-	IsAnimation         *bool    `json:"is_animation,omitempty"`
-}
-
-type StoryAreaPosition struct {
-	XPercentage            float64 `json:"x_percentage"`
-	YPercentage            float64 `json:"y_percentage"`
-	WidthPercentage        float64 `json:"width_percentage"`
-	HeightPercentage       float64 `json:"height_percentage"`
-	RotationAngle          float64 `json:"rotation_angle"`
-	CornerRadiusPercentage float64 `json:"corner_radius_percentage"`
-}
-
-const (
-	StoryAreaTypeLocationType   StoryAreaTypeType = "location"
-	StoryAreaTypeReactionType   StoryAreaTypeType = "suggested_reaction"
-	StoryAreaTypeLinkType       StoryAreaTypeType = "link"
-	StoryAreaTypeWeatherType    StoryAreaTypeType = "weather"
-	StoryAreaTypeUniqueGiftType StoryAreaTypeType = "unique_gift"
-)
-
-type StoryAreaTypeType string
-type StoryAreaType struct {
-	Type StoryAreaTypeType `json:"type"`
-
-	Latitude  *float64         `json:"latitude,omitempty"`
-	Longitude *float64         `json:"longitude,omitempty"`
-	Address   *LocationAddress `json:"address,omitempty"`
-
-	ReactionType *ReactionType `json:"reaction_type,omitempty"`
-	IsDark       *bool         `json:"is_dark,omitempty"`
-	IsFlipped    *bool         `json:"is_flipped,omitempty"`
-
-	URL *string `json:"url,omitempty"`
-
-	Temperature     *float64 `json:"temperature,omitempty"`
-	Emoji           *string  `json:"emoji"`
-	BackgroundColor *int     `json:"background_color"`
-
-	Name *string `json:"name,omitempty"`
-}
-type StoryArea struct {
-	Position StoryAreaPosition `json:"position"`
-	Type     StoryAreaType     `json:"type"`
-}

tgapi/chat_methods.go

@@ -1,356 +0,0 @@
-package tgapi
-
-type BanChatMemberP struct {
-	ChatID         int  `json:"chat_id"`
-	UserID         int  `json:"user_id"`
-	UntilDate      int  `json:"until_date,omitempty"`
-	RevokeMessages bool `json:"revoke_messages,omitempty"`
-}
-
-func (api *API) BanChatMember(params BanChatMemberP) (bool, error) {
-	req := NewRequest[bool]("banChatMember", params)
-	return req.Do(api)
-}
-
-type UnbanChatMemberP struct {
-	ChatID       int  `json:"chat_id"`
-	UserID       int  `json:"user_id"`
-	OnlyIfBanned bool `json:"only_if_banned"`
-}
-
-func (api *API) UnbanChatMember(params UnbanChatMemberP) (bool, error) {
-	req := NewRequest[bool]("unbanChatMember", params)
-	return req.Do(api)
-}
-
-type RestrictChatMemberP struct {
-	ChatID                        int             `json:"chat_id"`
-	UserID                        int             `json:"user_id"`
-	Permissions                   ChatPermissions `json:"permissions"`
-	UseIndependentChatPermissions bool            `json:"use_independent_chat_permissions,omitempty"`
-	UntilDate                     int             `json:"until_date,omitempty"`
-}
-
-func (api *API) RestrictChatMember(params RestrictChatMemberP) (bool, error) {
-	req := NewRequest[bool]("restrictChatMember", params)
-	return req.Do(api)
-}
-
-type PromoteChatMember struct {
-	ChatID      int  `json:"chat_id"`
-	UserID      int  `json:"user_id"`
-	IsAnonymous bool `json:"is_anonymous,omitempty"`
-
-	CanManageChat           bool `json:"can_manage_chat,omitempty"`
-	CanDeleteMessages       bool `json:"can_delete_messages,omitempty"`
-	CanManageVideoChats     bool `json:"can_manage_video_chats,omitempty"`
-	CanRestrictMembers      bool `json:"can_restrict_members,omitempty"`
-	CanPromoteMembers       bool `json:"can_promote_members,omitempty"`
-	CanChangeInfo           bool `json:"can_change_info,omitempty"`
-	CanInviteUsers          bool `json:"can_invite_users,omitempty"`
-	CanPostStories          bool `json:"can_post_stories,omitempty"`
-	CanEditStories          bool `json:"can_edit_stories,omitempty"`
-	CanDeleteStories        bool `json:"can_delete_stories,omitempty"`
-	CanPostMessages         bool `json:"can_post_messages,omitempty"`
-	CanEditMessages         bool `json:"can_edit_messages,omitempty"`
-	CanPinMessages          bool `json:"can_pin_messages,omitempty"`
-	CanManageTopics         bool `json:"can_manage_topics,omitempty"`
-	CanManageDirectMessages bool `json:"can_manage_direct_messages,omitempty"`
-}
-
-func (api *API) PromoteChatMember(params PromoteChatMember) (bool, error) {
-	req := NewRequest[bool]("promoteChatMember", params)
-	return req.Do(api)
-}
-
-type SetChatAdministratorCustomTitleP struct {
-	ChatID      int    `json:"chat_id"`
-	UserID      int    `json:"user_id"`
-	CustomTitle string `json:"custom_title"`
-}
-
-func (api *API) SetChatAdministratorCustomTitle(params SetChatAdministratorCustomTitleP) (bool, error) {
-	req := NewRequest[bool]("setChatAdministratorCustomTitle", params)
-	return req.Do(api)
-}
-
-type BanChatSenderChatP struct {
-	ChatID       int `json:"chat_id"`
-	SenderChatID int `json:"sender_chat_id"`
-}
-
-func (api *API) BanChatSenderChat(params BanChatSenderChatP) (bool, error) {
-	req := NewRequest[bool]("banChatSenderChat", params)
-	return req.Do(api)
-}
-
-type UnbanChatSenderChatP struct {
-	ChatID       int `json:"chat_id"`
-	SenderChatID int `json:"sender_chat_id"`
-}
-
-func (api *API) UnbanChatSenderChat(params BanChatSenderChatP) (bool, error) {
-	req := NewRequest[bool]("unbanChatSenderChat", params)
-	return req.Do(api)
-}
-
-type SetChatPermissionsP struct {
-	ChatID                        int             `json:"chat_id"`
-	Permissions                   ChatPermissions `json:"permissions"`
-	UseIndependentChatPermissions bool            `json:"use_independent_chat_permissions,omitempty"`
-}
-
-func (api *API) SetChatPermissions(params SetChatPermissionsP) (bool, error) {
-	req := NewRequest[bool]("setChatPermissions", params)
-	return req.Do(api)
-}
-
-type ExportChatInviteLinkP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) ExportChatInviteLink(params ExportChatInviteLinkP) (string, error) {
-	req := NewRequest[string]("exportChatInviteLink", params)
-	return req.Do(api)
-}
-
-type CreateChatInviteLinkP struct {
-	ChatID             int     `json:"chat_id"`
-	Name               *string `json:"name,omitempty"`
-	ExpireDate         int     `json:"expire_date,omitempty"`
-	MemberLimit        int     `json:"member_limit,omitempty"`
-	CreatesJoinRequest int     `json:"creates_join_request,omitempty"`
-}
-
-func (api *API) CreateChatInviteLink(params CreateChatInviteLinkP) (ChatInviteLink, error) {
-	req := NewRequest[ChatInviteLink]("createChatInviteLink", params)
-	return req.Do(api)
-}
-
-type EditChatInviteLinkP struct {
-	ChatID     int    `json:"chat_id"`
-	InviteLink string `json:"invite_link"`
-
-	Name               string `json:"name,omitempty"`
-	ExpireDate         int    `json:"expire_date,omitempty"`
-	MemberLimit        int    `json:"member_limit,omitempty"`
-	CreatesJoinRequest int    `json:"creates_join_request,omitempty"`
-}
-
-func (api *API) EditChatInviteLink(params EditChatInviteLinkP) (ChatInviteLink, error) {
-	req := NewRequest[ChatInviteLink]("editChatInviteLink", params)
-	return req.Do(api)
-}
-
-type CreateChatSubscriptionInviteLinkP struct {
-	ChatID             int    `json:"chat_id"`
-	Name               string `json:"name,omitempty"`
-	SubscriptionPeriod int    `json:"subscription_period,omitempty"`
-	SubscriptionPrice  int    `json:"subscription_price,omitempty"`
-}
-
-func (api *API) CreateChatSubscriptionInviteLink(params CreateChatSubscriptionInviteLinkP) (ChatInviteLink, error) {
-	req := NewRequest[ChatInviteLink]("createChatSubscriptionInviteLink", params)
-	return req.Do(api)
-}
-
-type EditChatSubscriptionInviteLinkP struct {
-	ChatID     int    `json:"chat_id"`
-	InviteLink string `json:"invite_link"`
-	Name       string `json:"name,omitempty"`
-}
-
-func (api *API) EditChatSubscriptionInviteLink(params EditChatSubscriptionInviteLinkP) (ChatInviteLink, error) {
-	req := NewRequest[ChatInviteLink]("editChatSubscriptionInviteLink", params)
-	return req.Do(api)
-}
-
-type RevokeChatInviteLinkP struct {
-	ChatID     int    `json:"chat_id"`
-	InviteLink string `json:"invite_link"`
-}
-
-func (api *API) RevokeChatInviteLink(params RevokeChatInviteLinkP) (ChatInviteLink, error) {
-	req := NewRequest[ChatInviteLink]("revokeChatInviteLink", params)
-	return req.Do(api)
-}
-
-type ApproveChatJoinRequestP struct {
-	ChatID int `json:"chat_id"`
-	UserID int `json:"user_id"`
-}
-
-func (api *API) ApproveChatJoinRequest(params ApproveChatJoinRequestP) (bool, error) {
-	req := NewRequest[bool]("approveChatJoinRequest", params)
-	return req.Do(api)
-}
-
-type DeclineChatJoinRequestP struct {
-	ChatID int `json:"chat_id"`
-	UserID int `json:"user_id"`
-}
-
-func (api *API) DeclineChatJoinRequest(params DeclineChatJoinRequestP) (bool, error) {
-	req := NewRequest[bool]("declineChatJoinRequest", params)
-	return req.Do(api)
-}
-
-func (api *API) SetChatPhoto() {
-	uploader := NewUploader(api)
-	defer uploader.Close()
-}
-
-type DeleteChatPhotoP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) DeleteChatPhoto(params DeleteChatPhotoP) (bool, error) {
-	req := NewRequest[bool]("deleteChatPhoto", params)
-	return req.Do(api)
-}
-
-type SetChatTitleP struct {
-	ChatID int    `json:"chat_id"`
-	Title  string `json:"title"`
-}
-
-func (api *API) SetChatTitle(params SetChatTitleP) (bool, error) {
-	req := NewRequest[bool]("setChatTitle", params)
-	return req.Do(api)
-}
-
-type SetChatDescriptionP struct {
-	ChatID      int    `json:"chat_id"`
-	Description string `json:"description"`
-}
-
-func (api *API) SetChatDescription(params SetChatDescriptionP) (bool, error) {
-	req := NewRequest[bool]("setChatDescription", params)
-	return req.Do(api)
-}
-
-type PinChatMessageP struct {
-	BusinessConnectionID *string `json:"business_connection_id,omitempty"`
-	ChatID               int     `json:"chat_id"`
-	MessageID            int     `json:"message_id"`
-	DisableNotification  bool    `json:"disable_notification,omitempty"`
-}
-
-func (api *API) PinChatMessage(params PinChatMessageP) (bool, error) {
-	req := NewRequest[bool]("pinChatMessage", params)
-	return req.Do(api)
-}
-
-type UnpinChatMessageP struct {
-	BusinessConnectionID *string `json:"business_connection_id,omitempty"`
-	ChatID               int     `json:"chat_id"`
-	MessageID            int     `json:"message_id"`
-}
-
-func (api *API) UnpinChatMessage(params UnpinChatMessageP) (bool, error) {
-	req := NewRequest[bool]("unpinChatMessage", params)
-	return req.Do(api)
-}
-
-type UnpinAllChatMessagesP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) UnpinAllChatMessages(params UnpinAllChatMessagesP) (bool, error) {
-	req := NewRequest[bool]("unpinAllChatMessages", params)
-	return req.Do(api)
-}
-
-type LeaveChatP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) LeaveChat(params LeaveChatP) (bool, error) {
-	req := NewRequest[bool]("leaveChatP", params)
-	return req.Do(api)
-}
-
-type GetChatP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) GetChatP(params GetChatP) (ChatFullInfo, error) {
-	req := NewRequest[ChatFullInfo]("getChatP", params)
-	return req.Do(api)
-}
-
-type GetChatAdministratorsP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) GetChatAdministrators(params GetChatAdministratorsP) ([]ChatMember, error) {
-	req := NewRequest[[]ChatMember]("getChatAdministrators", params)
-	return req.Do(api)
-}
-
-type GetChatMembersCountP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) GetChatMemberCount(params GetChatMembersCountP) (int, error) {
-	req := NewRequest[int]("getChatMemberCount", params)
-	return req.Do(api)
-}
-
-type GetChatMemberP struct {
-	ChatID int `json:"chat_id"`
-	UserID int `json:"user_id"`
-}
-
-func (api *API) GetChatMember(params GetChatMemberP) (ChatMember, error) {
-	req := NewRequest[ChatMember]("getChatMember", params)
-	return req.Do(api)
-}
-
-type SetChatStickerSetP struct {
-	ChatID         int    `json:"chat_id"`
-	StickerSetName string `json:"sticker_set_name"`
-}
-
-func (api *API) SetChatStickerSet(params SetChatStickerSetP) (bool, error) {
-	req := NewRequest[bool]("setChatStickerSet", params)
-	return req.Do(api)
-}
-
-type DeleteChatStickerSetP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (api *API) DeleteChatStickerSet(params DeleteChatStickerSetP) (bool, error) {
-	req := NewRequest[bool]("deleteChatStickerSet", params)
-	return req.Do(api)
-}
-
-type GetUserChatBoostsP struct {
-	ChatID int `json:"chat_id"`
-	UserID int `json:"user_id"`
-}
-
-func (api *API) GetUserChatBoosts(params GetUserChatBoostsP) (UserChatBoosts, error) {
-	req := NewRequest[UserChatBoosts]("getUserChatBoosts", params)
-	return req.Do(api)
-}
-
-type GetChatGiftsP struct {
-	ChatID                      int    `json:"chat_id"`
-	ExcludeUnsaved              bool   `json:"exclude_unsaved,omitempty"`
-	ExcludeSaved                bool   `json:"exclude_saved,omitempty"`
-	ExcludeUnlimited            bool   `json:"exclude_unlimited,omitempty"`
-	ExcludeLimitedUpgradable    bool   `json:"exclude_limited_upgradable,omitempty"`
-	ExcludeLimitedNonUpgradable bool   `json:"exclude_limited_non_upgradable,omitempty"`
-	ExcludeUnique               bool   `json:"exclude_unique,omitempty"`
-	ExcludeFromBlockchain       bool   `json:"exclude_from_blockchain,omitempty"`
-	SortByPrice                 bool   `json:"sort_by_price,omitempty"`
-	Offset                      string `json:"offset,omitempty"`
-	Limit                       int    `json:"limit,omitempty"`
-}
-
-func (api *API) GetChatGifts(params GetChatGiftsP) (OwnedGifts, error) {
-	req := NewRequest[OwnedGifts]("getChatGifts", params)
-	return req.Do(api)
-}

tgapi/chat_types.go

@@ -1,230 +0,0 @@
-package tgapi
-
-type Chat struct {
-	ID               int     `json:"id"`
-	Type             string  `json:"type"`
-	Title            *string `json:"title,omitempty"`
-	Username         *string `json:"username,omitempty"`
-	FirstName        *string `json:"first_name,omitempty"`
-	LastName         *string `json:"last_name,omitempty"`
-	IsForum          *bool   `json:"is_forum,omitempty"`
-	IsDirectMessages *bool   `json:"is_direct_messages,omitempty"`
-}
-
-type ChatType string
-
-const (
-	ChatTypePrivate    ChatType = "private"
-	ChatTypeGroup      ChatType = "group"
-	ChatTypeSupergroup ChatType = "supergroup"
-	ChatTypeChannel    ChatType = "channel"
-)
-
-type ChatFullInfo struct {
-	ID               int        `json:"id"`
-	Type             ChatType   `json:"type"`
-	Title            string     `json:"title"`
-	Username         string     `json:"username"`
-	FirstName        string     `json:"first_name"`
-	LastName         string     `json:"last_name"`
-	IsForum          bool       `json:"is_forum"`
-	IsDirectMessages bool       `json:"is_direct_messages"`
-	AccentColorID    int        `json:"accent_color_id"`
-	MaxReactionCount int        `json:"max_reaction_count"`
-	Photo            *ChatPhoto `json:"photo,omitempty"`
-	ActiveUsernames  []string   `json:"active_usernames,omitempty"`
-	Birthdate        *Birthdate `json:"birthdate,omitempty"`
-
-	BusinessIntro        *BusinessIntro        `json:"business_intro,omitempty"`
-	BusinessLocation     *BusinessLocation     `json:"business_location,omitempty"`
-	BusinessOpeningHours *BusinessOpeningHours `json:"business_opening_hours,omitempty"`
-
-	PersonalChat *Chat `json:"personal_chat,omitempty"`
-	ParentChat   *Chat `json:"parent_chat,omitempty"`
-
-	AvailableReaction []ReactionType `json:"available_reaction,omitempty"`
-
-	BackgroundCustomEmojiID        *string `json:"background_custom_emoji_id,omitempty"`
-	ProfileAccentColorID           *int    `json:"profile_accent_color_id,omitempty"`
-	ProfileBackgroundCustomEmojiID *string `json:"profile_background_custom_emoji_id,omitempty"`
-	EmojiStatusCustomEmojiID       *string `json:"emoji_status_custom_emoji_id,omitempty"`
-	EmojiStatusExpirationDate      *int    `json:"emoji_status_expiration_date,omitempty"`
-
-	Bio                                *string `json:"bio,omitempty"`
-	HasPrivateForwards                 *bool   `json:"has_private_forwards,omitempty"`
-	HasRestrictedVoiceAndVideoMessages *bool   `json:"has_restricted_voice_and_video_messages,omitempty"`
-	JoinToSendMessages                 *bool   `json:"join_to_send_messages,omitempty"`
-	JoinByRequest                      *bool   `json:"join_by_request,omitempty"`
-
-	Description       *string            `json:"description,omitempty"`
-	InviteLink        *string            `json:"invite_link,omitempty"`
-	PinnedMessage     *Message           `json:"pinned_message,omitempty"`
-	Permissions       *ChatPermissions   `json:"permissions,omitempty"`
-	AcceptedGiftTypes *AcceptedGiftTypes `json:"accepted_gift_types,omitempty"`
-
-	CanSendPaidMedia             *bool   `json:"can_send_paid_media,omitempty"`
-	SlowModeDelay                *int    `json:"slow_mode_delay,omitempty"`
-	UnrestrictedBoostCount       *int    `json:"unrestricted_boost_count,omitempty"`
-	MessageAutoDeleteTime        *int    `json:"message_auto_delete_time,omitempty"`
-	HasAggressiveAntiSpamEnabled *bool   `json:"has_aggressive_anti_spam_enabled,omitempty"`
-	HasHiddenMembers             *bool   `json:"has_hidden_members,omitempty"`
-	HasProtectedContent          *bool   `json:"has_protected_content,omitempty"`
-	HasVisibleHistory            *bool   `json:"has_visible_history,omitempty"`
-	StickerSetName               *string `json:"sticker_set_name,omitempty"`
-	CanSetStickerSet             *bool   `json:"can_set_sticker_set,omitempty"`
-	CustomEmojiStickerSetName    *string `json:"custom_emoji_sticker_set_name,omitempty"`
-	LinkedChatID                 *int    `json:"linked_chat_id,omitempty"`
-
-	Location             *ChatLocation     `json:"location,omitempty"`
-	Rating               *UserRating       `json:"rating,omitempty"`
-	FirstProfileAudio    *Audio            `json:"first_profile_audio,omitempty"`
-	UniqueGiftColors     *UniqueGiftColors `json:"unique_gift_colors,omitempty"`
-	PaidMessageStarCount *int              `json:"paid_message_star_count,omitempty"`
-}
-
-type ChatPhoto struct {
-	SmallFileID       string `json:"small_file_id"`
-	SmallFileUniqueID string `json:"small_file_unique_id"`
-	BigFileID         string `json:"big_file_id"`
-	BigFileUniqueID   string `json:"big_file_unique_id"`
-}
-
-type ChatPermissions struct {
-	CanSendMessages      bool `json:"can_send_messages"`
-	CanSendAudios        bool `json:"can_send_audios"`
-	CanSendDocuments     bool `json:"can_send_documents"`
-	CanSendPhotos        bool `json:"can_send_photos"`
-	CanSendVideoNotes    bool `json:"can_send_video_notes"`
-	CanSendVoiceNotes    bool `json:"can_send_voice_notes"`
-	CanSendPolls         bool `json:"can_send_polls"`
-	CanSendOtherMessages bool `json:"can_send_other_messages"`
-	CanAddWebPagePreview bool `json:"can_add_web_page_preview"`
-	CanChangeInfo        bool `json:"can_change_info"`
-	CanInviteUsers       bool `json:"can_invite_users"`
-	CanPinMessages       bool `json:"can_pin_messages"`
-	CanManageTopics      bool `json:"can_manage_topics"`
-}
-type ChatLocation struct {
-	Location Location `json:"location"`
-	Address  string   `json:"address"`
-}
-type ChatInviteLink struct {
-	InviteLink        string `json:"invite_link"`
-	Creator           User   `json:"creator"`
-	CreateJoinRequest bool   `json:"create_join_request"`
-	IsPrimary         bool   `json:"is_primary"`
-	IsRevoked         bool   `json:"is_revoked"`
-
-	Name                    *string `json:"name,omitempty"`
-	ExpireDate              *int    `json:"expire_date,omitempty"`
-	MemberLimit             *int    `json:"member_limit,omitempty"`
-	PendingJoinRequestCount *int    `json:"pending_join_request_count,omitempty"`
-	SubscriptionPeriod      *int    `json:"subscription_period,omitempty"`
-	SubscriptionPrice       *int    `json:"subscription_price,omitempty"`
-}
-
-type ChatMemberStatusType string
-
-const (
-	ChatMemberStatusOwner         ChatMemberStatusType = "owner"
-	ChatMemberStatusAdministrator ChatMemberStatusType = "administrator"
-	ChatMemberStatusMember        ChatMemberStatusType = "member"
-	ChatMemberStatusRestricted    ChatMemberStatusType = "restricted"
-	ChatMemberStatusLeft          ChatMemberStatusType = "left"
-	ChatMemberStatusBanned        ChatMemberStatusType = "kicked"
-)
-
-type ChatMember struct {
-	Status ChatMemberStatusType `json:"status"`
-	User   User                 `json:"user"`
-
-	// Owner
-	IsAnonymous *bool   `json:"is_anonymous"`
-	CustomTitle *string `json:"custom_title,omitempty"`
-
-	// Administrator
-	CanBeEdited         *bool `json:"can_be_edited,omitempty"`
-	CanManageChat       *bool `json:"can_manage_chat,omitempty"`
-	CanDeleteMessages   *bool `json:"can_delete_messages,omitempty"`
-	CanManageVideoChats *bool `json:"can_manage_video_chats,omitempty"`
-	CanRestrictMembers  *bool `json:"can_restrict_members,omitempty"`
-	CanPromoteMembers   *bool `json:"can_promote_members,omitempty"`
-	CanChangeInfo       *bool `json:"can_change_info,omitempty"`
-	CanInviteUsers      *bool `json:"can_invite_users,omitempty"`
-	CanPostStories      *bool `json:"can_post_stories,omitempty"`
-	CanEditStories      *bool `json:"can_edit_stories,omitempty"`
-	CanDeleteStories    *bool `json:"can_delete_stories,omitempty"`
-
-	CanPostMessages         *bool `json:"can_post_messages,omitempty"`
-	CanEditMessages         *bool `json:"can_edit_messages,omitempty"`
-	CanPinMessages          *bool `json:"can_pin_messages,omitempty"`
-	CanManageTopics         *bool `json:"can_manage_topics,omitempty"`
-	CanManageDirectMessages *bool `json:"can_manage_direct_messages,omitempty"`
-
-	// Member
-	UntilDate *int `json:"until_date,omitempty"`
-
-	// Restricted
-	IsMember             *bool `json:"is_member,omitempty"`
-	CanSendMessages      *bool `json:"can_send_messages,omitempty"`
-	CanSendAudios        *bool `json:"can_send_audios,omitempty"`
-	CanSendDocuments     *bool `json:"can_send_documents,omitempty"`
-	CanSendVideos        *bool `json:"can_send_videos,omitempty"`
-	CanSendVideoNotes    *bool `json:"can_send_video_notes,omitempty"`
-	CanSendVoiceNotes    *bool `json:"can_send_voice_notes,omitempty"`
-	CanSendPolls         *bool `json:"can_send_polls,omitempty"`
-	CanSendOtherMessages *bool `json:"can_send_other_messages,omitempty"`
-	CanAddWebPagePreview *bool `json:"can_add_web_page_preview,omitempty"`
-}
-
-type ChatBoostSource struct {
-	Source string `json:"source"`
-	User   User   `json:"user"`
-
-	// Giveaway
-	GiveawayMessageID *int  `json:"giveaway_message_id,omitempty"`
-	PrizeStarCount    *int  `json:"prize_star_count,omitempty"`
-	IsUnclaimed       *bool `json:"is_unclaimed,omitempty"`
-}
-
-type ChatBoost struct {
-	BoostID        int             `json:"boost_id"`
-	AddDate        int             `json:"add_date"`
-	ExpirationDate int             `json:"expiration_date"`
-	Source         ChatBoostSource `json:"source"`
-}
-type UserChatBoosts struct {
-	Boosts []ChatBoost `json:"boosts"`
-}
-
-type ChatAdministratorRights struct {
-	IsAnonymous         bool `json:"is_anonymous"`
-	CanManageChat       bool `json:"can_manage_chat"`
-	CanDeleteMessages   bool `json:"can_delete_messages"`
-	CanManageVideoChats bool `json:"can_manage_video_chats"`
-	CanRestrictMembers  bool `json:"can_restrict_members"`
-	CanPromoteMembers   bool `json:"can_promote_members"`
-	CanChangeInfo       bool `json:"can_change_info"`
-	CanInviteUsers      bool `json:"can_invite_users"`
-	CanPostStories      bool `json:"can_post_stories"`
-	CanEditStories      bool `json:"can_edit_stories"`
-	CanDeleteStories    bool `json:"can_delete_stories"`
-
-	CanPostMessages         *bool `json:"can_post_messages,omitempty"`
-	CanEditMessages         *bool `json:"can_edit_messages,omitempty"`
-	CanPinMessages          *bool `json:"can_pin_messages,omitempty"`
-	CanManageTopics         *bool `json:"can_manage_topics,omitempty"`
-	CanManageDirectMessages *bool `json:"can_manage_direct_messages,omitempty"`
-}
-
-type ChatBoostUpdated struct {
-	Chat  Chat      `json:"chat"`
-	Boost ChatBoost `json:"boost"`
-}
-
-type ChatBoostRemoved struct {
-	Chat       Chat            `json:"chat"`
-	BoostID    string          `json:"boost_id"`
-	RemoveDate int             `json:"remove_date"`
-	Source     ChatBoostSource `json:"source"`
-}

tgapi/forum_methods.go

@@ -1,86 +0,0 @@
-package tgapi
-
-type BaseForumTopicP struct {
-	ChatID          int `json:"chat_id"`
-	MessageThreadID int `json:"message_thread_id"`
-}
-
-func (api *API) GetForumTopicIconSet() ([]Sticker, error) {
-	req := NewRequest[[]Sticker]("getForumTopicIconSet", NoParams)
-	return req.Do(api)
-}
-
-type CreateForumTopicP struct {
-	ChatID            int                 `json:"chat_id"`
-	Name              string              `json:"name"`
-	IconColor         ForumTopicIconColor `json:"icon_color"`
-	IconCustomEmojiID string              `json:"icon_custom_emoji_id"`
-}
-
-func (api *API) CreateForumTopic(params CreateForumTopicP) (ForumTopic, error) {
-	req := NewRequest[ForumTopic]("createForumTopic", params)
-	return req.Do(api)
-}
-
-type EditForumTopicP struct {
-	BaseForumTopicP
-	Name              string `json:"name"`
-	IconCustomEmojiID string `json:"icon_custom_emoji_id"`
-}
-
-func (api *API) EditForumTopic(params EditForumTopicP) (bool, error) {
-	req := NewRequest[bool]("editForumTopic", params)
-	return req.Do(api)
-}
-
-func (api *API) CloseForumTopic(params BaseForumTopicP) (bool, error) {
-	req := NewRequest[bool]("closeForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) ReopenForumTopic(params BaseForumTopicP) (bool, error) {
-	req := NewRequest[bool]("reopenForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) DeleteForumTopic(params BaseForumTopicP) (bool, error) {
-	req := NewRequest[bool]("deleteForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) UnpinAllForumTopicMessages(params BaseForumTopicP) (bool, error) {
-	req := NewRequest[bool]("unpinAllForumTopicMessages", params)
-	return req.Do(api)
-}
-
-type BaseGeneralForumTopicP struct {
-	ChatID int `json:"chat_id"`
-}
-
-type EditGeneralForumTopicP struct {
-	ChatID int    `json:"chat_id"`
-	Name   string `json:"name"`
-}
-
-func (api *API) EditGeneralForumTopic(params EditGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("editGeneralForumTopic", params)
-	return req.Do(api)
-}
-
-func (api *API) CloseGeneralForumTopic(params BaseGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("closeGeneralForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) ReopenGeneralForumTopic(params BaseGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("reopenGeneralForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) HideGeneralForumTopic(params BaseGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("hideGeneralForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) UnhideGeneralForumTopic(params BaseGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("unhideGeneralForumTopic", params)
-	return req.Do(api)
-}
-func (api *API) UnpinAllGeneralForumTopicMessages(params BaseGeneralForumTopicP) (bool, error) {
-	req := NewRequest[bool]("unpinAllGeneralForumTopicMessages", params)
-	return req.Do(api)
-}

tgapi/forum_types.go

@@ -1,15 +0,0 @@
-package tgapi
-
-type ForumTopic struct {
-	MessageThreadID   int    `json:"message_thread_id"`
-	Name              string `json:"name"`
-	IconColor         int    `json:"icon_color"`
-	IconCustomEmojiID string `json:"icon_custom_emoji_id,omitempty"`
-	IsNameImplicit    bool   `json:"is_name_implicit,omitempty"`
-}
-
-type ForumTopicIconColor int
-
-const (
-	ForumTopicIconColorBlue ForumTopicIconColor = 7322096
-)

tgapi/messages_methods.go

@@ -1,528 +0,0 @@
-package tgapi
-
-type SendMessageP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Text                 string              `json:"text"`
-	ParseMode            ParseMode           `json:"parse_mode,omitempty"`
-	Entities             []MessageEntity     `json:"entities,omitempty"`
-	LinkPreviewOptions   *LinkPreviewOptions `json:"link_preview_options,omitempty"`
-	DisableNotifications bool                `json:"disable_notifications,omitempty"`
-	ProtectContent       bool                `json:"protect_content,omitempty"`
-	AllowPaidBroadcast   bool                `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID      string              `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendMessage(params SendMessageP) (Message, error) {
-	req := NewRequest[Message, SendMessageP]("sendMessage", params)
-	return req.Do(api)
-}
-
-type ForwardMessageP struct {
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	MessageID           int  `json:"message_id,omitempty"`
-	FromChatID          int  `json:"from_chat_id,omitempty"`
-	VideoStartTimestamp int  `json:"video_start_timestamp,omitempty"`
-	DisableNotification bool `json:"disable_notification,omitempty"`
-	ProtectContent      bool `json:"protect_content,omitempty"`
-
-	MessageEffectID         string                   `json:"message_effect_id,omitempty"`
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-}
-
-func (api *API) ForwardMessage(params ForwardMessageP) (Message, error) {
-	req := NewRequest[Message]("forwardMessage", params)
-	return req.Do(api)
-}
-
-type ForwardMessagesP struct {
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	FromChatID          int   `json:"from_chat_id,omitempty"`
-	MessageIDs          []int `json:"message_ids,omitempty"`
-	DisableNotification bool  `json:"disable_notification,omitempty"`
-	ProtectContent      bool  `json:"protect_content,omitempty"`
-}
-
-func (api *API) ForwardMessages(params ForwardMessagesP) ([]int, error) {
-	req := NewRequest[[]int]("forwardMessages", params)
-	return req.Do(api)
-}
-
-type CopyMessageP struct {
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	FromChatID          int       `json:"from_chat_id"`
-	MessageID           int       `json:"message_id"`
-	VideoStartTimestamp int       `json:"video_start_timestamp,omitempty"`
-	Caption             string    `json:"caption,omitempty"`
-	ParseMode           ParseMode `json:"parse_mode,omitempty"`
-
-	CaptionEntities       []MessageEntity `json:"caption_entities,omitempty"`
-	ShowCaptionAboveMedia bool            `json:"show_caption_above_media,omitempty"`
-	DisableNotification   bool            `json:"disable_notification,omitempty"`
-	ProtectContent        bool            `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool            `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string          `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) CopyMessage(params CopyMessageP) (int, error) {
-	req := NewRequest[int]("copyMessage", params)
-	return req.Do(api)
-}
-
-type CopyMessagesP struct {
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	FromChatID          int   `json:"from_chat_id,omitempty"`
-	MessageIDs          []int `json:"message_ids,omitempty"`
-	DisableNotification bool  `json:"disable_notification,omitempty"`
-	ProtectContent      bool  `json:"protect_content,omitempty"`
-	RemoveCaption       bool  `json:"remove_caption,omitempty"`
-}
-
-func (api *API) CopyMessages(params CopyMessagesP) ([]int, error) {
-	req := NewRequest[[]int]("copyMessages", params)
-	return req.Do(api)
-}
-
-type SendLocationP struct {
-	BusinessConnectionID  int `json:"business_connection_id,omitempty"`
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	Latitude             float64 `json:"latitude"`
-	Longitude            float64 `json:"longitude"`
-	HorizontalAccuracy   float64 `json:"horizontal_accuracy,omitempty"`
-	LivePeriod           int     `json:"live_period,omitempty"`
-	Heading              int     `json:"heading,omitempty"`
-	ProximityAlertRadius int     `json:"proximity_alert_radius,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendLocation(params SendLocationP) (Message, error) {
-	req := NewRequest[Message]("sendLocation", params)
-	return req.Do(api)
-}
-
-type SendVenueP struct {
-	BusinessConnectionID  int `json:"business_connection_id,omitempty"`
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	Latitude        float64 `json:"latitude"`
-	Longitude       float64 `json:"longitude"`
-	Title           string  `json:"title"`
-	Address         string  `json:"address"`
-	FoursquareID    string  `json:"foursquare_id,omitempty"`
-	FoursquareType  string  `json:"foursquare_type,omitempty"`
-	GooglePlaceID   string  `json:"google_place_id,omitempty"`
-	GooglePlaceType string  `json:"google_place_type,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendVenue(params SendVenueP) (Message, error) {
-	req := NewRequest[Message]("sendVenue", params)
-	return req.Do(api)
-}
-
-type SendContactP struct {
-	BusinessConnectionID  int `json:"business_connection_id,omitempty"`
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	PhoneNumber string `json:"phone_number"`
-	FirstName   string `json:"first_name"`
-	LastName    string `json:"last_name,omitempty"`
-	Vcard       string `json:"vcard"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendContact(params SendContactP) (Message, error) {
-	req := NewRequest[Message]("sendContact", params)
-	return req.Do(api)
-}
-
-type SendPollP struct {
-	BusinessConnectionID int `json:"business_connection_id,omitempty"`
-	ChatID               int `json:"chat_id"`
-	MessageThreadID      int `json:"message_thread_id,omitempty"`
-
-	Question              string            `json:"question"`
-	QuestionParseMode     ParseMode         `json:"question_mode,omitempty"`
-	QuestionEntities      []MessageEntity   `json:"question_entities,omitempty"`
-	Options               []InputPollOption `json:"options"`
-	IsAnonymous           bool              `json:"is_anonymous,omitempty"`
-	Type                  PollType          `json:"type"`
-	AllowsMultipleAnswers bool              `json:"allows_multiple_answers,omitempty"`
-	CorrectOptionID       int               `json:"correct_option_id,omitempty"`
-	Explanation           string            `json:"explanation,omitempty"`
-	ExplanationParseMode  ParseMode         `json:"explanation_parse_mode,omitempty"`
-	ExplanationEntities   []MessageEntity   `json:"explanation_entities,omitempty"`
-	OpenPeriod            int               `json:"open_period,omitempty"`
-	CloseDate             int               `json:"close_date"`
-	IsClosed              bool              `json:"is_closed,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	ReplyParameters *ReplyParameters `json:"reply_parameters,omitempty"`
-	ReplyMarkup     *ReplyMarkup     `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendPoll(params SendPollP) (Message, error) {
-	req := NewRequest[Message]("sendPoll", params)
-	return req.Do(api)
-}
-
-type SendChecklistP struct {
-	BusinessConnectionID int            `json:"business_connection_id"`
-	ChatID               int            `json:"chat_id"`
-	Checklist            InputChecklist `json:"checklist"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	ReplyParameters *ReplyParameters `json:"reply_parameters,omitempty"`
-	ReplyMarkup     *ReplyMarkup     `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendChecklist(params SendChecklistP) (Message, error) {
-	req := NewRequest[Message]("sendChecklist", params)
-	return req.Do(api)
-}
-
-type SendDiceP struct {
-	BusinessConnectionID  int `json:"business_connection_id,omitempty"`
-	ChatID                int `json:"chat_id"`
-	MessageThreadID       int `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int `json:"direct_messages_topic_id,omitempty"`
-
-	Emoji string `json:"emoji,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (api *API) SendDice(params SendDiceP) (Message, error) {
-	req := NewRequest[Message]("sendDice", params)
-	return req.Do(api)
-}
-
-type SendMessageDraftP struct {
-	ChatID          int             `json:"chat_id"`
-	MessageThreadID int             `json:"message_thread_id,omitempty"`
-	DraftID         int             `json:"draft_id"`
-	Text            string          `json:"text"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	Entities        []MessageEntity `json:"entities,omitempty"`
-}
-
-func (api *API) SendMessageDraft(params SendMessageDraftP) (bool, error) {
-	req := NewRequest[bool]("sendMessageDraft", params)
-	return req.Do(api)
-}
-
-type SendChatActionP struct {
-	BusinessConnectionID string         `json:"business_connection_id,omitempty"`
-	ChatID               int            `json:"chat_id"`
-	MessageThreadID      int            `json:"message_thread_id,omitempty"`
-	Action               ChatActionType `json:"action"`
-}
-
-func (api *API) SendChatAction(params SendChatActionP) (bool, error) {
-	req := NewRequest[bool]("sendChatAction", params)
-	return req.Do(api)
-}
-
-type SetMessageReactionP struct {
-	ChatId    int            `json:"chat_id"`
-	MessageId int            `json:"message_id"`
-	Reaction  []ReactionType `json:"reaction"`
-	IsBig     bool           `json:"is_big,omitempty"`
-}
-
-func (api *API) SetMessageReaction(params SetMessageReactionP) (bool, error) {
-	req := NewRequest[bool]("setMessageReaction", params)
-	return req.Do(api)
-}
-
-// Message update methods
-
-type EditMessageTextP struct {
-	BusinessConnectionID string       `json:"business_connection_id,omitempty"`
-	ChatID               int          `json:"chat_id,omitempty"`
-	MessageID            int          `json:"message_id,omitempty"`
-	InlineMessageID      string       `json:"inline_message_id,omitempty"`
-	Text                 string       `json:"text"`
-	ParseMode            ParseMode    `json:"parse_mode,omitempty"`
-	ReplyMarkup          *ReplyMarkup `json:"reply_markup,omitempty"`
-}
-
-// EditMessageText If inline message, first return will be zero-valued, and second will boolean
-// Otherwise, first return will be Message, and second false
-func (api *API) EditMessageText(params EditMessageTextP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("editMessageText", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("editMessageText", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type EditMessageCaptionP struct {
-	BusinessConnectionID string       `json:"business_connection_id,omitempty"`
-	ChatID               int          `json:"chat_id,omitempty"`
-	MessageID            int          `json:"message_id,omitempty"`
-	InlineMessageID      string       `json:"inline_message_id,omitempty"`
-	Caption              string       `json:"caption"`
-	ParseMode            ParseMode    `json:"parse_mode,omitempty"`
-	ReplyMarkup          *ReplyMarkup `json:"reply_markup,omitempty"`
-}
-
-// EditMessageCaption If inline message, first return will be zero-valued, and second will boolean
-// Otherwise, first return will be Message, and second false
-func (api *API) EditMessageCaption(params EditMessageCaptionP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("editMessageCaption", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("editMessageCaption", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type EditMessageMediaP struct {
-	BusinessConnectionID string                `json:"business_connection_id,omitempty"`
-	ChatID               int                   `json:"chat_id,omitempty"`
-	MessageID            int                   `json:"message_id,omitempty"`
-	InlineMessageID      string                `json:"inline_message_id,omitempty"`
-	Message              InputMedia            `json:"message"`
-	ReplyMarkup          *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
-}
-
-// EditMessageMedia If inline message, first return will be zero-valued, and second will boolean
-// Otherwise, first return will be Message, and second false
-func (api *API) EditMessageMedia(params EditMessageMediaP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("editMessageMedia", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("editMessageMedia", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type EditMessageLiveLocationP struct {
-	BusinessConnectionID string `json:"business_connection_id,omitempty"`
-	ChatID               int    `json:"chat_id,omitempty"`
-	MessageID            int    `json:"message_id,omitempty"`
-	InlineMessageID      string `json:"inline_message_id,omitempty"`
-
-	Latitude             float64               `json:"latitude"`
-	Longitude            float64               `json:"longitude"`
-	LivePeriod           int                   `json:"live_period,omitempty"`
-	HorizontalAccuracy   float64               `json:"horizontal_accuracy,omitempty"`
-	Heading              int                   `json:"heading,omitempty"`
-	ProximityAlertRadius int                   `json:"proximity_alert_radius,omitempty"`
-	ReplyMarkup          *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
-}
-
-// EditMessageLiveLocation If inline message, first return will be zero-valued, and second will boolean
-// Otherwise, first return will be Message, and second false
-func (api *API) EditMessageLiveLocation(params EditMessageLiveLocationP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("editMessageLiveLocation", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("editMessageLiveLocation", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type StopMessageLiveLocationP struct {
-	BusinessConnectionID string                `json:"business_connection_id,omitempty"`
-	ChatID               int                   `json:"chat_id,omitempty"`
-	MessageID            int                   `json:"message_id,omitempty"`
-	InlineMessageID      string                `json:"inline_message_id,omitempty"`
-	ReplyMarkup          *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
-}
-
-// StopMessageLiveLocation If inline message, first return will be zero-valued, and second will boolean
-// Otherwise, first return will be Message, and second false
-func (api *API) StopMessageLiveLocation(params StopMessageLiveLocationP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("stopMessageLiveLocation", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("stopMessageLiveLocation", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type EditMessageChecklistP struct {
-	BusinessConnectionID string                `json:"business_connection_id"`
-	ChatID               int                   `json:"chat_id"`
-	MessageID            int                   `json:"message_id"`
-	Checklist            InputChecklist        `json:"checklist"`
-	ReplyMarkup          *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
-}
-
-func (api *API) EditMessageChecklist(params EditMessageChecklistP) (Message, error) {
-	req := NewRequest[Message]("editMessageChecklist", params)
-	return req.Do(api)
-}
-
-type EditMessageReplyMarkupP struct {
-	BusinessConnectionID string                `json:"business_connection_id,omitempty"`
-	ChatID               int                   `json:"chat_id,omitempty"`
-	MessageID            int                   `json:"message_id,omitempty"`
-	InlineMessageID      string                `json:"inline_message_id,omitempty"`
-	ReplyMarkup          *InlineKeyboardMarkup `json:"reply_markup,omitempty"`
-}
-
-func (api *API) EditMessageReplyMarkup(params EditMessageReplyMarkupP) (Message, bool, error) {
-	var zero Message
-	if params.InlineMessageID != "" {
-		req := NewRequest[bool]("editMessageReplyMarkup", params)
-		res, err := req.Do(api)
-		return zero, res, err
-	}
-	req := NewRequest[Message]("editMessageReplyMarkup", params)
-	res, err := req.Do(api)
-	return res, false, err
-}
-
-type StopPollP struct {
-	BusinessConnectionID string `json:"business_connection_id,omitempty"`
-	ChatID               int    `json:"chat_id"`
-	MessageID            int    `json:"message_id"`
-	InlineMessageID      string `json:"inline_message_id,omitempty"`
-}
-
-func (api *API) StopPoll(params StopPollP) (Poll, error) {
-	req := NewRequest[Poll]("stopPoll", params)
-	return req.Do(api)
-}
-
-type ApproveSuggestedPostP struct {
-	ChatID    int `json:"chat_id"`
-	MessageID int `json:"message_id"`
-	SendDate  int `json:"send_date,omitempty"`
-}
-
-func (api *API) ApproveSuggestedPost(params ApproveSuggestedPostP) (bool, error) {
-	req := NewRequest[bool]("approveSuggestedPost", params)
-	return req.Do(api)
-}
-
-type DeclineSuggestedPostP struct {
-	ChatID    int    `json:"chat_id"`
-	MessageID int    `json:"message_id"`
-	Comment   string `json:"comment,omitempty"`
-}
-
-func (api *API) DeclineSuggestedPost(params DeclineSuggestedPostP) (bool, error) {
-	req := NewRequest[bool]("declineSuggestedPost", params)
-	return req.Do(api)
-}
-
-type DeleteMessageP struct {
-	ChatID    int `json:"chat_id"`
-	MessageID int `json:"message_id"`
-}
-
-func (api *API) DeleteMessage(params DeleteMessageP) (bool, error) {
-	req := NewRequest[bool]("deleteMessage", params)
-	return req.Do(api)
-}
-
-type DeleteMessagesP struct {
-	ChatID     int   `json:"chat_id"`
-	MessageIDs []int `json:"message_ids"`
-}
-
-func (api *API) DeleteMessages(params DeleteMessagesP) (bool, error) {
-	req := NewRequest[bool]("deleteMessages", params)
-	return req.Do(api)
-}
-
-type AnswerCallbackQueryP struct {
-	CallbackQueryID string `json:"callback_query_id"`
-	Text            string `json:"text,omitempty"`
-	ShowAlert       bool   `json:"show_alert,omitempty"`
-	URL             string `json:"url,omitempty"`
-	CacheTime       int    `json:"cache_time,omitempty"`
-}
-
-func (api *API) AnswerCallbackQuery(params AnswerCallbackQueryP) (bool, error) {
-	req := NewRequest[bool]("answerCallbackQuery", params)
-	return req.Do(api)
-}

tgapi/messages_types.go

@@ -1,229 +0,0 @@
-package tgapi
-
-import "git.nix13.pw/scuroneko/extypes"
-
-type MessageReplyMarkup struct {
-	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard"`
-}
-
-type Message struct {
-	MessageID            int    `json:"message_id"`
-	MessageThreadID      int    `json:"message_thread_id,omitempty"`
-	BusinessConnectionId string `json:"business_connection_id,omitempty"`
-	From                 *User  `json:"from,omitempty"`
-
-	SenderChat        *Chat `json:"sender_chat,omitempty"`
-	SenderBoostCount  int   `json:"sender_boost_count,omitempty"`
-	SenderBusinessBot *User `json:"sender_business_bot,omitempty"`
-	Chat              *Chat `json:"chat,omitempty"`
-
-	IsTopicMessage     bool     `json:"is_topic_message,omitempty"`
-	IsAutomaticForward bool     `json:"is_automatic_forward,omitempty"`
-	IsFromOffline      bool     `json:"is_from_offline,omitempty"`
-	IsPaidPost         bool     `json:"is_paid_post,omitempty"`
-	MediaGroupId       string   `json:"media_group_id,omitempty"`
-	AuthorSignature    string   `json:"author_signature,omitempty"`
-	PaidStarCount      int      `json:"paid_star_count,omitempty"`
-	ReplyToMessage     *Message `json:"reply_to_message,omitempty"`
-
-	Text string `json:"text"`
-
-	Photo           extypes.Slice[*PhotoSize] `json:"photo,omitempty"`
-	Caption         string                    `json:"caption,omitempty"`
-	CaptionEntities []MessageEntity           `json:"caption_entities,omitempty"`
-
-	Date     int `json:"date"`
-	EditDate int `json:"edit_date"`
-
-	ReplyMarkup *MessageReplyMarkup `json:"reply_markup,omitempty"`
-
-	Entities           []MessageEntity     `json:"entities,omitempty"`
-	LinkPreviewOptions *LinkPreviewOptions `json:"link_preview_options,omitempty"`
-	SuggestedPostInfo  *SuggestedPostInfo  `json:"suggested_post_info,omitempty"`
-
-	EffectID string `json:"effect_id,omitempty"`
-}
-
-type InaccessibleMessage struct {
-	Chat      Chat `json:"chat"`
-	MessageID int  `json:"message_id"`
-	Date      int  `json:"date"`
-}
-
-type MaybeInaccessibleMessage interface{ Message | InaccessibleMessage }
-
-type MessageEntityType string
-
-const (
-	MessageEntityMention              MessageEntityType = "mention"
-	MessageEntityHashtag              MessageEntityType = "hashtag"
-	MessageEntityCashtag              MessageEntityType = "cashtag"
-	MessageEntityBotCommand           MessageEntityType = "bot_command"
-	MessageEntityUrl                  MessageEntityType = "url"
-	MessageEntityEmail                MessageEntityType = "email"
-	MessageEntityPhoneNumber          MessageEntityType = "phone_number"
-	MessageEntityBold                 MessageEntityType = "bold"
-	MessageEntityItalic               MessageEntityType = "italic"
-	MessageEntityUnderline            MessageEntityType = "underline"
-	MessageEntityStrike               MessageEntityType = "strikethrough"
-	MessageEntitySpoiler              MessageEntityType = "spoiler"
-	MessageEntityBlockquote           MessageEntityType = "blockquote"
-	MessageEntityExpandableBlockquote MessageEntityType = "expandable_blockquote"
-	MessageEntityCode                 MessageEntityType = "code"
-	MessageEntityPre                  MessageEntityType = "pre"
-	MessageEntityTextLink             MessageEntityType = "text_link"
-	MessageEntityTextMention          MessageEntityType = "text_mention"
-	MessageEntityCustomEmoji          MessageEntityType = "custom_emoji"
-)
-
-type MessageEntity struct {
-	Type MessageEntityType `json:"type"`
-
-	Offset        int    `json:"offset"`
-	Length        int    `json:"length"`
-	URL           string `json:"url,omitempty"`
-	User          *User  `json:"user,omitempty"`
-	Language      string `json:"language,omitempty"`
-	CustomEmojiID string `json:"custom_emoji_id,omitempty"`
-}
-
-type ReplyParameters struct {
-	MessageID int `json:"message_id"`
-	ChatID    int `json:"chat_id,omitempty"`
-
-	AllowSendingWithoutReply bool             `json:"allow_sending_without_reply,omitempty"`
-	Quote                    string           `json:"quote,omitempty"`
-	QuoteParsingMode         string           `json:"quote_parsing_mode,omitempty"`
-	QuoteEntities            []*MessageEntity `json:"quote_entities,omitempty"`
-	QuotePosition            int              `json:"quote_position,omitempty"`
-	ChecklistTaskID          int              `json:"checklist_task_id,omitempty"`
-}
-
-type LinkPreviewOptions struct {
-	IsDisabled       bool   `json:"is_disabled,omitempty"`
-	URL              string `json:"url,omitempty"`
-	PreferSmallMedia bool   `json:"prefer_small_media,omitempty"`
-	PreferLargeMedia bool   `json:"prefer_large_media,omitempty"`
-	ShowAboveText    bool   `json:"show_above_text,omitempty"`
-}
-
-type ReplyMarkup struct {
-	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard,omitempty"`
-
-	Keyboard              [][]int `json:"keyboard,omitempty"`
-	IsPersistent          bool    `json:"is_persistent,omitempty"`
-	ResizeKeyboard        bool    `json:"resize_keyboard,omitempty"`
-	OneTimeKeyboard       bool    `json:"one_time_keyboard,omitempty"`
-	InputFieldPlaceholder string  `json:"input_field_placeholder,omitempty"`
-	Selective             bool    `json:"selective,omitempty"`
-
-	RemoveKeyboard bool `json:"remove_keyboard,omitempty"`
-
-	ForceReply bool `json:"force_reply,omitempty"`
-}
-type InlineKeyboardMarkup struct {
-	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard,omitempty"`
-}
-
-type KeyboardButtonStyle string
-type InlineKeyboardButton struct {
-	Text              string              `json:"text"`
-	URL               string              `json:"url,omitempty"`
-	CallbackData      string              `json:"callback_data,omitempty"`
-	Style             KeyboardButtonStyle `json:"style,omitempty"`
-	IconCustomEmojiID string              `json:"icon_custom_emoji_id,omitempty"`
-}
-
-type ReplyKeyboardMarkup struct {
-	Keyboard [][]int `json:"keyboard"`
-}
-
-type CallbackQuery struct {
-	ID      string  `json:"id"`
-	From    User    `json:"from"`
-	Message Message `json:"message"`
-
-	Data string `json:"data"`
-}
-
-type InputPollOption struct {
-	Text          string           `json:"text"`
-	TextParseMode ParseMode        `json:"text_parse_mode,omitempty"`
-	TextEntities  []*MessageEntity `json:"text_entities,omitempty"`
-}
-type PollType string
-
-const (
-	PollTypeRegular PollType = "regular"
-	PollTypeQuiz    PollType = "quiz"
-)
-
-type InputChecklistTask struct {
-	ID           int              `json:"id"`
-	Text         string           `json:"text"`
-	ParseMode    ParseMode        `json:"parse_mode,omitempty"`
-	TextEntities []*MessageEntity `json:"text_entities,omitempty"`
-}
-type InputChecklist struct {
-	Title                   string               `json:"title"`
-	ParseMode               ParseMode            `json:"parse_mode,omitempty"`
-	TitleEntities           []*MessageEntity     `json:"title_entities,omitempty"`
-	Tasks                   []InputChecklistTask `json:"tasks"`
-	OtherCanAddTasks        bool                 `json:"other_can_add_tasks,omitempty"`
-	OtherCanMarkTasksAsDone bool                 `json:"other_can_mark_tasks_as_done,omitempty"`
-}
-
-type ChatActionType string
-
-const (
-	ChatActionTyping          ChatActionType = "typing"
-	ChatActionUploadPhoto     ChatActionType = "upload_photo"
-	ChatActionUploadVideo     ChatActionType = "upload_video"
-	ChatActionUploadVoice     ChatActionType = "upload_voice"
-	ChatActionUploadDocument  ChatActionType = "upload_document"
-	ChatActionChooseSticker   ChatActionType = "choose_sticker"
-	ChatActionFindLocation    ChatActionType = "find_location"
-	ChatActionUploadVideoNone ChatActionType = "upload_video_none"
-)
-
-type MessageReactionUpdated struct {
-	Chat        *Chat          `json:"chat"`
-	MessageID   int            `json:"message_id"`
-	User        *User          `json:"user,omitempty"`
-	ActorChat   *Chat          `json:"actor_chat"`
-	Date        int            `json:"date"`
-	OldReaction []ReactionType `json:"old_reaction"`
-	NewReaction []ReactionType `json:"new_reaction"`
-}
-
-type MessageReactionCountUpdated struct {
-	Chat      *Chat            `json:"chat"`
-	MessageID int              `json:"message_id"`
-	Date      int              `json:"date"`
-	Reactions []*ReactionCount `json:"reactions"`
-}
-type ReactionType struct {
-	Type string `json:"type"`
-	// ReactionTypeEmoji
-	Emoji *string `json:"emoji,omitempty"`
-	// ReactionTypeCustomEmoji
-	CustomEmojiID *string `json:"custom_emoji_id,omitempty"`
-}
-type ReactionCount struct {
-	Type       ReactionType `json:"type"`
-	TotalCount int          `json:"total_count"`
-}
-
-type SuggestedPostPrice struct {
-	Currency string `json:"currency"`
-	Amount   int    `json:"amount"`
-}
-type SuggestedPostInfo struct {
-	State    string             `json:"state"` //State of the suggested post. Currently, it can be one of “pending”, “approved”, “declined”.
-	Price    SuggestedPostPrice `json:"price"`
-	SendDate int                `json:"send_date"`
-}
-type SuggestedPostParameters struct {
-	Price    SuggestedPostPrice `json:"price"`
-	SendDate int                `json:"send_date"`
-}

tgapi/methods.go

@@ -1,62 +0,0 @@
-package tgapi
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-)
-
-type ParseMode string
-
-const (
-	ParseMDV2 ParseMode = "MarkdownV2"
-	ParseHTML ParseMode = "HTML"
-	ParseMD   ParseMode = "Markdown"
-)
-
-type EmptyParams struct{}
-
-var NoParams = EmptyParams{}
-
-type UpdateParams struct {
-	Offset         *int         `json:"offset,omitempty"`
-	Limit          *int         `json:"limit,omitempty"`
-	Timeout        *int         `json:"timeout,omitempty"`
-	AllowedUpdates []UpdateType `json:"allowed_updates"`
-}
-
-func (api *API) GetMe() (User, error) {
-	req := NewRequest[User, EmptyParams]("getMe", NoParams)
-	return req.Do(api)
-}
-func (api *API) LogOut() (bool, error) {
-	req := NewRequest[bool, EmptyParams]("logOut", NoParams)
-	return req.Do(api)
-}
-func (api *API) Close() (bool, error) {
-	req := NewRequest[bool, EmptyParams]("close", NoParams)
-	return req.Do(api)
-}
-func (api *API) GetUpdates(params UpdateParams) ([]Update, error) {
-	req := NewRequest[[]Update]("getUpdates", params)
-	return req.Do(api)
-}
-
-type GetFileP struct {
-	FileId string `json:"file_id"`
-}
-
-func (api *API) GetFile(params GetFileP) (File, error) {
-	req := NewRequest[File]("getFile", params)
-	return req.Do(api)
-}
-
-func (api *API) GetFileByLink(link string) ([]byte, error) {
-	u := fmt.Sprintf("https://api.telegram.org/file/bot%s/%s", api.token, link)
-	res, err := http.Get(u)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	return io.ReadAll(res.Body)
-}

tgapi/pool.go

@@ -1,92 +0,0 @@
-package tgapi
-
-import (
-	"context"
-	"errors"
-	"sync"
-)
-
-var ErrPoolQueueFull = errors.New("worker pool queue full")
-
-type RequestEnvelope struct {
-	DoFunc   func(context.Context) (any, error) // функция, которая выполнит запрос и вернет any
-	ResultCh chan RequestResult                 // канал для результата
-}
-type RequestResult struct {
-	Value any
-	Err   error
-}
-
-// WorkerPool управляет воркерами и очередью
-type WorkerPool struct {
-	taskCh    chan RequestEnvelope
-	queueSize int
-	workers   int
-	wg        sync.WaitGroup
-	quit      chan struct{}
-	started   bool
-	startedMu sync.Mutex
-}
-
-func NewWorkerPool(workers int, queueSize int) *WorkerPool {
-	return &WorkerPool{
-		taskCh:    make(chan RequestEnvelope, queueSize),
-		queueSize: queueSize,
-		workers:   workers,
-		quit:      make(chan struct{}),
-	}
-}
-
-// Start запускает воркеров
-func (p *WorkerPool) Start(ctx context.Context) {
-	p.startedMu.Lock()
-	defer p.startedMu.Unlock()
-	if p.started {
-		return
-	}
-	p.started = true
-	for i := 0; i < p.workers; i++ {
-		p.wg.Add(1)
-		go p.worker(ctx)
-	}
-}
-
-// Stop останавливает пул (ждет завершения текущих задач)
-func (p *WorkerPool) Stop() {
-	close(p.quit)
-	p.wg.Wait()
-}
-
-// Submit отправляет задачу в очередь и возвращает канал для результата
-func (p *WorkerPool) Submit(ctx context.Context, do func(context.Context) (any, error)) (<-chan RequestResult, error) {
-	if len(p.taskCh) >= p.queueSize {
-		return nil, ErrPoolQueueFull
-	}
-
-	resultCh := make(chan RequestResult, 1) // буфер 1, чтобы не блокировать воркера
-	envelope := RequestEnvelope{do, resultCh}
-	select {
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	case p.taskCh <- envelope:
-		return resultCh, nil
-	default:
-		return nil, ErrPoolQueueFull
-	}
-}
-
-// worker выполняет задачи
-func (p *WorkerPool) worker(ctx context.Context) {
-	defer p.wg.Done()
-	for {
-		select {
-		case <-p.quit:
-			return
-		case envelope := <-p.taskCh:
-			// Выполняем задачу с переданным контекстом (или можно использовать свой)
-			val, err := envelope.DoFunc(ctx)
-			envelope.ResultCh <- RequestResult{Value: val, Err: err}
-			close(envelope.ResultCh)
-		}
-	}
-}

tgapi/stickers_methods.go

@@ -1,166 +0,0 @@
-package tgapi
-
-type SendStickerP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Sticker             string `json:"sticker"`
-	Emoji               string `json:"emoji,omitempty"`
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-}
-
-func (api *API) SendSticker(params SendStickerP) (Message, error) {
-	req := NewRequest[Message]("sendSticker", params)
-	return req.Do(api)
-}
-
-type GetStickerSetP struct {
-	Name string `json:"name"`
-}
-
-func (api *API) GetStickerSet(params GetStickerSetP) (StickerSet, error) {
-	req := NewRequest[StickerSet]("getStickerSet", params)
-	return req.Do(api)
-}
-
-type GetCustomEmojiStickersP struct {
-	CustomEmojiIDs []string `json:"custom_emoji_ids"`
-}
-
-func (api *API) GetCustomEmojiStickers(params GetCustomEmojiStickersP) ([]Sticker, error) {
-	req := NewRequest[[]Sticker]("getCustomEmojiStickers", params)
-	return req.Do(api)
-}
-
-type CreateNewStickerSetP struct {
-	UserID int    `json:"user_id"`
-	Name   string `json:"name"`
-	Title  string `json:"title"`
-
-	Stickers        []InputSticker `json:"stickers"`
-	StickerType     StickerType    `json:"sticker_type,omitempty"`
-	NeedsRepainting bool           `json:"needs_repainting,omitempty"`
-}
-
-func (api *API) CreateNewStickerSet(params CreateNewStickerSetP) (bool, error) {
-	req := NewRequest[bool]("createNewStickerSet", params)
-	return req.Do(api)
-}
-
-type AddStickerToSetP struct {
-	UserID  int          `json:"user_id"`
-	Name    string       `json:"name"`
-	Sticker InputSticker `json:"sticker"`
-}
-
-func (api *API) AddStickerToSet(params AddStickerToSetP) (bool, error) {
-	req := NewRequest[bool]("addStickerToSet", params)
-	return req.Do(api)
-}
-
-type SetStickerPositionInSetP struct {
-	Sticker  string `json:"sticker"`
-	Position int    `json:"position"`
-}
-
-func (api *API) SetStickerPosition(params SetStickerPositionInSetP) (bool, error) {
-	req := NewRequest[bool]("setStickerPosition", params)
-	return req.Do(api)
-}
-
-type DeleteStickerFromSetP struct {
-	Sticker string `json:"sticker"`
-}
-
-func (api *API) DeleteStickerFromSet(params DeleteStickerFromSetP) (bool, error) {
-	req := NewRequest[bool]("deleteStickerFromSet", params)
-	return req.Do(api)
-}
-
-type ReplaceStickerInSetP struct {
-	UserID     int          `json:"user_id"`
-	Name       string       `json:"name"`
-	OldSticker string       `json:"old_sticker"`
-	Sticker    InputSticker `json:"sticker"`
-}
-
-func (api *API) ReplaceStickerInSet(params ReplaceStickerInSetP) (bool, error) {
-	req := NewRequest[bool]("replaceStickerInSet", params)
-	return req.Do(api)
-}
-
-type SetStickerEmojiListP struct {
-	Sticker   string   `json:"sticker"`
-	EmojiList []string `json:"emoji_list"`
-}
-
-func (api *API) SetStickerEmojiList(params SetStickerEmojiListP) (bool, error) {
-	req := NewRequest[bool]("setStickerEmojiList", params)
-	return req.Do(api)
-}
-
-type SetStickerKeywordsP struct {
-	Sticker  string   `json:"sticker"`
-	Keywords []string `json:"keywords"`
-}
-
-func (api *API) SetStickerKeywords(params SetStickerKeywordsP) (bool, error) {
-	req := NewRequest[bool]("setStickerKeywords", params)
-	return req.Do(api)
-}
-
-type SetStickerMaskPositionP struct {
-	Sticker      string        `json:"sticker"`
-	MaskPosition *MaskPosition `json:"mask_position,omitempty"`
-}
-
-func (api *API) SetStickerMaskPosition(params SetStickerMaskPositionP) (bool, error) {
-	req := NewRequest[bool]("setStickerMaskPosition", params)
-	return req.Do(api)
-}
-
-type SetStickerSetTitleP struct {
-	Name  string `json:"name"`
-	Title string `json:"title"`
-}
-
-func (api *API) SetStickerSetTitle(params SetStickerSetTitleP) (bool, error) {
-	req := NewRequest[bool]("setStickerSetTitle", params)
-	return req.Do(api)
-}
-
-type SetStickerSetThumbnailP struct {
-	Name      string             `json:"name"`
-	UserID    int                `json:"user_id"`
-	Thumbnail string             `json:"thumbnail"`
-	Format    InputStickerFormat `json:"format"`
-}
-
-func (api *API) SetStickerSetThumbnail(params SetStickerSetThumbnailP) (bool, error) {
-	req := NewRequest[bool]("setStickerSetThumbnail", params)
-	return req.Do(api)
-}
-
-type SetCustomEmojiStickerSetThumbnailP struct {
-	Name          string `json:"name"`
-	CustomEmojiID string `json:"custom_emoji_id,omitempty"`
-}
-
-func (api *API) SetCustomEmojiStickerSetThumbnail(params SetStickerSetThumbnailP) (bool, error) {
-	req := NewRequest[bool]("setCustomEmojiStickerSetThumbnail", params)
-	return req.Do(api)
-}
-
-type DeleteStickerSetP struct {
-	Name string `json:"name"`
-}
-
-func (api *API) DeleteStickerSet(params DeleteStickerSetP) (bool, error) {
-	req := NewRequest[bool]("deleteStickerSet", params)
-	return req.Do(api)
-}

tgapi/stickers_types.go

@@ -1,65 +0,0 @@
-package tgapi
-
-type MaskPositionPoint string
-
-const (
-	MaskPositionForehead MaskPositionPoint = "forehead"
-	MaskPositionEyes     MaskPositionPoint = "eyes"
-	MaskPositionMouth    MaskPositionPoint = "mouth"
-	MaskPositionChin     MaskPositionPoint = "chin"
-)
-
-type MaskPosition struct {
-	Point  MaskPositionPoint `json:"point"`
-	XShift float32           `json:"x_shift"`
-	YShift float32           `json:"y_shift"`
-	Scale  float32           `json:"scale"`
-}
-
-type StickerType string
-
-const (
-	StickerTypeRegular     StickerType = "regular"
-	StickerTypeMask        StickerType = "mask"
-	StickerTypeCustomEmoji StickerType = "custom_emoji"
-)
-
-type Sticker struct {
-	FileId       string      `json:"file_id"`
-	FileUniqueId string      `json:"file_unique_id"`
-	Type         StickerType `json:"type"`
-	Width        int         `json:"width"`
-	Height       int         `json:"height"`
-	IsAnimated   bool        `json:"is_animated"`
-	IsVideo      bool        `json:"is_video"`
-
-	Thumbnail      *PhotoSize    `json:"thumbnail,omitempty"`
-	Emoji          *string       `json:"emoji,omitempty"`
-	SetName        *string       `json:"set_name,omitempty"`
-	MaskPosition   *MaskPosition `json:"mask_position,omitempty"`
-	CustomEmojiID  *string       `json:"custom_emoji_id,omitempty"`
-	NeedRepainting *bool         `json:"need_repainting,omitempty"`
-	FileSize       *int          `json:"file_size,omitempty"`
-}
-type StickerSet struct {
-	Name        string      `json:"name"`
-	Title       string      `json:"title"`
-	StickerType StickerType `json:"sticker_type"`
-	Stickers    []Sticker   `json:"stickers"`
-	Thumbnail   *PhotoSize  `json:"thumbnail,omitempty"`
-}
-type InputStickerFormat string
-
-const (
-	InputStickerFormatStatic   InputStickerFormat = "static"
-	InputStickerFormatAnimated InputStickerFormat = "animated"
-	InputStickerFormatVideo    InputStickerFormat = "video"
-)
-
-type InputSticker struct {
-	Sticker      string             `json:"sticker"`
-	Format       InputStickerFormat `json:"format"`
-	EmojiList    []string           `json:"emoji_list"`
-	MaskPosition *MaskPosition      `json:"mask_position,omitempty"`
-	Keywords     []string           `json:"keywords,omitempty"`
-}

tgapi/types.go

@@ -1,303 +0,0 @@
-package tgapi
-
-type UpdateType string
-
-const (
-	UpdateTypeMessage              UpdateType = "message"
-	UpdateTypeEditedMessage        UpdateType = "edited_message"
-	UpdateTypeChannelPost          UpdateType = "channel_post"
-	UpdateTypeEditedChannelPost    UpdateType = "edited_channel_post"
-	UpdateTypeMessageReaction      UpdateType = "message_reaction"
-	UpdateTypeMessageReactionCount UpdateType = "message_reaction_count"
-
-	UpdateTypeBusinessConnection     UpdateType = "business_connection"
-	UpdateTypeBusinessMessage        UpdateType = "business_message"
-	UpdateTypeEditedBusinessMessage  UpdateType = "edited_business_message"
-	UpdateTypeDeletedBusinessMessage UpdateType = "deleted_business_message"
-
-	UpdateTypeInlineQuery        UpdateType = "inline_query"
-	UpdateTypeChosenInlineResult UpdateType = "chosen_inline_result"
-	UpdateTypeCallbackQuery      UpdateType = "callback_query"
-	UpdateTypeShippingQuery      UpdateType = "shipping_query"
-	UpdateTypePreCheckoutQuery   UpdateType = "pre_checkout_query"
-	UpdateTypePurchasedPaidMedia UpdateType = "purchased_paid_media"
-	UpdateTypePoll               UpdateType = "poll"
-	UpdateTypePollAnswer         UpdateType = "poll_answer"
-	UpdateTypeMyChatMember       UpdateType = "my_chat_member"
-	UpdateTypeChatMember         UpdateType = "chat_member"
-	UpdateTypeChatJoinRequest    UpdateType = "chat_join_request"
-	UpdateTypeChatBoost          UpdateType = "chat_boost"
-	UpdateTypeRemovedChatBoost   UpdateType = "removed_chat_boost"
-)
-
-type Update struct {
-	UpdateID          int      `json:"update_id"`
-	Message           *Message `json:"message,omitempty"`
-	EditedMessage     *Message `json:"edited_message,omitempty"`
-	ChannelPost       *Message `json:"channel_post,omitempty"`
-	EditedChannelPost *Message `json:"edited_channel_post,omitempty"`
-
-	BusinessConnection     *BusinessConnection          `json:"business_connection,omitempty"`
-	BusinessMessage        *Message                     `json:"business_message,omitempty"`
-	EditedBusinessMessage  *Message                     `json:"edited_business_message,omitempty"`
-	DeletedBusinessMessage *Message                     `json:"deleted_business_messages,omitempty"`
-	MessageReaction        *MessageReactionUpdated      `json:"message_reaction,omitempty"`
-	MessageReactionCount   *MessageReactionCountUpdated `json:"message_reaction_count,omitempty"`
-
-	InlineQuery        *InlineQuery        `json:"inline_query,omitempty"`
-	ChosenInlineResult *ChosenInlineResult `json:"chosen_inline_result,omitempty"`
-	CallbackQuery      *CallbackQuery      `json:"callback_query,omitempty"`
-	ShippingQuery      ShippingQuery       `json:"shipping_query,omitempty"`
-	PreCheckoutQuery   *PreCheckoutQuery   `json:"pre_checkout_query,omitempty"`
-	PurchasedPaidMedia *PaidMediaPurchased `json:"purchased_paid_media,omitempty"`
-
-	Poll             *Poll              `json:"poll,omitempty"`
-	PollAnswer       *PollAnswer        `json:"poll_answer,omitempty"`
-	MyChatMember     *ChatMemberUpdated `json:"my_chat_member,omitempty"`
-	ChatMember       *ChatMemberUpdated `json:"chat_member,omitempty"`
-	ChatJoinRequest  *ChatJoinRequest   `json:"chat_join_request,omitempty"`
-	ChatBoost        *ChatBoostUpdated  `json:"chat_boost,omitempty"`
-	RemovedChatBoost *ChatBoostRemoved  `json:"removed_chat_boost,omitempty"`
-}
-
-type InlineQuery struct {
-	ID       string    `json:"id"`
-	From     User      `json:"from"`
-	Query    string    `json:"query"`
-	Offset   string    `json:"offset"`
-	ChatType *ChatType `json:"chat_type,omitempty"`
-	Location *Location `json:"location,omitempty"`
-}
-type ChosenInlineResult struct {
-	ResultID        string    `json:"result_id"`
-	From            User      `json:"from"`
-	Location        *Location `json:"location,omitempty"`
-	InlineMessageID string    `json:"inline_message_id"`
-	Query           string    `json:"query"`
-}
-
-type ShippingQuery struct {
-	ID              string          `json:"id"`
-	From            User            `json:"from"`
-	InvoicePayload  string          `json:"invoice_payload"`
-	ShippingAddress ShippingAddress `json:"shipping_address"`
-}
-type ShippingAddress struct {
-	CountryCode string `json:"country_code"`
-	State       string `json:"state"`
-	City        string `json:"city"`
-	StreetLine1 string `json:"street_line1"`
-	StreetLine2 string `json:"street_line2"`
-	PostCode    string `json:"post_code"`
-}
-
-type OrderInfo struct {
-	Name            string          `json:"name"`
-	PhoneNumber     string          `json:"phone_number"`
-	Email           string          `json:"email"`
-	ShippingAddress ShippingAddress `json:"shipping_address"`
-}
-type PreCheckoutQuery struct {
-	ID               string     `json:"id"`
-	From             User       `json:"from"`
-	Currency         string     `json:"currency"`
-	TotalAmount      int        `json:"total_amount"`
-	InvoicePayload   string     `json:"invoice_payload"`
-	ShippingOptionID string     `json:"shipping_option_id"`
-	OrderInfo        *OrderInfo `json:"order_info,omitempty"`
-}
-
-type PaidMediaPurchased struct {
-	From             User   `json:"from"`
-	PaidMediaPayload string `json:"paid_media_payload"`
-}
-
-type File struct {
-	FileId       string `json:"file_id"`
-	FileUniqueID string `json:"file_unique_id"`
-	FileSize     int    `json:"file_size,omitempty"`
-	FilePath     string `json:"file_path,omitempty"`
-}
-
-type Audio struct {
-	FileID       string `json:"file_id"`
-	FileUniqueID string `json:"file_unique_id"`
-	Duration     int    `json:"duration"`
-
-	Performer string     `json:"performer,omitempty"`
-	Title     string     `json:"title,omitempty"`
-	FileName  string     `json:"file_name,omitempty"`
-	MimeType  string     `json:"mime_type,omitempty"`
-	FileSize  int        `json:"file_size,omitempty"`
-	Thumbnail *PhotoSize `json:"thumbnail,omitempty"`
-}
-
-type PollOption struct {
-	Text         string          `json:"text"`
-	TextEntities []MessageEntity `json:"text_entities"`
-	VoterCount   int             `json:"voter_count"`
-}
-type Poll struct {
-	ID               string          `json:"id"`
-	Question         string          `json:"question"`
-	QuestionEntities []MessageEntity `json:"question_entities"`
-	Options          []PollOption    `json:"options"`
-	TotalVoterCount  int             `json:"total_voter_count"`
-	IsClosed         bool            `json:"is_closed"`
-	IsAnonymous      bool            `json:"is_anonymous"`
-	Type             PollType        `json:"type"`
-
-	AllowsMultipleAnswers bool            `json:"allows_multiple_answers"`
-	CorrectOptionID       *int            `json:"correct_option_id,omitempty"`
-	Explanation           *string         `json:"explanation,omitempty"`
-	ExplanationEntities   []MessageEntity `json:"explanation_entities,omitempty"`
-	OpenPeriod            int             `json:"open_period,omitempty"`
-	CloseDate             int             `json:"close_date,omitempty"`
-}
-type PollAnswer struct {
-	PollID    string `json:"poll_id"`
-	VoterChat Chat   `json:"voter_chat"`
-	User      User   `json:"user"`
-	OptionIDS []int  `json:"option_ids"`
-}
-type ChatMemberUpdated struct {
-	Chat                    Chat            `json:"chat"`
-	From                    User            `json:"from"`
-	Date                    int64           `json:"date"`
-	OldChatMember           ChatMember      `json:"old_chat_member"`
-	NewChatMember           ChatMember      `json:"new_chat_member"`
-	InviteLink              *ChatInviteLink `json:"invite_link,omitempty"`
-	ViaJoinRequest          *bool           `json:"via_join_request,omitempty"`
-	ViaChatFolderInviteLink *bool           `json:"via_chat_folder_invite_link,omitempty"`
-}
-
-type ChatJoinRequest struct {
-	Chat       Chat            `json:"chat"`
-	From       User            `json:"from"`
-	UserChatID int             `json:"user_chat_id"`
-	Date       int64           `json:"date"`
-	Bio        *string         `json:"bio,omitempty"`
-	InviteLink *ChatInviteLink `json:"invite_link,omitempty"`
-}
-
-type Location struct {
-	Latitude             float64 `json:"latitude"`
-	Longitude            float64 `json:"longitude"`
-	HorizontalAccuracy   float64 `json:"horizontal_accuracy"`
-	LivePeriod           int     `json:"live_period"`
-	Heading              int     `json:"heading"`
-	ProximityAlertRadius int     `json:"proximity_alert_radius"`
-}
-type LocationAddress struct {
-	CountryCode string  `json:"country_code"`
-	State       *string `json:"state,omitempty"`
-	City        *string `json:"city,omitempty"`
-	Street      *string `json:"street,omitempty"`
-}
-type Venue struct {
-	Location        Location `json:"location"`
-	Title           string   `json:"title"`
-	Address         string   `json:"address"`
-	FoursquareID    string   `json:"foursquare_id,omitempty"`
-	FoursquareType  string   `json:"foursquare_type,omitempty"`
-	GooglePlaceID   string   `json:"google_place_id,omitempty"`
-	GooglePlaceType string   `json:"google_place_type,omitempty"`
-}
-
-type WebAppInfo struct {
-	URL string `json:"url"`
-}
-
-type StarAmount struct {
-	Amount         int `json:"amount"`
-	NanostarAmount int `json:"nanostar_amount"`
-}
-
-type Story struct {
-	Chat Chat `json:"chat"`
-	ID   int  `json:"id"`
-}
-
-// Gifts
-
-type AcceptedGiftTypes struct {
-	UnlimitedGifts      bool `json:"unlimited_gifts"`
-	LimitedGifts        bool `json:"limited_gifts"`
-	UniqueGifts         bool `json:"unique_gifts"`
-	PremiumSubscription bool `json:"premium_subscription"`
-	GiftsFromChannels   bool `json:"gifts_from_channels"`
-}
-
-type UniqueGiftColors struct {
-	ModelCustomEmojiID    string `json:"model_custom_emoji_id"`
-	SymbolCustomEmojiID   string `json:"symbol_custom_emoji_id"`
-	LightThemeMainColor   int    `json:"light_theme_main_color"`
-	LightThemeOtherColors []int  `json:"light_theme_other_colors"`
-	DarkThemeMainColor    int    `json:"dark_theme_main_color"`
-	DarkThemeOtherColors  []int  `json:"dark_theme_other_colors"`
-}
-
-type GiftBackground struct {
-	CenterColor int `json:"center_color"`
-	EdgeColor   int `json:"edge_color"`
-	TextColor   int `json:"text_color"`
-}
-type Gift struct {
-	ID                     string         `json:"id"`
-	Sticker                Sticker        `json:"sticker"`
-	StarCount              int            `json:"star_count"`
-	UpdateStarCount        *int           `json:"update_star_count,omitempty"`
-	IsPremium              *bool          `json:"is_premium,omitempty"`
-	HasColors              *bool          `json:"has_colors,omitempty"`
-	TotalCount             *int           `json:"total_count,omitempty"`
-	RemainingCount         *int           `json:"remaining_count,omitempty"`
-	PersonalTotalCount     *int           `json:"personal_total_count,omitempty"`
-	PersonalRemainingCount *int           `json:"personal_remaining_count,omitempty"`
-	Background             GiftBackground `json:"background,omitempty"`
-	UniqueGiftVariantColor *int           `json:"unique_gift_variant_color,omitempty"`
-	PublisherChat          *Chat          `json:"publisher_chat,omitempty"`
-}
-type Gifts struct {
-	Gifts []Gift `json:"gifts"`
-}
-
-const (
-	OwnedGiftRegularType OwnedGiftType = "regular"
-	OwnedGiftUniqueType  OwnedGiftType = "unique"
-)
-
-type OwnedGiftType string
-type BaseOwnedGift struct {
-	Type        OwnedGiftType `json:"type"`
-	OwnerGiftID *string       `json:"owner_gift_id,omitempty"`
-	SendDate    *int          `json:"send_date,omitempty"`
-	IsSaved     *bool         `json:"is_saved,omitempty"`
-}
-type OwnedGiftRegular struct {
-	BaseOwnedGift
-	Gift                    Gift            `json:"gift"`
-	SenderUser              User            `json:"sender_user,omitempty"`
-	Text                    string          `json:"text,omitempty"`
-	Entities                []MessageEntity `json:"entities,omitempty"`
-	IsPrivate               *bool           `json:"is_private,omitempty"`
-	CanBeUpgraded           *bool           `json:"can_be_upgraded,omitempty"`
-	WasRefunded             *bool           `json:"was_refunded,omitempty"`
-	ConvertStarCount        *int            `json:"convert_star_count,omitempty"`
-	PrepaidUpgradeStarCount *int            `json:"prepaid_upgrade_star_count,omitempty"`
-	IsUpgradeSeparate       *bool           `json:"is_upgrade_separate,omitempty"`
-	UniqueGiftNumber        *int            `json:"unique_gift_number,omitempty"`
-}
-type OwnedGiftUnique struct {
-	BaseOwnedGift
-	CanBeTransferred  *bool `json:"can_be_transferred,omitempty"`
-	TransferStarCount *int  `json:"transfer_star_count,omitempty"`
-	NextTransferDate  *int  `json:"next_transfer_date,omitempty"`
-}
-type OwnedGifts struct {
-	TotalCount int `json:"total_count"`
-	Gifts      []struct {
-		OwnedGiftRegular
-		OwnedGiftUnique
-	} `json:"gifts"`
-	NextOffset string `json:"next_offset"`
-}

tgapi/uploader_api.go

@@ -1,182 +0,0 @@
-package tgapi
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"mime/multipart"
-	"net/http"
-	"path/filepath"
-
-	"git.nix13.pw/scuroneko/laniakea/utils"
-	"git.nix13.pw/scuroneko/slog"
-)
-
-const (
-	UploaderPhotoType     UploaderFileType = "photo"
-	UploaderVideoType     UploaderFileType = "video"
-	UploaderAudioType     UploaderFileType = "audio"
-	UploaderDocumentType  UploaderFileType = "document"
-	UploaderVoiceType     UploaderFileType = "voice"
-	UploaderVideoNoteType UploaderFileType = "video_note"
-	UploaderThumbnailType UploaderFileType = "thumbnail"
-)
-
-type UploaderFileType string
-type UploaderFile struct {
-	filename string
-	data     []byte
-	field    UploaderFileType
-}
-
-func NewUploaderFile(name string, data []byte) UploaderFile {
-	t := uploaderTypeByExt(name)
-	return UploaderFile{filename: name, data: data, field: t}
-}
-
-// SetType used when auto-detect failed.
-// i.e. you sending a voice message, but it detects as audio, or if you send audio with thumbnail
-func (f UploaderFile) SetType(t UploaderFileType) UploaderFile {
-	f.field = t
-	return f
-}
-
-type Uploader struct {
-	api    *API
-	logger *slog.Logger
-}
-
-func NewUploader(api *API) *Uploader {
-	logger := slog.CreateLogger().Level(utils.GetLoggerLevel()).Prefix("UPLOADER")
-	logger.AddWriter(logger.CreateJsonStdoutWriter())
-	return &Uploader{api, logger}
-}
-func (u *Uploader) Close() error            { return u.logger.Close() }
-func (u *Uploader) GetLogger() *slog.Logger { return u.logger }
-
-type UploaderRequest[R, P any] struct {
-	method string
-	files  []UploaderFile
-	params P
-}
-
-func NewUploaderRequest[R, P any](method string, params P, files ...UploaderFile) UploaderRequest[R, P] {
-	return UploaderRequest[R, P]{method, files, params}
-}
-func (r UploaderRequest[R, P]) doRequest(ctx context.Context, up *Uploader) (R, error) {
-	var zero R
-	if up.api.limiter != nil {
-		if up.api.dropOverflowLimit {
-			if !up.api.limiter.Allow() {
-				return zero, errors.New("rate limited")
-			}
-		} else {
-			if err := up.api.limiter.Wait(ctx); err != nil {
-				return zero, err
-			}
-		}
-	}
-
-	buf, contentType, err := prepareMultipart(r.files, r.params)
-	if err != nil {
-		return zero, err
-	}
-
-	methodPrefix := ""
-	if up.api.useTestServer {
-		methodPrefix = "/test"
-	}
-	url := fmt.Sprintf("%s/bot%s%s/%s", up.api.apiUrl, up.api.token, methodPrefix, r.method)
-	req, err := http.NewRequestWithContext(ctx, "POST", url, buf)
-	if err != nil {
-		return zero, err
-	}
-	req.Header.Set("Content-Type", contentType)
-	req.Header.Set("Accept", "application/json")
-	req.Header.Set("User-Agent", fmt.Sprintf("Laniakea/%s", utils.VersionString))
-
-	up.logger.Debugln("UPLOADER REQ", r.method)
-	res, err := up.api.client.Do(req)
-	if err != nil {
-		return zero, err
-	}
-	defer res.Body.Close()
-
-	body, err := readBody(res.Body)
-	up.logger.Debugln("UPLOADER RES", r.method, string(body))
-	if res.StatusCode != http.StatusOK {
-		return zero, fmt.Errorf("unexpected status code: %d, %s", res.StatusCode, string(body))
-	}
-
-	return parseBody[R](body)
-}
-func (r UploaderRequest[R, P]) DoWithContext(ctx context.Context, up *Uploader) (R, error) {
-	var zero R
-
-	result, err := up.api.pool.Submit(ctx, func(ctx context.Context) (any, error) {
-		return r.doRequest(ctx, up)
-	})
-	if err != nil {
-		return zero, err
-	}
-
-	select {
-	case <-ctx.Done():
-		return zero, ctx.Err()
-	case res := <-result:
-		if res.Err != nil {
-			return zero, res.Err
-		}
-		if val, ok := res.Value.(R); ok {
-			return val, nil
-		}
-		return zero, ErrPoolUnexpected
-	}
-}
-func (r UploaderRequest[R, P]) Do(up *Uploader) (R, error) {
-	return r.DoWithContext(context.Background(), up)
-}
-
-func prepareMultipart[P any](files []UploaderFile, params P) (*bytes.Buffer, string, error) {
-	buf := bytes.NewBuffer(nil)
-	w := multipart.NewWriter(buf)
-
-	for _, file := range files {
-		fw, err := w.CreateFormFile(string(file.field), file.filename)
-		if err != nil {
-			_ = w.Close()
-			return buf, w.FormDataContentType(), err
-		}
-
-		_, err = fw.Write(file.data)
-		if err != nil {
-			_ = w.Close()
-			return buf, w.FormDataContentType(), err
-		}
-	}
-
-	err := utils.Encode(w, params)
-	if err != nil {
-		_ = w.Close()
-		return buf, w.FormDataContentType(), err
-	}
-	err = w.Close()
-	return buf, w.FormDataContentType(), err
-}
-
-func uploaderTypeByExt(filename string) UploaderFileType {
-	ext := filepath.Ext(filename)
-	switch ext {
-	case ".jpg", ".jpeg", ".png", ".webp", ".bmp":
-		return UploaderPhotoType
-	case ".mp4":
-		return UploaderVideoType
-	case ".mp3", ".m4a":
-		return UploaderAudioType
-	case ".ogg":
-		return UploaderVoiceType
-	default:
-		return UploaderDocumentType
-	}
-}

tgapi/uploader_methods.go

@@ -1,206 +0,0 @@
-package tgapi
-
-type UploadPhotoP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	ShowCaptionAboveMedia bool   `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool   `json:"has_spoiler,omitempty"`
-	DisableNotification   bool   `json:"disable_notification,omitempty"`
-	ProtectContent        bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadPhoto(params UploadPhotoP, file UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendPhoto", params, file)
-	return req.Do(u)
-}
-
-type UploadAudioP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	Duration  int    `json:"duration,omitempty"`
-	Performer string `json:"performer,omitempty"`
-	Title     string `json:"title,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadAudio(params UploadAudioP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendAudio", params, files...)
-	return req.Do(u)
-}
-
-type UploadDocumentP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	DisableContentTypeDetection bool   `json:"disable_content_type_detection,omitempty"`
-	DisableNotification         bool   `json:"disable_notification,omitempty"`
-	ProtectContent              bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast          bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID             string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadDocument(params UploadDocumentP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendDocument", params, files...)
-	return req.Do(u)
-}
-
-type UploadVideoP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Duration int `json:"duration,omitempty"`
-	Width    int `json:"width,omitempty"`
-	Height   int `json:"height,omitempty"`
-
-	StartTimestamp  int64           `json:"start_timestamp,omitempty"`
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	ShowCaptionAboveMedia bool   `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool   `json:"has_spoiler,omitempty"`
-	SupportsStreaming     bool   `json:"supports_streaming,omitempty"`
-	DisableNotification   bool   `json:"disable_notification,omitempty"`
-	ProtectContent        bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadVideo(params UploadVideoP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendVideo", params, files...)
-	return req.Do(u)
-}
-
-type UploadAnimationP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Duration int `json:"duration,omitempty"`
-	Width    int `json:"width,omitempty"`
-	Height   int `json:"height,omitempty"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-
-	ShowCaptionAboveMedia bool   `json:"show_caption_above_media,omitempty"`
-	HasSpoiler            bool   `json:"has_spoiler,omitempty"`
-	DisableNotification   bool   `json:"disable_notification,omitempty"`
-	ProtectContent        bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast    bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID       string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadAnimation(params UploadAnimationP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendAnimation", params, files...)
-	return req.Do(u)
-}
-
-type UploadVoiceP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Caption         string          `json:"caption,omitempty"`
-	ParseMode       ParseMode       `json:"parse_mode,omitempty"`
-	CaptionEntities []MessageEntity `json:"caption_entities,omitempty"`
-	Duration        int             `json:"duration,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadVoice(params UploadVoiceP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendVoice", params, files...)
-	return req.Do(u)
-}
-
-type UploadVideoNoteP struct {
-	BusinessConnectionID  string `json:"business_connection_id,omitempty"`
-	ChatID                int    `json:"chat_id"`
-	MessageThreadID       int    `json:"message_thread_id,omitempty"`
-	DirectMessagesTopicID int    `json:"direct_messages_topic_id,omitempty"`
-
-	Duration int `json:"duration,omitempty"`
-	Length   int `json:"length,omitempty"`
-
-	DisableNotification bool   `json:"disable_notification,omitempty"`
-	ProtectContent      bool   `json:"protect_content,omitempty"`
-	AllowPaidBroadcast  bool   `json:"allow_paid_broadcast,omitempty"`
-	MessageEffectID     string `json:"message_effect_id,omitempty"`
-
-	SuggestedPostParameters *SuggestedPostParameters `json:"suggested_post_parameters,omitempty"`
-	ReplyParameters         *ReplyParameters         `json:"reply_parameters,omitempty"`
-	ReplyMarkup             *ReplyMarkup             `json:"reply_markup,omitempty"`
-}
-
-func (u *Uploader) UploadVideoNote(params UploadVideoNoteP, files ...UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendVideoNote", params, files...)
-	return req.Do(u)
-}
-
-type UploadChatPhotoP struct {
-	ChatID int `json:"chat_id"`
-}
-
-func (u *Uploader) UploadChatPhoto(params UploadChatPhotoP, photo UploaderFile) (Message, error) {
-	req := NewUploaderRequest[Message]("sendChatPhoto", params, photo)
-	return req.Do(u)
-}

tgapi/users_methods.go

@@ -1,51 +0,0 @@
-package tgapi
-
-type GetUserProfilePhotosP struct {
-	UserID int `json:"user_id"`
-	Offset int `json:"offset,omitempty"`
-	Limit  int `json:"limit,omitempty"`
-}
-
-func (api *API) GetUserProfilePhotos(params GetUserProfilePhotosP) (UserProfilePhotos, error) {
-	req := NewRequest[UserProfilePhotos]("getUserProfilePhotos", params)
-	return req.Do(api)
-}
-
-type GetUserProfileAudiosP struct {
-	UserID int `json:"user_id"`
-	Offset int `json:"offset,omitempty"`
-	Limit  int `json:"limit,omitempty"`
-}
-
-func (api *API) GetUserProfileAudios(params GetUserProfileAudiosP) (UserProfileAudios, error) {
-	req := NewRequest[UserProfileAudios]("getUserProfileAudios", params)
-	return req.Do(api)
-}
-
-type SetUserEmojiStatusP struct {
-	UserID         int    `json:"user_id"`
-	EmojiID        string `json:"emoji_status_custom_emoji_id,omitempty"`
-	ExpirationDate int    `json:"emoji_status_expiration_date,omitempty"`
-}
-
-func (api *API) SetUserEmojiStatus(params SetUserEmojiStatusP) (bool, error) {
-	req := NewRequest[bool]("setUserEmojiStatus", params)
-	return req.Do(api)
-}
-
-type GetUserGiftsP struct {
-	UserID                      int    `json:"user_id"`
-	ExcludeUnlimited            bool   `json:"exclude_unlimited,omitempty"`
-	ExcludeLimitedUpgradable    bool   `json:"exclude_limited_upgradable,omitempty"`
-	ExcludeLimitedNonUpgradable bool   `json:"exclude_limited_non_upgradable,omitempty"`
-	ExcludeUnique               bool   `json:"exclude_unique,omitempty"`
-	ExcludeFromBlockchain       bool   `json:"exclude_from_blockchain,omitempty"`
-	SortByPrice                 bool   `json:"sort_by_price,omitempty"`
-	Offset                      string `json:"offset,omitempty"`
-	Limit                       int    `json:"limit,omitempty"`
-}
-
-func (api *API) GetUserGifts(params GetUserGiftsP) (OwnedGifts, error) {
-	req := NewRequest[OwnedGifts]("getUserGifts", params)
-	return req.Do(api)
-}

tgapi/users_types.go

@@ -1,40 +0,0 @@
-package tgapi
-
-type User struct {
-	ID                        int     `json:"id"`
-	IsBot                     bool    `json:"is_bot"`
-	FirstName                 string  `json:"first_name"`
-	LastName                  *string `json:"last_name,omitempty"`
-	Username                  *string `json:"username,omitempty"`
-	LanguageCode              *string `json:"language_code,omitempty"`
-	IsPremium                 *bool   `json:"is_premium,omitempty"`
-	AddedToAttachmentMenu     *bool   `json:"added_to_attachment_menu,omitempty"`
-	CanJoinGroups             *bool   `json:"can_join_groups,omitempty"`
-	CanReadAllGroupMessages   *bool   `json:"can_read_all_group_messages,omitempty"`
-	SupportsInlineQueries     *bool   `json:"supports_inline_queries,omitempty"`
-	CanConnectToBusiness      *bool   `json:"can_connect_to_business,omitempty"`
-	HasMainWebApp             *bool   `json:"has_main_web_app,omitempty"`
-	HasTopicsEnabled          *bool   `json:"has_topics_enabled,omitempty"`
-	AllowsUsersToCreateTopics *bool   `json:"allows_users_to_create_topics,omitempty"`
-}
-
-type UserProfilePhotos struct {
-	TotalCount int           `json:"total_count"`
-	Photos     [][]PhotoSize `json:"photos"`
-}
-type UserProfileAudios struct {
-	TotalCount int     `json:"total_count"`
-	Audios     []Audio `json:"audios"`
-}
-
-type UserRating struct {
-	Level              int `json:"level"`
-	Rating             int `json:"rating"`
-	CurrentLevelRating int `json:"current_level_rating"`
-	NextLevelRating    int `json:"next_level_rating"`
-}
-type Birthdate struct {
-	Day   int `json:"day"`
-	Month int `json:"month"`
-	Year  int `json:"year"`
-}

types.go

@@ -0,0 +1,196 @@
+package laniakea
+
+import "git.nix13.pw/scuroneko/extypes"
+
+type Update struct {
+	UpdateID               int                          `json:"update_id"`
+	Message                *Message                     `json:"message"`
+	EditedMessage          *Message                     `json:"edited_message,omitempty"`
+	ChannelPost            *Message                     `json:"channel_post,omitempty"`
+	EditedChannelPost      *Message                     `json:"edited_channel_post,omitempty"`
+	BusinessConnection     *BusinessConnection          `json:"business_connection,omitempty"`
+	BusinessMessage        *Message                     `json:"business_message,omitempty"`
+	EditedBusinessMessage  *Message                     `json:"edited_business_message,omitempty"`
+	DeletedBusinessMessage *Message                     `json:"deleted_business_messages,omitempty"`
+	MessageReaction        *MessageReactionUpdated      `json:"message_reaction,omitempty"`
+	MessageReactionCount   *MessageReactionCountUpdated `json:"message_reaction_count,omitempty"`
+	CallbackQuery          *CallbackQuery               `json:"callback_query,omitempty"`
+	InlineQuery            int
+	ChosenInlineResult     int
+}
+
+type User struct {
+	ID                      int    `json:"id"`
+	IsBot                   bool   `json:"is_bot"`
+	FirstName               string `json:"first_name"`
+	LastName                string `json:"last_name,omitempty"`
+	Username                string `json:"username,omitempty"`
+	LanguageCode            string `json:"language_code,omitempty"`
+	IsPremium               bool   `json:"is_premium,omitempty"`
+	AddedToAttachmentMenu   bool   `json:"added_to_attachment_menu,omitempty"`
+	CanJoinGroups           bool   `json:"can_join_groups,omitempty"`
+	CanReadAllGroupMessages bool   `json:"can_read_all_group_messages,omitempty"`
+	SupportsInlineQueries   bool   `json:"supports_inline_queries,omitempty"`
+	CanConnectToBusiness    bool   `json:"can_connect_to_business,omitempty"`
+	HasMainWebApp           bool   `json:"has_main_web_app,omitempty"`
+}
+
+type Chat struct {
+	ID        int    `json:"id"`
+	Type      string `json:"type"`
+	Title     string `json:"title,omitempty"`
+	Username  string `json:"username,omitempty"`
+	FirstName string `json:"first_name,omitempty"`
+	LastName  string `json:"last_name,omitempty"`
+	IsForum   bool   `json:"is_forum,omitempty"`
+}
+
+type MessageReplyMarkup struct {
+	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard"`
+}
+
+type Message struct {
+	MessageID       int    `json:"message_id"`
+	MessageThreadID int    `json:"message_thread_id,omitempty"`
+	From            *User  `json:"from,omitempty"`
+	Chat            *Chat  `json:"chat,omitempty"`
+	Text            string `json:"text"`
+
+	Photo          extypes.Slice[*PhotoSize] `json:"photo,omitempty"`
+	Caption        string                    `json:"caption,omitempty"`
+	ReplyToMessage *Message                  `json:"reply_to_message"`
+
+	ReplyMarkup *MessageReplyMarkup `json:"reply_markup,omitempty"`
+}
+
+type InaccessableMessage struct {
+	Chat      *Chat `json:"chat"`
+	MessageID int   `json:"message_id"`
+	Date      int   `json:"date"`
+}
+
+type MaybeInaccessibleMessage struct {
+}
+
+type MessageEntity struct {
+	Type          string `json:"type"`
+	Offset        int    `json:"offset"`
+	Length        int    `json:"length"`
+	URL           string `json:"url,omitempty"`
+	User          *User  `json:"user,omitempty"`
+	Language      string `json:"language,omitempty"`
+	CustomEmojiID string `json:"custom_emoji_id,omitempty"`
+}
+
+type ReplyParameters struct {
+	MessageID                int              `json:"message_id"`
+	ChatID                   int              `json:"chat_id,omitempty"`
+	AllowSendingWithoutReply bool             `json:"allow_sending_without_reply,omitempty"`
+	Quote                    string           `json:"quote,omitempty"`
+	QuoteParsingMode         string           `json:"quote_parsing_mode,omitempty"`
+	QuoteEntities            []*MessageEntity `json:"quote_entities,omitempty"`
+	QuotePosition            int              `json:"quote_postigin,omitempty"`
+}
+
+type PhotoSize struct {
+	FileID       string `json:"file_id"`
+	FileUniqueID string `json:"file_unique_id"`
+	Width        int    `json:"width"`
+	Height       int    `json:"height"`
+	FileSize     int    `json:"file_size,omitempty"`
+}
+
+type LinkPreviewOptions struct {
+	IsDisabled       bool   `json:"is_disabled,omitempty"`
+	URL              string `json:"url,omitempty"`
+	PreferSmallMedia bool   `json:"prefer_small_media,omitempty"`
+	PreferLargeMedia bool   `json:"prefer_large_media,omitempty"`
+	ShowAboveText    bool   `json:"show_above_text,omitempty"`
+}
+
+type InlineKeyboardMarkup struct {
+	InlineKeyboard [][]InlineKeyboardButton `json:"inline_keyboard,omitempty"`
+}
+
+type InlineKeyboardButton struct {
+	Text         string `json:"text"`
+	URL          string `json:"url,omitempty"`
+	CallbackData string `json:"callback_data,omitempty"`
+}
+
+type ReplyKeyboardMarkup struct {
+	Keyboard [][]int `json:"keyboard"`
+}
+
+type CallbackQuery struct {
+	ID      string   `json:"id"`
+	From    *User    `json:"from"`
+	Message *Message `json:"message"`
+
+	Data string `json:"data"`
+}
+
+type BusinessConnection struct {
+	ID         string `json:"id"`
+	User       *User  `json:"user"`
+	UserChatID int    `json:"user_chat_id"`
+	Date       int    `json:"date"`
+	CanReply   bool   `json:"can_reply"`
+	IsEnabled  bool   `json:"id_enabled"`
+}
+
+type MessageReactionUpdated struct {
+	Chat        *Chat           `json:"chat"`
+	MessageID   int             `json:"message_id"`
+	User        *User           `json:"user,omitempty"`
+	ActorChat   *Chat           `json:"actor_chat"`
+	Date        int             `json:"date"`
+	OldReaction []*ReactionType `json:"old_reaction"`
+	NewReaction []*ReactionType `json:"new_reaction"`
+}
+
+type MessageReactionCountUpdated struct {
+	Chat      *Chat            `json:"chat"`
+	MessageID int              `json:"message_id"`
+	Date      int              `json:"date"`
+	Reactions []*ReactionCount `json:"reactions"`
+}
+
+type ReactionType struct {
+	Type string `json:"type"`
+}
+type ReactionTypeEmoji struct {
+	ReactionType
+	Emoji string `json:"emoji"`
+}
+type ReactionTypeCustomEmoji struct {
+	ReactionType
+	CustomEmojiID string `json:"custom_emoji_id"`
+}
+type ReactionTypePaid struct {
+	ReactionType
+}
+type ReactionCount struct {
+	Type       *ReactionType `json:"type"`
+	TotalCount int           `json:"total_count"`
+}
+
+type File struct {
+	FileId       string `json:"file_id"`
+	FileUniqueID string `json:"file_unique_id"`
+	FileSize     int    `json:"file_size,omitempty"`
+	FilePath     string `json:"file_path,omitempty"`
+}
+
+type ChatActions string
+
+const (
+	ChatActionTyping          ChatActions = "typing"
+	ChatActionUploadPhoto     ChatActions = "upload_photo"
+	ChatActionUploadVideo     ChatActions = "upload_video"
+	ChatActionUploadVoice     ChatActions = "upload_voice"
+	ChatActionUploadDocument  ChatActions = "upload_document"
+	ChatActionChooseSticker   ChatActions = "choose_sticker"
+	ChatActionFindLocation    ChatActions = "find_location"
+	ChatActionUploadVideoNone ChatActions = "upload_video_none"
+)

uploader.go

@@ -0,0 +1,136 @@
+package laniakea
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"path/filepath"
+)
+
+type Uploader struct {
+	bot *Bot
+}
+
+func NewUploader(bot *Bot) *Uploader {
+	return &Uploader{bot: bot}
+}
+
+type UploaderFileType string
+
+const (
+	UploaderPhotoType     UploaderFileType = "photo"
+	UploaderVideoType     UploaderFileType = "video"
+	UploaderAudioType     UploaderFileType = "audio"
+	UploaderDocumentType  UploaderFileType = "document"
+	UploaderVoiceType     UploaderFileType = "voice"
+	UploaderVideoNoteType UploaderFileType = "video_note"
+)
+
+type UploaderFile struct {
+	filename string
+	data     []byte
+	t        UploaderFileType
+}
+
+func NewUploaderFile(name string, data []byte) UploaderFile {
+	t := uploaderTypeByExt(name)
+	return UploaderFile{filename: name, data: data, t: t}
+}
+
+// SetType used when auto-detect failed. I.e. you sending a voice message, but it detects as audio
+func (f UploaderFile) SetType(t UploaderFileType) UploaderFile {
+	f.t = t
+	return f
+}
+
+type UploaderRequest[R, P any] struct {
+	method string
+	file   UploaderFile
+	params P
+}
+
+func NewUploaderRequest[R, P any](method string, file UploaderFile, params P) UploaderRequest[R, P] {
+	return UploaderRequest[R, P]{method, file, params}
+}
+
+func (u UploaderRequest[R, P]) Do(bot *Bot) (*R, error) {
+	url := fmt.Sprintf("https://api.telegram.org/bot%s/%s", bot.token, u.method)
+
+	buf := bytes.NewBuffer(nil)
+	w := multipart.NewWriter(buf)
+
+	fw, err := w.CreateFormFile(string(u.file.t), u.file.filename)
+	if err != nil {
+		w.Close()
+		return nil, err
+	}
+	_, err = fw.Write(u.file.data)
+	if err != nil {
+		w.Close()
+		return nil, err
+	}
+	err = Encode(w, u.params)
+	if err != nil {
+		w.Close()
+		return nil, err
+	}
+	err = w.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest("POST", url, buf)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Content-Type", w.FormDataContentType())
+	bot.logger.Debugln("UPLOADER REQ", u.method)
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return nil, err
+	}
+	bot.logger.Debugln("UPLOADER RES", u.method, string(body))
+	if res.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("[%d] %s", res.StatusCode, string(body))
+	}
+
+	response := new(ApiResponse[*R])
+	err = json.Unmarshal(body, response)
+	if err != nil {
+		return nil, err
+	}
+	if !response.Ok {
+		return nil, fmt.Errorf("[%d] %s", response.ErrorCode, response.Description)
+	}
+	return response.Result, nil
+}
+
+func (u *Uploader) UploadPhoto(file UploaderFile, params SendPhotoBaseP) (*Message, error) {
+	req := NewUploaderRequest[Message]("sendPhoto", file, params)
+	return req.Do(u.bot)
+}
+
+func uploaderTypeByExt(filename string) UploaderFileType {
+	ext := filepath.Ext(filename)
+	switch ext {
+	case ".jpg", ".jpeg", ".png", ".webp", ".bmp":
+		return UploaderPhotoType
+	case ".mp4":
+		return UploaderVideoType
+	case ".mp3", ".m4a":
+		return UploaderAudioType
+	case ".ogg":
+		return UploaderVoiceType
+	default:
+		return UploaderDocumentType
+	}
+}

utils.go

@@ -1,15 +1,75 @@
 package laniakea
 
-import "git.nix13.pw/scuroneko/laniakea/utils"
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+)
 
-func Ptr[T any](v T) *T { return &v }
+// MapToStruct unsafe function
-func Val[T any](p *T, def T) T {
+func MapToStruct(m map[string]any, s any) error {
-	if p != nil {
+	data, err := json.Marshal(m)
-		return *p
+	if err != nil {
+		return err
 	}
-	return def
+	err = json.Unmarshal(data, s)
+	return err
 }
-func EscapeMarkdown(s string) string   { return utils.EscapeMarkdown(s) }
-func EscapeMarkdownV2(s string) string { return utils.EscapeMarkdownV2(s) }
 
-const VersionString = utils.VersionString
+// 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
+}
+
+func StructToMap(s any) (map[string]any, error) {
+	data, err := json.Marshal(s)
+	if err != nil {
+		return nil, err
+	}
+	m := make(map[string]any)
+	err = json.Unmarshal(data, &m)
+	return m, err
+}
+
+func Map[T, V any](ts []T, fn func(T) V) []V {
+	result := make([]V, len(ts))
+	for i, t := range ts {
+		result[i] = fn(t)
+	}
+	return result
+}
+
+func EscapeMarkdown(s string) string {
+	s = strings.ReplaceAll(s, "_", `\_`)
+	s = strings.ReplaceAll(s, "*", `\*`)
+	s = strings.ReplaceAll(s, "[", `\[`)
+	return strings.ReplaceAll(s, "`", "\\`")
+}
+
+func EscapeMarkdownV2(s string) string {
+	symbols := []string{"_", "*", "[", "]", "(", ")", "~", "`", ">", "#", "+", "-", "=", "|", "{", "}", ".", "!"}
+	for _, symbol := range symbols {
+		s = strings.ReplaceAll(s, symbol, fmt.Sprintf("\\%s", symbol))
+	}
+	return s
+}

utils/utils.go

@@ -1,32 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"git.nix13.pw/scuroneko/slog"
-)
-
-func GetLoggerLevel() slog.LogLevel {
-	level := slog.FATAL
-	if os.Getenv("DEBUG") == "true" {
-		level = slog.DEBUG
-	}
-	return level
-}
-
-func EscapeMarkdown(s string) string {
-	s = strings.ReplaceAll(s, "_", `\_`)
-	s = strings.ReplaceAll(s, "*", `\*`)
-	s = strings.ReplaceAll(s, "[", `\[`)
-	return strings.ReplaceAll(s, "`", "\\`")
-}
-
-func EscapeMarkdownV2(s string) string {
-	symbols := []string{"_", "*", "[", "]", "(", ")", "~", "`", ">", "#", "+", "-", "=", "|", "{", "}", ".", "!"}
-	for _, symbol := range symbols {
-		s = strings.ReplaceAll(s, symbol, fmt.Sprintf("\\%s", symbol))
-	}
-	return s
-}

utils/version.go

@@ -1,9 +0,0 @@
-package utils
-
-const (
-	VersionString = "1.0.0-beta.2"
-	VersionMajor  = 1
-	VersionMinor  = 0
-	VersionPatch  = 0
-	Beta          = 2
-)

version.go

@@ -0,0 +1,8 @@
+package laniakea
+
+const (
+	VersionString = "0.3.9"
+	VersionMajor  = 0
+	VersionMinor  = 3
+	VersionPatch  = 9
+)