reformat

KittyBot-Org · Mar 3, 2023 · a97fd0a · a97fd0a
1 parent cf3f581
commit a97fd0a
Show file tree

Hide file tree

Showing 42 changed files with 108 additions and 66 deletions.
diff --git a/backend/backend.go b/backend/backend.go
@@ -4,9 +4,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/KittyBot-Org/KittyBotGo/db"
 	"github.com/disgoorg/handler"
 
+	"github.com/KittyBot-Org/KittyBotGo/db"
+
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/rest"
 	"github.com/disgoorg/log"

diff --git a/backend/config.go b/backend/config.go
@@ -3,8 +3,9 @@ package backend
 import (
 	"time"
 
-	"github.com/KittyBot-Org/KittyBotGo/config"
 	"github.com/disgoorg/snowflake/v2"
+
+	"github.com/KittyBot-Org/KittyBotGo/config"
 )
 
 type Config struct {

diff --git a/backend/routes/votes.go b/backend/routes/votes.go
@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"net/http"
 
-	backend2 "github.com/KittyBot-Org/KittyBotGo/backend"
 	"github.com/disgoorg/snowflake/v2"
 	"github.com/gorilla/mux"
+
+	backend2 "github.com/KittyBot-Org/KittyBotGo/backend"
 )
 
 type voteAddPayload struct {

diff --git a/cmd/backend/main.go b/cmd/backend/main.go
@@ -6,12 +6,13 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/disgoorg/log"
+	_ "github.com/lib/pq"
+
 	backend2 "github.com/KittyBot-Org/KittyBotGo/backend"
 	"github.com/KittyBot-Org/KittyBotGo/backend/routes"
 	"github.com/KittyBot-Org/KittyBotGo/config"
 	"github.com/KittyBot-Org/KittyBotGo/db"
-	"github.com/disgoorg/log"
-	_ "github.com/lib/pq"
 )
 
 var (

diff --git a/config/config.go b/config/config.go
@@ -4,10 +4,11 @@ import (
 	"errors"
 	"os"
 
-	"github.com/KittyBot-Org/KittyBotGo/db"
 	"github.com/disgoorg/json"
 	"github.com/disgoorg/log"
 	"github.com/disgoorg/snowflake/v2"
+
+	"github.com/KittyBot-Org/KittyBotGo/db"
 )
 
 func LoadConfig(v interface{}) error {

diff --git a/db/guild_settings.go b/db/guild_settings.go
@@ -3,10 +3,11 @@ package db
 import (
 	"database/sql"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type GuildSettingsDB interface {

diff --git a/db/liked_tracks.go b/db/liked_tracks.go
@@ -4,10 +4,11 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type LikedTracksDB interface {

diff --git a/db/play_histories.go b/db/play_histories.go
@@ -4,10 +4,11 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type PlayHistoriesDB interface {

diff --git a/db/reports.go b/db/reports.go
@@ -4,10 +4,11 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type ReportsDB interface {

diff --git a/db/tags.go b/db/tags.go
@@ -4,10 +4,11 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type TagsDB interface {

diff --git a/db/voters.go b/db/voters.go
@@ -4,10 +4,11 @@ import (
 	"database/sql"
 	"time"
 
-	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 	"github.com/disgoorg/snowflake/v2"
 	. "github.com/go-jet/jet/v2/postgres"
+
+	. "github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/table"
 )
 
 type VotersDB interface {

diff --git a/dbot/commands/bass-boost.go b/dbot/commands/bass-boost.go
@@ -1,12 +1,13 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/disgolink/lavalink"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 var bassBoost = &lavalink.Equalizer{

diff --git a/dbot/commands/clear-queue.go b/dbot/commands/clear-queue.go
@@ -1,10 +1,11 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func ClearQueue(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/history.go b/dbot/commands/history.go
@@ -3,11 +3,12 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/disgoorg/utils/paginator"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func History(bot *dbot.Bot) handler.Command {

diff --git a/dbot/commands/liked-tracks.go b/dbot/commands/liked-tracks.go
@@ -3,13 +3,14 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/disgoorg/utils/paginator"
 	"github.com/lithammer/fuzzysearch/fuzzy"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func LikedTracks(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/loop.go b/dbot/commands/loop.go
@@ -3,10 +3,11 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func Loop(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/music_player.go b/dbot/commands/music_player.go
@@ -1,12 +1,13 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/go-jet/jet/v2/qrm"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func PlayerNext(b *dbot.Bot) handler.Component {

diff --git a/dbot/commands/music_utils.go b/dbot/commands/music_utils.go
@@ -3,12 +3,13 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/disgolink/lavalink"
 	source_plugins "github.com/disgoorg/source-plugins"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func getMusicControllerComponents(track lavalink.AudioTrack) discord.ContainerComponent {

diff --git a/dbot/commands/next.go b/dbot/commands/next.go
@@ -1,11 +1,12 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func Next(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/now-playing.go b/dbot/commands/now-playing.go
@@ -3,11 +3,12 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func NowPlaying(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/pause.go b/dbot/commands/pause.go
@@ -1,11 +1,12 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func Pause(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/play.go b/dbot/commands/play.go
@@ -6,8 +6,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/bot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
@@ -16,6 +14,9 @@ import (
 	"github.com/disgoorg/snowflake/v2"
 	source_plugins "github.com/disgoorg/source-plugins"
 	"github.com/lithammer/fuzzysearch/fuzzy"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 var urlPattern = regexp.MustCompile("^https?://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]?")

diff --git a/dbot/commands/previous.go b/dbot/commands/previous.go
@@ -1,11 +1,12 @@
 package commands
 
 import (
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
-	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
+	"github.com/KittyBot-Org/KittyBotGo/dbot/responses"
 )
 
 func Previous(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/queue.go b/dbot/commands/queue.go
@@ -3,11 +3,12 @@ package commands
 import (
 	"fmt"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/disgoorg/utils/paginator"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func Queue(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/remove.go b/dbot/commands/remove.go
@@ -5,11 +5,12 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/lithammer/fuzzysearch/fuzzy"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func Remove(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/report-user.go b/dbot/commands/report-user.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/disgoorg/json"
+
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func ReportUser(b *dbot.Bot) handler.Command {

diff --git a/dbot/commands/report.go b/dbot/commands/report.go
@@ -5,12 +5,13 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
-	"github.com/KittyBot-Org/KittyBotGo/dbot"
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/handler"
 	"github.com/disgoorg/snowflake/v2"
+
+	"github.com/KittyBot-Org/KittyBotGo/db/.gen/kittybot-go/public/model"
+	"github.com/KittyBot-Org/KittyBotGo/dbot"
 )
 
 func Report(b *dbot.Bot) handler.Command {