commit 67f706fd3fd77a100fad7323852936134f041619 Author: Sid Sun Date: Wed Aug 19 02:18:55 2020 +0530 Initial Commit Signed-off-by: Sid Sun diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7946d5c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +out +.idea/ +.vscode +*.env +*.iml +*.DS_Store +vendor/ +*.out diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ff2a5de --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +ALL_PACKAGES=$(shell go list ./... | grep -v "vendor") + +fmt: + go fmt $(ALL_PACKAGES) + +vet: + go vet $(ALL_PACKAGES) + +tidy: + go mod tidy + +serve: fmt vet + env $(cat dev.env | xargs) go run cmd/*.go diff --git a/cmd/config/botConfig.go b/cmd/config/botConfig.go new file mode 100644 index 0000000..ccc99c0 --- /dev/null +++ b/cmd/config/botConfig.go @@ -0,0 +1,11 @@ +package config + +// BotConfig contains the config for creating a new bot +type BotConfig struct { + tkn string +} + +// Token returns the bot token +func (b BotConfig) Token() string { + return b.tkn +} diff --git a/cmd/config/config.go b/cmd/config/config.go new file mode 100644 index 0000000..33a44da --- /dev/null +++ b/cmd/config/config.go @@ -0,0 +1,26 @@ +package config + +import ( + "os" +) + +// Config contains all the neccessary configurations +type Config struct { + Bot BotConfig + environment string +} + +// GetEnv returns the current developemnt environment +func (c Config) GetEnv() string { + return c.environment +} + +// Load reads all config from env to config +func Load() Config { + return Config{ + environment: os.Getenv("APP_ENV"), + Bot: BotConfig{ + tkn: os.Getenv("API_TOKEN"), + }, + } +} diff --git a/cmd/const.go b/cmd/const.go new file mode 100644 index 0000000..2725d86 --- /dev/null +++ b/cmd/const.go @@ -0,0 +1,5 @@ +package main + +const ( + dev = "dev" +) diff --git a/cmd/logger.go b/cmd/logger.go new file mode 100644 index 0000000..1967df4 --- /dev/null +++ b/cmd/logger.go @@ -0,0 +1,21 @@ +package main + +import ( + "go.uber.org/zap" +) + +var logger *zap.Logger + +func initLogger(env string) { + var err error + + if env == dev { + logger, err = zap.NewDevelopmentConfig().Build() + } else { + logger, err = zap.NewProductionConfig().Build() + } + + if err != nil { + panic(err) + } +} diff --git a/cmd/main.go b/cmd/main.go new file mode 100644 index 0000000..bc51b0c --- /dev/null +++ b/cmd/main.go @@ -0,0 +1,12 @@ +package main + +import ( + "github.com/sid-sun/sample-bot/cmd/config" + "github.com/sid-sun/sample-bot/pkg/bot" +) + +func main() { + cfg := config.Load() + initLogger(cfg.GetEnv()) + bot.StartBot(cfg, logger) +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..658fd6e --- /dev/null +++ b/go.mod @@ -0,0 +1,9 @@ +module github.com/sid-sun/sample-bot + +go 1.13 + +require ( + github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible + github.com/technoweenie/multipartstreamer v1.0.1 // indirect + go.uber.org/zap v1.15.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..718269b --- /dev/null +++ b/go.sum @@ -0,0 +1,59 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible h1:2cauKuaELYAEARXRkq2LrJ0yDDv1rW7+wrTEdVL3uaU= +github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM= +github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/pkg/bot/handlers/repeat/const.go b/pkg/bot/handlers/repeat/const.go new file mode 100644 index 0000000..5652039 --- /dev/null +++ b/pkg/bot/handlers/repeat/const.go @@ -0,0 +1,3 @@ +package repeat + +const handler = "Repeat" diff --git a/pkg/bot/handlers/repeat/repeat.go b/pkg/bot/handlers/repeat/repeat.go new file mode 100644 index 0000000..8b7e72e --- /dev/null +++ b/pkg/bot/handlers/repeat/repeat.go @@ -0,0 +1,22 @@ +package repeat + +import ( + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" + "go.uber.org/zap" +) + +// Handler handles all repeat requests +func Handler(bot *tgbotapi.BotAPI, update tgbotapi.Update, logger *zap.Logger) { + logger.Info("[Repeat] [Attempt]") + + msg := tgbotapi.NewMessage(update.Message.Chat.ID, update.Message.Text) + msg.ReplyToMessageID = update.Message.MessageID + + _, err := bot.Send(msg) + if err != nil { + logger.Sugar().Errorf("[%s] [%s] %s", handler, "Send", err.Error()) + return + } + + logger.Info("[Repeat] [Success]") +} diff --git a/pkg/bot/router/router.go b/pkg/bot/router/router.go new file mode 100644 index 0000000..f8e57dc --- /dev/null +++ b/pkg/bot/router/router.go @@ -0,0 +1,55 @@ +package router + +import ( + tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" + "github.com/sid-sun/sample-bot/cmd/config" + "github.com/sid-sun/sample-bot/pkg/bot/handlers/repeat" + "go.uber.org/zap" +) + +type updates struct { + ch tgbotapi.UpdatesChannel + bot *tgbotapi.BotAPI + logger *zap.Logger +} + +// ListenAndServe starts listens on the update channel and handles routing the update to handlers +func (u updates) ListenAndServe() { + for update := range u.ch { + update := update + go func() { + if update.Message == nil { + return + } + repeat.Handler(u.bot, update, u.logger) + }() + } +} + +type bot struct { + bot *tgbotapi.BotAPI + logger *zap.Logger +} + +// NewUpdateChan creates a new channel to get update +func (b bot) NewUpdateChan() updates { + u := tgbotapi.NewUpdate(0) + u.Timeout = 60 + ch, err := b.bot.GetUpdatesChan(u) + if err != nil { + panic(err) + } + return updates{ch: ch, bot: b.bot, logger: b.logger} +} + +// New returns a new instance of the router +func New(cfg config.BotConfig, logger *zap.Logger) bot { + b, err := tgbotapi.NewBotAPI(cfg.Token()) + if err != nil { + panic(err) + } + return bot{ + bot: b, + logger: logger, + } +} diff --git a/pkg/bot/server.go b/pkg/bot/server.go new file mode 100644 index 0000000..0ade308 --- /dev/null +++ b/pkg/bot/server.go @@ -0,0 +1,15 @@ +package bot + +import ( + "github.com/sid-sun/sample-bot/cmd/config" + "github.com/sid-sun/sample-bot/pkg/bot/router" + "go.uber.org/zap" +) + +// StartBot starts the bot, inits all the requited submodules and routine for shutdown +func StartBot(cfg config.Config, logger *zap.Logger) { + ch := router.New(cfg.Bot, logger).NewUpdateChan() + + logger.Info("[StartBot] Started Bot") + ch.ListenAndServe() +}