Update dependencies

There was a false error reported when the configuration file was found

.golangci.yml

@@ -0,0 +1,4 @@
+---
+linters:
+  disable:
+    - errcheck

.woodpecker.yml

@@ -1,10 +0,0 @@
----
-pipeline:
-  #lint:
-  #  image: golangci/golangci-lint
-  #  commands:
-  #    - golangci-lint run
-  build:
-    image: golang
-    commands:
-      - go build ./cmd/bb

bot/bot.go

@@ -0,0 +1,167 @@
+package bot
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"git.kill0.net/chill9/beepboop/lib"
+	"github.com/bwmarrin/discordgo"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
+)
+
+var C Config
+
+type (
+	Bot struct {
+		Session *discordgo.Session
+		Config  Config
+	}
+
+	MessageHandler func(s *discordgo.Session, m *discordgo.MessageCreate)
+)
+
+func init() {
+	pflag.Bool("debug", false, "enable debug mode")
+	pflag.Parse()
+
+	viper.BindPFlags(pflag.CommandLine)
+}
+
+func NewBot(s *discordgo.Session, config Config) *Bot {
+	return &Bot{Session: s, Config: config}
+}
+
+func (b *Bot) RegisterCommands() {
+	AddCommand(&Command{
+		Name: "coin",
+		Func: b.CoinCommand(),
+	})
+	AddCommand(&Command{
+		Name:  "deal",
+		Func:  b.DealCommand(),
+		NArgs: 1,
+	})
+	AddCommand(&Command{
+		Name: "ping",
+		Func: b.PingCommand(),
+	})
+	AddCommand(&Command{
+		Name:  "roll",
+		Func:  b.RollCommand(),
+		NArgs: 1,
+	})
+	AddCommand(&Command{
+		Name:  "time",
+		Func:  b.TimeCommand(),
+		NArgs: 1,
+	})
+	AddCommand(&Command{
+		Name: "version",
+		Func: b.VersionCommand(),
+	})
+	AddCommand(&Command{
+		Name:  "weather",
+		Func:  b.WeatherCommand(),
+		NArgs: 1,
+	})
+}
+
+func (b *Bot) RegisterHandlers() {
+	b.Session.AddHandler(b.CommandHandler())
+	b.Session.AddHandler(b.ReactionHandler())
+}
+
+func Run() error {
+	initConfig()
+	go reloadConfig()
+
+	if err := lib.SeedMathRand(); err != nil {
+		log.Warn(err)
+	}
+
+	if C.DiscordToken == "" {
+		log.Fatalf("Discord token is not set")
+	}
+
+	dg, err := discordgo.New(fmt.Sprintf("Bot %s", C.DiscordToken))
+	if err != nil {
+		log.Fatalf("error creating Discord session: %v\n", err)
+	}
+
+	b := NewBot(dg, C)
+	b.RegisterHandlers()
+	b.RegisterCommands()
+
+	dg.Identify.Intents = discordgo.IntentsGuildMessages | discordgo.IntentsDirectMessages
+
+	if err = dg.Open(); err != nil {
+		log.Fatalf("error opening connection: %v\n", err)
+	}
+
+	log.Info("The bot is now running. Press CTRL-C to exit.")
+
+	defer dg.Close()
+
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM)
+	<-sc
+
+	log.Info("Shutting down")
+
+	return nil
+}
+
+func initConfig() {
+	C = NewConfig()
+
+	viper.SetEnvPrefix("BEEPBOOP")
+	viper.AutomaticEnv()
+
+	viper.SetConfigName("config")
+	viper.SetConfigType("toml")
+	viper.AddConfigPath(".")
+
+	viper.SetDefault("debug", false)
+
+	viper.BindEnv("DISCORD_TOKEN")
+	viper.BindEnv("OPEN_WEATHER_MAP_TOKEN")
+
+	loadConfig()
+}
+
+func loadConfig() {
+	if err := viper.ReadInConfig(); err != nil {
+		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+			log.Fatalf("fatal error config file: %v", err)
+		}
+	}
+
+	log.WithField("filename", viper.ConfigFileUsed()).Info(
+		"loaded configuration file",
+	)
+
+	err := viper.Unmarshal(&C)
+	if err != nil {
+		log.Fatalf("unable to decode into struct: %v", err)
+	}
+
+	if viper.GetBool("debug") {
+		log.SetLevel(log.DebugLevel)
+	} else {
+		log.SetLevel(log.InfoLevel)
+	}
+}
+
+func reloadConfig() {
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGHUP)
+	for {
+		<-sc
+
+		loadConfig()
+	}
+}

bot/coin.go

@@ -0,0 +1,31 @@
+package bot
+
+import (
+	"git.kill0.net/chill9/beepboop/lib"
+	"github.com/bwmarrin/discordgo"
+)
+
+type Coin bool
+
+func (c *Coin) Flip() bool {
+	*c = Coin(lib.Itob(lib.RandInt(0, 1)))
+	return bool(*c)
+}
+
+func (b *Bot) CoinCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
+		var (
+			c   Coin
+			msg string
+		)
+
+		if c.Flip() {
+			msg = "heads"
+		} else {
+			msg = "tails"
+		}
+
+		b.Session.ChannelMessageSend(m.ChannelID, msg)
+		return nil
+	}
+}

bot/command.go

@@ -20,10 +20,11 @@ type (
 	Command struct {
 		Name   string
 		Config Config
-		Func    func(cmd *Command, args []string) error
-		Session *discordgo.Session
-		Message *discordgo.MessageCreate
+		Func   CommandFunc
+		NArgs  int
 	}
+
+	CommandFunc func(args []string, m *discordgo.MessageCreate) error
 )
 
 func init() {
@@ -54,7 +55,7 @@ func GetCommand(name string) (*Command, bool) {
 	return cmd, ok
 }
 
-func NewCommandHandler(config Config) func(s *discordgo.Session, m *discordgo.MessageCreate) {
+func (b *Bot) CommandHandler() func(*discordgo.Session, *discordgo.MessageCreate) {
 	return func(s *discordgo.Session, m *discordgo.MessageCreate) {
 		var cmd *Command
 
@@ -62,26 +63,28 @@ func NewCommandHandler(config Config) func(s *discordgo.Session, m *discordgo.Me
 			return
 		}
 
-		if !lib.HasCommand(m.Content, config.Prefix) {
+		if !lib.HasCommand(m.Content, b.Config.Prefix) {
 			return
 		}
 
-		cmdName, args := lib.SplitCommandAndArgs(m.Content, config.Prefix)
+		cmdName, arg := lib.SplitCommandAndArg(m.Content, b.Config.Prefix)
 
 		cmd, ok := GetCommand(cmdName)
-		if ok {
-			cmd.Config = config
-			cmd.Name = cmdName
-			cmd.Session = s
-			cmd.Message = m
 
-			log.Debugf("command: %+v, args: %+v", cmd.Name, args)
-			cmd.Func(cmd, args)
+		args := lib.SplitArgs(arg, cmd.NArgs)
+
+		if ok {
+			cmd.Config = b.Config
+
+			log.Debugf("command: %v, args: %v, nargs: %d", cmd.Name, args, len(args))
+			if err := cmd.Func(args, m); err != nil {
+				log.Errorf("failed to execute command: %s", err)
+			}
 
 			return
 		}
 
-		log.Warnf("unknown command: %+v, args: %+v", cmdName, args)
+		log.Warnf("unknown command: %v, args: %v, nargs: %d", cmdName, args, len(args))
 		s.ChannelMessageSend(m.ChannelID, fmt.Sprintf("unknown command: %s", cmdName))
 	}
 }

bot/commands/coin.go

@@ -1,29 +0,0 @@
-package commands
-
-import (
-	"git.kill0.net/chill9/beepboop/bot"
-	"git.kill0.net/chill9/beepboop/lib"
-)
-
-type Coin bool
-
-func (c *Coin) Flip() bool {
-	*c = Coin(lib.Itob(lib.RandInt(0, 1)))
-	return bool(*c)
-}
-
-func CoinCommand(cmd *bot.Command, args []string) error {
-	var (
-		c   Coin
-		msg string
-	)
-
-	if c.Flip() {
-		msg = "heads"
-	} else {
-		msg = "tails"
-	}
-
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, msg)
-	return nil
-}

bot/commands/ping.go

@@ -1,10 +0,0 @@
-package commands
-
-import (
-	"git.kill0.net/chill9/beepboop/bot"
-)
-
-func PingCommand(cmd *bot.Command, args []string) error {
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, "pong")
-	return nil
-}

bot/commands/time.go

@@ -1,34 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"time"
-
-	"git.kill0.net/chill9/beepboop/bot"
-	log "github.com/sirupsen/logrus"
-)
-
-func TimeCommand(cmd *bot.Command, args []string) error {
-	var (
-		t  time.Time
-		tz string
-	)
-
-	now := time.Now()
-
-	if len(args) == 1 {
-		tz = args[0]
-		loc, err := time.LoadLocation(tz)
-		if err != nil {
-			log.Warnf("failed to load location: %s", err)
-			cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, err.Error())
-			return nil
-		}
-		t = now.In(loc)
-	} else {
-		t = now
-	}
-
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, fmt.Sprint(t))
-	return nil
-}

bot/commands/version.go

@@ -1,23 +0,0 @@
-package commands
-
-import (
-	"fmt"
-	"runtime"
-
-	"git.kill0.net/chill9/beepboop/bot"
-)
-
-const (
-	SourceURI = "https://git.kill0.net/chill9/bb"
-)
-
-func VersionCommand(cmd *bot.Command, args []string) error {
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, fmt.Sprintf(
-		"go version: %s\nplatform: %s\nos: %s\nsource: %s\n",
-		runtime.Version(),
-		runtime.GOARCH,
-		runtime.GOOS,
-		SourceURI,
-	))
-	return nil
-}

bot/commands/weather.go

@@ -1,67 +0,0 @@
-package commands
-
-import (
-	"fmt"
-
-	"git.kill0.net/chill9/beepboop/bot"
-	"git.kill0.net/chill9/beepboop/lib/weather"
-
-	log "github.com/sirupsen/logrus"
-)
-
-type WeatherHandler struct {
-	Config bot.Config
-	Name   string
-}
-
-func NewWeatherHandler(s string) *WeatherHandler {
-	return &WeatherHandler{Name: s}
-}
-
-func (h *WeatherHandler) SetConfig(config bot.Config) {
-	h.Config = config
-}
-
-func WeatherCommand(cmd *bot.Command, args []string) error {
-	var (
-		err error
-		loc string
-		w   weather.Weather
-	)
-
-	if len(args) != 1 {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, "help: `!weather <CITY>,<STATE>,<COUNTRY>`")
-		return nil
-	}
-
-	loc = args[0]
-
-	if cmd.Config.OpenWeatherMapToken == "" {
-		log.Error("OpenWeather token is not set")
-		return nil
-	}
-
-	wc := weather.NewClient(cmd.Config.OpenWeatherMapToken)
-
-	log.Debugf("weather requested for '%s'", loc)
-
-	w, err = wc.Get(loc)
-	if err != nil {
-		log.Errorf("weather client error: %v", err)
-		return nil
-	}
-
-	log.Debugf("weather returned for '%s': %+v", loc, w)
-
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, fmt.Sprintf(
-		"%s (%.1f, %.1f) — C:%.1f F:%.1f K:%.1f",
-		loc,
-		w.Coord.Lat,
-		w.Coord.Lon,
-		w.Main.Temp.Celcius(),
-		w.Main.Temp.Fahrenheit(),
-		w.Main.Temp.Kelvin(),
-	))
-
-	return nil
-}

bot/config.go

@@ -19,17 +19,12 @@ type (
 
 	HandlerConfig struct {
 		Reaction ReactionConfig `mapstructure:"reaction"`
-		Weather  WeatherConfig  `mapstructure:"weather"`
 	}
 
 	ReactionConfig struct {
 		Emojis   []string
 		Channels []string
 	}
-
-	WeatherConfig struct {
-		Token string `mapstructure:"token"`
-	}
 )
 
 func NewConfig() Config {

bot/deal.go

@@ -1,4 +1,4 @@
-package commands
+package bot
 
 import (
 	"errors"
@@ -7,16 +7,11 @@ import (
 	"strconv"
 	"strings"
 
-	"git.kill0.net/chill9/beepboop/bot"
+	"github.com/bwmarrin/discordgo"
 	log "github.com/sirupsen/logrus"
 )
 
 type (
-	DealHandler struct {
-		config bot.Config
-		Name   string
-	}
-
 	Card string
 
 	Deck [52]Card
@@ -50,7 +45,8 @@ func (d *Deck) Deal(n int) ([]Card, error) {
 	return hand, err
 }
 
-func DealCommand(cmd *bot.Command, args []string) error {
+func (b *Bot) DealCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
 		rand.Shuffle(len(deck), func(i, j int) {
 			deck[i], deck[j] = deck[j], deck[i]
 		})
@@ -58,7 +54,7 @@ func DealCommand(cmd *bot.Command, args []string) error {
 		log.Debugf("%+v", deck)
 
 		if len(args) != 1 {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, fmt.Sprintf("help: `!%s <n>`", cmd.Name))
+			b.Session.ChannelMessageSend(m.ChannelID, "help: `!deal <n>`")
 			return nil
 		}
 
@@ -69,18 +65,17 @@ func DealCommand(cmd *bot.Command, args []string) error {
 
 		hand, err := deck.Deal(n)
 		if err != nil {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, fmt.Sprintf("error: %s\n", err))
+			b.Session.ChannelMessageSend(m.ChannelID, fmt.Sprintf("error: %s\n", err))
 			return nil
 		}
 
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, JoinCards(hand, " "))
+		b.Session.ChannelMessageSend(m.ChannelID, JoinCards(hand, " "))
 		return nil
+	}
 }
 
 func JoinCards(h []Card, sep string) string {
-	var b []string
-
-	b = make([]string, len(h))
+	b := make([]string, len(h))
 
 	for i, v := range h {
 		b[i] = string(v)

bot/dice.go

@@ -1,4 +1,4 @@
-package commands
+package bot
 
 import (
 	"errors"
@@ -7,9 +7,9 @@ import (
 	"strconv"
 	"strings"
 
-	"git.kill0.net/chill9/beepboop/bot"
 	"git.kill0.net/chill9/beepboop/lib"
 
+	"github.com/bwmarrin/discordgo"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -78,7 +78,8 @@ func (r *Roll) RollDice() {
 	}
 }
 
-func RollCommand(cmd *bot.Command, args []string) error {
+func (b *Bot) RollCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
 		var (
 			err       error
 			msg, roll string
@@ -89,7 +90,7 @@ func RollCommand(cmd *bot.Command, args []string) error {
 
 		r, err = ParseRoll(roll)
 		if err != nil {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, err.Error())
+			b.Session.ChannelMessageSend(m.ChannelID, err.Error())
 			return nil
 		}
 
@@ -98,6 +99,7 @@ func RollCommand(cmd *bot.Command, args []string) error {
 
 		msg = fmt.Sprintf("🎲 %s = %d", lib.JoinInt(r.Rolls, " + "), r.Sum)
 
-	cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, msg)
+		b.Session.ChannelMessageSend(m.ChannelID, msg)
 		return nil
+	}
 }

bot/handler/reaction.go

@@ -1,65 +0,0 @@
-package handler
-
-import (
-	"math/rand"
-	"strings"
-
-	"git.kill0.net/chill9/beepboop/bot"
-	"git.kill0.net/chill9/beepboop/lib"
-
-	"github.com/bwmarrin/discordgo"
-	log "github.com/sirupsen/logrus"
-)
-
-type (
-	ReactionHandler struct {
-		Config bot.Config
-	}
-)
-
-func NewReactionHandler() *ReactionHandler {
-	return new(ReactionHandler)
-}
-
-func (h *ReactionHandler) SetConfig(config bot.Config) {
-	h.Config = config
-}
-
-func (h *ReactionHandler) Handle(s *discordgo.Session, m *discordgo.MessageCreate) {
-	if m.Author.ID == s.State.User.ID {
-		return
-	}
-
-	emojis := h.Config.Handler.Reaction.Emojis
-	channels := h.Config.Handler.Reaction.Channels
-
-	if len(emojis) == 0 {
-		log.Warning("emoji list is empty")
-		return
-	}
-
-	channel, err := s.Channel(m.ChannelID)
-	if err != nil {
-		log.Fatalf("unable to get channel name: %v", err)
-	}
-
-	if len(channels) > 0 && !lib.Contains(channels, channel.Name) {
-		return
-	}
-
-	for _, a := range m.Attachments {
-		if strings.HasPrefix(a.ContentType, "image/") {
-			for i := 1; i <= lib.RandInt(1, len(emojis)); i++ {
-				r := emojis[rand.Intn(len(emojis))]
-				s.MessageReactionAdd(m.ChannelID, m.ID, r)
-			}
-		}
-	}
-
-	for range m.Embeds {
-		for i := 1; i <= lib.RandInt(1, len(emojis)); i++ {
-			r := emojis[rand.Intn(len(emojis))]
-			s.MessageReactionAdd(m.ChannelID, m.ID, r)
-		}
-	}
-}

bot/handlers.go

@@ -1,10 +0,0 @@
-package bot
-
-import (
-	"github.com/bwmarrin/discordgo"
-)
-
-type MessageCreateHandler interface {
-	Handle(*discordgo.Session, *discordgo.MessageCreate)
-	SetConfig(Config)
-}

bot/ping.go

@@ -0,0 +1,12 @@
+package bot
+
+import (
+	"github.com/bwmarrin/discordgo"
+)
+
+func (b *Bot) PingCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
+		b.Session.ChannelMessageSend(m.ChannelID, "pong")
+		return nil
+	}
+}

bot/reaction.go

@@ -0,0 +1,52 @@
+package bot
+
+import (
+	"math/rand"
+	"strings"
+
+	"git.kill0.net/chill9/beepboop/lib"
+
+	"github.com/bwmarrin/discordgo"
+	log "github.com/sirupsen/logrus"
+)
+
+func (b *Bot) ReactionHandler() func(*discordgo.Session, *discordgo.MessageCreate) {
+	return func(s *discordgo.Session, m *discordgo.MessageCreate) {
+		if m.Author.ID == s.State.User.ID {
+			return
+		}
+
+		emojis := b.Config.Handler.Reaction.Emojis
+		channels := b.Config.Handler.Reaction.Channels
+
+		if len(emojis) == 0 {
+			log.Warning("emoji list is empty")
+			return
+		}
+
+		channel, err := s.Channel(m.ChannelID)
+		if err != nil {
+			log.Fatalf("unable to get channel name: %v", err)
+		}
+
+		if len(channels) > 0 && !lib.Contains(channels, channel.Name) {
+			return
+		}
+
+		for _, a := range m.Attachments {
+			if strings.HasPrefix(a.ContentType, "image/") {
+				for i := 1; i <= lib.RandInt(1, len(emojis)); i++ {
+					r := emojis[rand.Intn(len(emojis))]
+					s.MessageReactionAdd(m.ChannelID, m.ID, r)
+				}
+			}
+		}
+
+		for range m.Embeds {
+			for i := 1; i <= lib.RandInt(1, len(emojis)); i++ {
+				r := emojis[rand.Intn(len(emojis))]
+				s.MessageReactionAdd(m.ChannelID, m.ID, r)
+			}
+		}
+	}
+}

bot/roulette.go

@@ -1,9 +1,9 @@
-package commands
+package bot
 
 import (
-	"git.kill0.net/chill9/beepboop/bot"
 	"git.kill0.net/chill9/beepboop/lib"
 
+	"github.com/bwmarrin/discordgo"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -36,7 +36,7 @@ func (g *Gun) Load(n int) {
 	g.N = 0
 	for i := 1; i <= n; {
 		x := lib.RandInt(0, len(g.C)-1)
-		if g.C[x] == false {
+		if !g.C[x] {
 			g.C[x] = true
 			i++
 		} else {
@@ -58,7 +58,7 @@ func (g *Gun) Fire() bool {
 
 func (g *Gun) IsEmpty() bool {
 	for _, v := range g.C {
-		if v == true {
+		if v {
 			return false
 		}
 	}
@@ -66,7 +66,8 @@ func (g *Gun) IsEmpty() bool {
 	return true
 }
 
-func RouletteCommand(cmd *bot.Command, args []string) error {
+func (b *Bot) RouletteCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
 		if gun.IsEmpty() {
 			gun.Load(Bullets)
 			log.Debugf("reloading gun: %+v\n", gun)
@@ -74,9 +75,10 @@ func RouletteCommand(cmd *bot.Command, args []string) error {
 
 		log.Debugf("firing gun: %+v\n", gun)
 		if gun.Fire() {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, GunFireMessage)
+			b.Session.ChannelMessageSend(m.ChannelID, GunFireMessage)
 		} else {
-		cmd.Session.ChannelMessageSend(cmd.Message.ChannelID, GunClickMessage)
+			b.Session.ChannelMessageSend(m.ChannelID, GunClickMessage)
 		}
 		return nil
+	}
 }

bot/time.go

@@ -0,0 +1,36 @@
+package bot
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/bwmarrin/discordgo"
+	log "github.com/sirupsen/logrus"
+)
+
+func (b *Bot) TimeCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
+		var (
+			t  time.Time
+			tz string
+		)
+
+		now := time.Now()
+
+		if len(args) == 1 {
+			tz = args[0]
+			loc, err := time.LoadLocation(tz)
+			if err != nil {
+				log.Warnf("failed to load location: %s", err)
+				b.Session.ChannelMessageSend(m.ChannelID, err.Error())
+				return nil
+			}
+			t = now.In(loc)
+		} else {
+			t = now
+		}
+
+		b.Session.ChannelMessageSend(m.ChannelID, fmt.Sprint(t))
+		return nil
+	}
+}

bot/version.go

@@ -0,0 +1,25 @@
+package bot
+
+import (
+	"fmt"
+	"runtime"
+
+	"github.com/bwmarrin/discordgo"
+)
+
+const (
+	SourceURI = "https://git.kill0.net/chill9/bb"
+)
+
+func (b *Bot) VersionCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
+		b.Session.ChannelMessageSend(m.ChannelID, fmt.Sprintf(
+			"go version: %s\nplatform: %s\nos: %s\nsource: %s\n",
+			runtime.Version(),
+			runtime.GOARCH,
+			runtime.GOOS,
+			SourceURI,
+		))
+		return nil
+	}
+}

bot/weather.go

@@ -0,0 +1,56 @@
+package bot
+
+import (
+	"fmt"
+
+	"git.kill0.net/chill9/beepboop/lib/weather"
+
+	"github.com/bwmarrin/discordgo"
+	log "github.com/sirupsen/logrus"
+)
+
+func (b *Bot) WeatherCommand() CommandFunc {
+	return func(args []string, m *discordgo.MessageCreate) error {
+		var (
+			err error
+			loc string
+			w   weather.Weather
+		)
+
+		if len(args) != 1 {
+			b.Session.ChannelMessageSend(m.ChannelID, "help: `!weather <CITY>,<STATE>,<COUNTRY>`")
+			return nil
+		}
+
+		loc = args[0]
+
+		if b.Config.OpenWeatherMapToken == "" {
+			log.Error("OpenWeather token is not set")
+			return nil
+		}
+
+		wc := weather.NewClient(b.Config.OpenWeatherMapToken)
+
+		log.Debugf("weather requested for '%s'", loc)
+
+		w, err = wc.Get(loc)
+		if err != nil {
+			log.Errorf("weather client error: %v", err)
+			return nil
+		}
+
+		log.Debugf("weather returned for '%s': %+v", loc, w)
+
+		b.Session.ChannelMessageSend(m.ChannelID, fmt.Sprintf(
+			"%s (%.1f, %.1f) — C:%.1f F:%.1f K:%.1f",
+			loc,
+			w.Coord.Lat,
+			w.Coord.Lon,
+			w.Main.Temp.Celcius(),
+			w.Main.Temp.Fahrenheit(),
+			w.Main.Temp.Kelvin(),
+		))
+
+		return nil
+	}
+}

cmd/bb/main.go

@@ -1,137 +1,13 @@
 package main
 
 import (
-	"flag"
-	"fmt"
-
-	//"log"
-
 	"os"
-	"os/signal"
-	"syscall"
 
 	"git.kill0.net/chill9/beepboop/bot"
-	"git.kill0.net/chill9/beepboop/bot/commands"
-	"git.kill0.net/chill9/beepboop/bot/handler"
-	"git.kill0.net/chill9/beepboop/lib"
-
-	"github.com/bwmarrin/discordgo"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
 )
 
-var (
-	C bot.Config
-
-	handlers []bot.MessageCreateHandler = []bot.MessageCreateHandler{
-		handler.NewReactionHandler(),
-	}
-)
-
-func init() {
-	bot.AddCommand(&bot.Command{
-		Name: "coin",
-		Func: commands.CoinCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "deal",
-		Func: commands.DealCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "ping",
-		Func: commands.PingCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "roll",
-		Func: commands.RollCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "time",
-		Func: commands.TimeCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "version",
-		Func: commands.VersionCommand,
-	})
-	bot.AddCommand(&bot.Command{
-		Name: "weather",
-		Func: commands.WeatherCommand,
-	})
-}
-
 func main() {
-	setupConfig()
-
-	lib.SeedMathRand()
-
-	if C.DiscordToken == "" {
-		log.Fatalf("Discord token is not set")
-	}
-
-	dg, err := discordgo.New(fmt.Sprintf("Bot %s", C.DiscordToken))
-	if err != nil {
-		log.Fatalf("error creating Discord session: %v\n", err)
-	}
-
-	for _, h := range handlers {
-		h.SetConfig(C)
-		dg.AddHandler(h.Handle)
-	}
-
-	dg.AddHandler(bot.NewCommandHandler(C))
-
-	dg.Identify.Intents = discordgo.IntentsGuildMessages | discordgo.IntentsDirectMessages
-
-	err = dg.Open()
-	if err != nil {
-		log.Fatalf("error opening connection: %v\n", err)
-	}
-
-	log.Info("The bot is now running. Press CTRL-C to exit.")
-
-	defer dg.Close()
-
-	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
-	<-sc
-
-	log.Info("Shutting down")
-}
-
-func setupConfig() {
-	var err error
-
-	C = bot.NewConfig()
-
-	flag.Bool("debug", false, "enable debug logging")
-	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
-	pflag.Parse()
-	viper.BindPFlags(pflag.CommandLine)
-
-	viper.SetEnvPrefix("BEEPBOOP")
-	viper.AutomaticEnv()
-
-	viper.SetConfigName("config")
-	viper.SetConfigType("toml")
-	viper.AddConfigPath(".")
-
-	err = viper.ReadInConfig()
-
-	viper.BindEnv("DEBUG")
-	viper.BindEnv("DISCORD_TOKEN")
-	viper.BindEnv("OPEN_WEATHER_MAP_TOKEN")
-
-	if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
-		log.Fatalf("fatal error config file: %v", err)
-	}
-
-	err = viper.Unmarshal(&C)
-	if err != nil {
-		log.Fatalf("unable to decode into struct: %v", err)
-	}
-
-	if viper.GetBool("debug") {
-		log.SetLevel(log.DebugLevel)
+	if err := bot.Run(); err != nil {
+		os.Exit(1)
 	}
 }

docker-compose.yaml

@@ -1,3 +1,4 @@
+---
 version: "3.9"
 services:
   bot:
@@ -6,3 +7,5 @@ services:
       - BEEPBOOP_DISCORD_TOKEN
       - BEEPBOOP_OPEN_WEATHER_MAP_TOKEN
       - BEEPBOOP_DEBUG=true
+    volumes:
+      - ./config.toml:/config.toml

go.mod

@@ -3,28 +3,28 @@ module git.kill0.net/chill9/beepboop
 go 1.18
 
 require (
-	github.com/bwmarrin/discordgo v0.25.0
+	github.com/bwmarrin/discordgo v0.26.1
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.12.0
+	github.com/spf13/viper v1.13.0
 )
 
 require (
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
-	github.com/spf13/afero v1.8.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/subosito/gotenv v1.3.0 // indirect
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	github.com/subosito/gotenv v1.4.1 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect
 	golang.org/x/text v0.3.7 // indirect
-	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/bwmarrin/discordgo v0.25.0 h1:NXhdfHRNxtwso6FPdzW2i3uBvvU7UIQTghmV2T4nqAs=
-github.com/bwmarrin/discordgo v0.25.0/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
+github.com/bwmarrin/discordgo v0.26.1 h1:AIrM+g3cl+iYBr4yBxCBp9tD9jR3K7upEjl0d89FRkE=
+github.com/bwmarrin/discordgo v0.26.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -118,8 +118,9 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
@@ -141,8 +142,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg=
+github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -152,25 +153,27 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
+github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
-github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
+github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU=
+github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
-github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
+github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -188,8 +191,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -308,8 +311,9 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/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-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220907062415-87db552b00fd h1:AZeIEzg+8RCELJYq8w+ODLVxFgLMMigSwO/ffKPEd9U=
+golang.org/x/sys v0.0.0-20220907062415-87db552b00fd/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -465,14 +469,14 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 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/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
-gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

lib/common.go

@@ -17,9 +17,7 @@ func Contains[T comparable](s []T, v T) bool {
 }
 
 func JoinInt(a []int, sep string) string {
-	var b []string
-
-	b = make([]string, len(a))
+	b := make([]string, len(a))
 
 	for i, v := range a {
 		b[i] = strconv.Itoa(v)
@@ -37,11 +35,7 @@ func SumInt(a []int) int {
 }
 
 func Itob(v int) bool {
-	if v == 1 {
-		return true
-	}
-
-	return false
+	return v == 1
 }
 
 func BuildURI(rawuri, rawpath string) string {
@@ -99,24 +93,43 @@ func ContainsCommand(s, prefix, cmd string) bool {
 	return false
 }
 
-func SplitCommandAndArg(s, prefix string) (cmd string, args []string) {
+func SplitCommandAndArg(s, prefix string) (cmd string, arg string) {
 	s = strings.TrimSpace(s)
 
 	if !strings.HasPrefix(s, prefix) {
 		return
 	}
 
-	x := strings.Split(s, " ")
+	// remove the command prefix
+	s = s[len(prefix):]
 
+	// multiple assignment trick
+	cmd, arg = func() (string, string) {
+		x := strings.SplitN(s, " ", 2)
 		if len(x) > 1 {
-		args = x[1:]
+			return x[0], x[1]
 		}
+		return x[0], ""
+	}()
 
-	cmd = x[0]
-
-	if strings.Index(s, prefix) == 0 {
-		cmd = cmd[len(prefix):]
-	}
-
-	return cmd, args
+	return cmd, arg
+}
+
+func SplitCommandAndArgs(s, prefix string, n int) (cmd string, args []string) {
+	cmd, arg := SplitCommandAndArg(s, prefix)
+
+	if n == 0 {
+		return cmd, strings.Split(arg, " ")
+	}
+
+	return cmd, strings.SplitN(arg, " ", n)
+}
+
+func SplitArgs(s string, n int) (args []string) {
+	if n > 0 {
+		args = strings.SplitN(s, " ", n)
+	} else {
+		args = strings.Split(s, " ")
+	}
+	return
 }

lib/common_test.go

@@ -57,20 +57,44 @@ func TestHasCommandCommand(t *testing.T) {
 	}
 }
 
-func TestSplitComandAndArgs(t *testing.T) {
+func TestSplitCommandAndArg(t *testing.T) {
 	tables := []struct {
 		s       string
 		prefix  string
 		wantCmd string
-		wantArgs []string
+		wantArg string
 	}{
-		{"!command x y", "!", "command", []string{"x", "y"}},
-		{"!command", "!", "command", []string(nil)},
-		{"hey man", "!", "", []string(nil)},
+		{"!command x y", "!", "command", "x y"},
+		{"!command", "!", "command", ""},
+		{"hey man", "!", "", ""},
 	}
 
 	for _, table := range tables {
-		gotCmd, gotArgs := SplitCommandAndArgs(table.s, table.prefix)
+		gotCmd, gotArg := SplitCommandAndArg(table.s, table.prefix)
+		if gotCmd != table.wantCmd {
+			t.Errorf("got: %s, want: %s", gotCmd, table.wantCmd)
+		}
+		if gotArg != table.wantArg {
+			t.Errorf("got: %+v, want: %+v", gotArg, table.wantArg)
+		}
+	}
+}
+
+func TestSplitCommandAndArgs(t *testing.T) {
+	tables := []struct {
+		s        string
+		prefix   string
+		n        int
+		wantCmd  string
+		wantArgs []string
+	}{
+		{"!command x y", "!", 2, "command", []string{"x", "y"}},
+		{"!command x y z", "!", 2, "command", []string{"x", "y z"}},
+		{"!command", "!", 1, "command", []string{""}},
+		{"hey man", "!", 1, "", []string{""}},
+	}
+	for _, table := range tables {
+		gotCmd, gotArgs := SplitCommandAndArgs(table.s, table.prefix, table.n)
 		if gotCmd != table.wantCmd {
 			t.Errorf("got: %s, want: %s", gotCmd, table.wantCmd)
 		}
@@ -79,3 +103,22 @@ func TestSplitComandAndArgs(t *testing.T) {
 		}
 	}
 }
+
+func TestSplitArgs(t *testing.T) {
+	tables := []struct {
+		s    string
+		n    int
+		want []string
+	}{
+		{"a b c", 0, []string{"a", "b", "c"}},
+		{"a b c", 1, []string{"a b c"}},
+		{"a b c", 2, []string{"a", "b c"}},
+		{"a b c", 3, []string{"a", "b", "c"}},
+		{"a b c", 4, []string{"a", "b", "c"}},
+	}
+	for _, table := range tables {
+		if got, want := SplitArgs(table.s, table.n), table.want; !reflect.DeepEqual(got, want) {
+			t.Errorf("got: %#v, want: %#v", got, want)
+		}
+	}
+}