Updated music command

Author: MrOctopus

cmd/roboto/Dockerfile

@@ -1,8 +1,8 @@
 FROM golang:1.23 AS builder
 
+COPY ./go.mod ./go.sum /build/
 COPY ./cmd /build/cmd/
 COPY ./internal /build/internal/
-COPY ./go.mod ./go.sum /build/
 WORKDIR /build
 
 RUN go mod download

cmd/roboto/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 	"os/signal"
+	"syscall"
 
 	"github.com/mroctopus/bottie-bot/internal/bot"
 	"github.com/mroctopus/bottie-bot/internal/command"
@@ -36,7 +37,7 @@ func main() {
 	log.Info().Msg("Starting bot...")
 
 	channel := make(chan os.Signal, 1)
-	signal.Notify(channel, os.Interrupt)
+	signal.Notify(channel, syscall.SIGTERM, syscall.SIGINT)
 
 	err = bot.Start(cmds, r)
 	if err != nil {
@@ -46,7 +47,9 @@ func main() {
 	log.Info().Msg("Bot started, press Ctrl+C to exit")
 	<-channel
 
+	log.Info().Msg("Shutting down bot...")
+
 	bot.Stop()
 
-	log.Info().Msg("Shutdown bot...")
+	log.Info().Msg("Finished shutting down bot")
 }

internal/command/command.go

@@ -6,7 +6,6 @@ import (
 	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/handler"
 	"github.com/disgoorg/disgo/handler/middleware"
-	"github.com/disgoorg/json"
 	"github.com/mroctopus/bottie-bot/internal/bot"
 )
 
@@ -36,54 +35,46 @@ func New(bot *bot.RobotoBot) ([]discord.ApplicationCommandCreate, *handler.Mux)
 
 // -- COMMON --
 
-/*
+type MessageType int
+
 const (
-	MessageColorPrimary =
+	MessageTypeDefault MessageType = iota
+	MessageTypeError
 )
-*/
 
-func message(txt string) discord.MessageCreate {
-	return discord.MessageCreate{
-		Embeds: []discord.Embed{
-			{
-				Description: txt,
-				Color:       0,
-			},
-		},
+func message[T *discord.MessageCreate | *discord.MessageUpdate](dst T, txt string, t MessageType, flags discord.MessageFlags) T {
+	var color int
+	switch t {
+	case MessageTypeError:
+		color = 0
+		txt = fmt.Sprintf("Error: %s", txt)
+	case MessageTypeDefault:
+		fallthrough
+	default:
+		color = 0
 	}
-}
 
-func messageUpdate(txt string) discord.MessageUpdate {
-	return discord.MessageUpdate{
-		Embeds: &[]discord.Embed{
-			{
-				Description: txt,
-				Color:       0,
-			},
+	embeds := []discord.Embed{
+		{
+			Description: txt,
+			Color:       color,
 		},
 	}
-}
 
-func errorMessage(err error) discord.MessageCreate {
-	return discord.MessageCreate{
-		Embeds: []discord.Embed{
-			{
-				Description: fmt.Sprintf("Error: %s", err.Error()),
-				Color:       0,
-			},
-		},
-		Flags: discord.MessageFlagEphemeral,
+	// NOTE:
+	// For the love of god, please let this proposal go through:
+	// https://github.com/golang/go/issues/45380
+	switch v := any(dst).(type) {
+	case *discord.MessageCreate:
+		v.Embeds = embeds
+		v.Flags = flags
+	case *discord.MessageUpdate:
+		v.Embeds = &embeds
+		if flags > 0 {
+			v.Flags = &flags
+		}
+		v.Components = nil
 	}
-}
 
-func errorMessageUpdate(err error) discord.MessageUpdate {
-	return discord.MessageUpdate{
-		Embeds: &[]discord.Embed{
-			{
-				Description: fmt.Sprintf("Error: %s", err.Error()),
-				Color:       0,
-			},
-		},
-		Flags: json.Ptr(discord.MessageFlagEphemeral),
-	}
+	return dst
 }