Use handler module & remove translations (#11)

* convert to handler module

* more refactor work

* make stuff work with handler module & remove translations

* fix some minor issues

* remove crowdin banner

* fix nil sprintf pointer string

* fix last translations

* fix messages

Author: topi314

README.md

@@ -4,7 +4,6 @@
 [![KittyBot Version](https://img.shields.io/github/v/tag/KittyBot-Org/KittyBotGo?label=release)](https://github.com/KittyBot-Org/KittyBotGo/releases/latest)
 [![Docker](https://github.com/KittyBot-Org/KittyBotGo/actions/workflows/docker-build.yml/badge.svg)](https://github.com/KittyBot-Org/KittyBotGo/actions/workflows/docker-build.yml)
 [![Test](https://github.com/KittyBot-Org/KittyBotGo/actions/workflows/go-test.yml/badge.svg)](https://github.com/KittyBot-Org/KittyBotGo/actions/workflows/go-test.yml)
-[![Crowdin](https://badges.crowdin.net/kittybot/localized.svg)](https://crowdin.com/project/kittybot)
 [![KittyBot Support Guild](https://discordapp.com/api/guilds/608506410803658753/embed.png?style=shield)](https://discord.gg/sD3ABd5)
 
 [![Website Banner](.github/banner.png)](https://kittybot.de)

backend/backend.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/KittyBot-Org/KittyBotGo/db"
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/disgoorg/handler"
 
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/rest"
@@ -49,7 +49,7 @@ func (b *Backend) SetupScheduler() error {
 	return nil
 }
 
-func (b *Backend) LoadCommands(commands ...dbot.Command) {
+func (b *Backend) LoadCommands(commands ...handler.Command) {
 	b.Logger.Info("Loading commands...")
 
 	for _, command := range commands {

cmd/backend/main.go

@@ -10,7 +10,6 @@ import (
 	"github.com/KittyBot-Org/KittyBotGo/backend/routes"
 	"github.com/KittyBot-Org/KittyBotGo/config"
 	"github.com/KittyBot-Org/KittyBotGo/db"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/commands"
 	"github.com/disgoorg/log"
 	_ "github.com/lib/pq"
 )
@@ -57,28 +56,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	b.LoadCommands(
-		commands.BassBoost,
-		commands.ClearQueue,
-		commands.History,
-		commands.LikedSongs,
-		commands.Loop,
-		commands.Next,
-		commands.NowPlaying,
-		commands.Pause,
-		commands.Play,
-		commands.Previous,
-		commands.Queue,
-		commands.Remove,
-		commands.Seek,
-		commands.Shuffle,
-		commands.Stop,
-		commands.Tag,
-		commands.Tags,
-		commands.Volume,
-		commands.Report,
-		commands.Settings,
-	)
 	b.SetupRestServices()
 	if err = b.SetupPrometheusAPI(); err != nil {
 		b.Logger.Fatal("Failed to setup prometheus api: ", err)

cmd/dbot/main.go

@@ -12,8 +12,8 @@ import (
 	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/KittyBot-Org/KittyBotGo/dbot/commands"
 	"github.com/KittyBot-Org/KittyBotGo/dbot/listeners"
-	"github.com/KittyBot-Org/KittyBotGo/i18n"
 	"github.com/disgoorg/log"
+	"github.com/disgoorg/snowflake/v2"
 	_ "github.com/lib/pq"
 )
 
@@ -46,34 +46,44 @@ func main() {
 	logger.Info("Exiting after syncing? ", *exitAfterSync)
 	defer logger.Info("Shutting down discord dbot...")
 
-	if err := i18n.Setup(logger); err != nil {
-		logger.Fatal("Failed to setup i18n: ", err)
-	}
-
 	b := dbot.New(logger, cfg, version)
-	b.LoadCommands(
-		commands.BassBoost,
-		commands.ClearQueue,
-		commands.History,
-		commands.LikedSongs,
-		commands.Loop,
-		commands.Next,
-		commands.NowPlaying,
-		commands.Pause,
-		commands.Play,
-		commands.Previous,
-		commands.Queue,
-		commands.Remove,
-		commands.Seek,
-		commands.Shuffle,
-		commands.Stop,
-		commands.Tag,
-		commands.Tags,
-		commands.Volume,
-		commands.Report,
-		commands.Reports,
-		commands.ReportUser,
-		commands.Settings,
+	b.Handler.AddCommands(
+		commands.BassBoost(b),
+		commands.ClearQueue(b),
+		commands.History(b),
+		commands.LikedSongs(b),
+		commands.Loop(b),
+		commands.Next(b),
+		commands.NowPlaying(b),
+		commands.Pause(b),
+		commands.Play(b),
+		commands.Previous(b),
+		commands.Queue(b),
+		commands.Remove(b),
+		commands.Seek(b),
+		commands.Shuffle(b),
+		commands.Stop(b),
+		commands.Tag(b),
+		commands.Tags(b),
+		commands.Volume(b),
+		commands.Report(b),
+		commands.Reports(b),
+		commands.ReportUser(b),
+		commands.Settings(b),
+	)
+
+	b.Handler.AddComponents(
+		commands.ReportAction(b),
+		commands.ReportConfirm(b),
+		commands.ReportDelete(b),
+		commands.PlayerLike(b),
+		commands.PlayerNext(b),
+		commands.PlayerPlayPause(b),
+		commands.PlayerPrevious(b),
+	)
+
+	b.Handler.AddModals(
+		commands.ReportActionConfirm(b),
 	)
 
 	if err := b.SetupBot(
@@ -87,7 +97,11 @@ func main() {
 	defer b.Client.Close(context.TODO())
 
 	if *shouldSyncCommands {
-		b.SyncCommands()
+		var guilds []snowflake.ID
+		if b.Config.DevMode {
+			guilds = b.Config.DevGuildIDs
+		}
+		b.Handler.SyncCommands(b.Client, guilds...)
 	}
 
 	var err error

dbot/bot.go

@@ -11,6 +11,7 @@ import (
 	"github.com/disgoorg/disgo/gateway"
 	"github.com/disgoorg/disgo/webhook"
 	"github.com/disgoorg/disgolink/disgolink"
+	"github.com/disgoorg/handler"
 	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
 	"github.com/disgoorg/utils/paginator"
@@ -19,6 +20,7 @@ import (
 func New(logger log.Logger, config Config, version string) *Bot {
 	return &Bot{
 		Logger:              logger,
+		Handler:             handler.New(logger),
 		Paginator:           paginator.NewManager(),
 		ReportLogWebhookMap: NewReportLogWebhookMap(),
 		Config:              config,
@@ -29,10 +31,10 @@ func New(logger log.Logger, config Config, version string) *Bot {
 type Bot struct {
 	Logger              log.Logger
 	Client              bot.Client
+	Handler             *handler.Handler
 	Lavalink            disgolink.Link
 	MusicPlayers        *MusicPlayerMap
 	Paginator           *paginator.Manager
-	CommandMap          *CommandMap
 	DB                  db.DB
 	ReportLogWebhookMap *ReportLogWebhookMap
 	Config              Config
@@ -49,7 +51,7 @@ func (b *Bot) SetupBot(listeners ...bot.EventListener) (err error) {
 				return member.User.ID == b.Client.ID()
 			}),
 		),
-		bot.WithEventListeners(append([]bot.EventListener{b.CommandMap, b.Paginator}, listeners...)...),
+		bot.WithEventListeners(append([]bot.EventListener{b.Handler, b.Paginator}, listeners...)...),
 	)
 	return err
 }