temporarily removed components, upgraded dependencies

Author: Akvanvig

cmd/roboto/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23 AS builder
+FROM golang:1.26 AS builder
 
 COPY ./go.mod ./go.sum /build/
 COPY ./cmd /build/cmd/
@@ -11,4 +11,4 @@ RUN CGO_ENABLED=0 go build -o /out/roboto ./cmd/roboto
 FROM gcr.io/distroless/static-debian12
 
 COPY --from=builder /out/roboto /bot/roboto
-ENTRYPOINT [ "/bot/roboto" ]
+ENTRYPOINT [ "/bot/roboto" ]

go.mod

@@ -1,10 +1,10 @@
 module github.com/Akvanvig/roboto-go
 
-go 1.23.6
+go 1.24.0
 
 require (
-	github.com/disgoorg/disgo v0.18.15
-	github.com/disgoorg/disgolink/v3 v3.0.4
+	github.com/disgoorg/disgo v0.19.2
+	github.com/disgoorg/disgolink/v3 v3.1.0
 	github.com/disgoorg/json v1.2.0
 	github.com/disgoorg/lavaqueue-plugin v0.0.0-20250321002702-f415b63e00a2
 	github.com/disgoorg/snowflake/v2 v2.0.3
@@ -13,10 +13,14 @@ require (
 )
 
 require (
+	github.com/disgoorg/godave v0.1.0 // indirect
+	github.com/disgoorg/json/v2 v2.0.0 // indirect
+	github.com/disgoorg/omit v1.0.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/klauspost/compress v1.18.4 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
 )

go.sum

@@ -1,21 +1,27 @@
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 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/disgoorg/disgo v0.18.15 h1:T24I/NdUUody4FDvb8YkhSxHtsgRKD8Ui5Vi5PXnIrQ=
-github.com/disgoorg/disgo v0.18.15/go.mod h1:dXYVH059d6aK7mI+Nh/3svSRWedNd09P7C2VX3RqbJY=
-github.com/disgoorg/disgolink/v3 v3.0.4 h1:ymSb9PPbgvA1zQBkecnopRBB+ybJyqizLxP+SCoRfpM=
-github.com/disgoorg/disgolink/v3 v3.0.4/go.mod h1:UjHfrC4NT4vzibG3GyqtY5l3aMzFwfkU+B3RiW3AQQ8=
+github.com/disgoorg/disgo v0.19.2 h1:9FTTnYZ5RnLX6oybPr18d9+ht2KxIMkG/+HY0ADqTbM=
+github.com/disgoorg/disgo v0.19.2/go.mod h1:rLCcf3vnlyfOTGw8ksVmq5UE5CMzBA0eeA9oeZ+N0x4=
+github.com/disgoorg/disgolink/v3 v3.1.0 h1:IwhycUfvw87VbvvNSwBcdGMQNSFvNQ7/AQofmbp1NS8=
+github.com/disgoorg/disgolink/v3 v3.1.0/go.mod h1:UjHfrC4NT4vzibG3GyqtY5l3aMzFwfkU+B3RiW3AQQ8=
+github.com/disgoorg/godave v0.1.0 h1:3g0Zqzz+zNaxQTVLfCnl5eZKGqZk6cM/JLLbMKCtZQQ=
+github.com/disgoorg/godave v0.1.0/go.mod h1:OreAC3hpabr39bMVA+jwOVDq1EUPXH5A0XUBiZaDI1Y=
 github.com/disgoorg/json v1.2.0 h1:6e/j4BCfSHIvucG1cd7tJPAOp1RgnnMFSqkvZUtEd1Y=
 github.com/disgoorg/json v1.2.0/go.mod h1:BHDwdde0rpQFDVsRLKhma6Y7fTbQKub/zdGO5O9NqqA=
-github.com/disgoorg/lavaqueue-plugin v0.0.0-20250316154559-b61bdca91ddf h1:W9iPkb1CEwS4zLtIhKOX5uCpiCMbEnvlwm2WnuHKX4M=
-github.com/disgoorg/lavaqueue-plugin v0.0.0-20250316154559-b61bdca91ddf/go.mod h1:75Bd+G7i7uoMBqIx7DvYqc5Qu2sv9ZXWLM5OTp+FCjc=
+github.com/disgoorg/json/v2 v2.0.0 h1:U16yy/ARK7/aEpzjjqK1b/KaqqGHozUdeVw/DViEzQI=
+github.com/disgoorg/json/v2 v2.0.0/go.mod h1:jZTBC0nIE1WeetSEI3/Dka8g+qglb4FPVmp5I5HpEfI=
 github.com/disgoorg/lavaqueue-plugin v0.0.0-20250321002702-f415b63e00a2 h1:bHiCzX/dc5fDAlwh5soY18t3m0mD91wCj7c4WlRreBU=
 github.com/disgoorg/lavaqueue-plugin v0.0.0-20250321002702-f415b63e00a2/go.mod h1:75Bd+G7i7uoMBqIx7DvYqc5Qu2sv9ZXWLM5OTp+FCjc=
+github.com/disgoorg/omit v1.0.0 h1:y0LkVUOyUHT8ZlnhIAeOZEA22UYykeysK8bLJ0SfT78=
+github.com/disgoorg/omit v1.0.0/go.mod h1:RTmSARkf6PWT/UckwI0bV8XgWkWQoPppaT01rYKLcFQ=
 github.com/disgoorg/snowflake/v2 v2.0.3 h1:3B+PpFjr7j4ad7oeJu4RlQ+nYOTadsKapJIzgvSI2Ro=
 github.com/disgoorg/snowflake/v2 v2.0.3/go.mod h1:W6r7NUA7DwfZLwr00km6G4UnZ0zcoLBRufhkFWgAc4c=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c=
+github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
@@ -26,23 +32,20 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/pkg/errors v0.9.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/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
-github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
 github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
 github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad h1:qIQkSlF5vAUHxEmTbaqt1hkJ/t6skqEGYiMag343ucI=
 github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/bot/bot.go

@@ -19,7 +19,7 @@ type RobotoBot struct {
 	// Config
 	Config *config.RobotoConfig
 	// Clients
-	Discord bot.Client
+	Discord *bot.Client
 	Player  *player.Player
 }
 
@@ -90,7 +90,7 @@ func New(cfg *config.RobotoConfig) (*RobotoBot, error) {
 
 	roboto.Discord = discord
 	if cfg.Lavalink != nil {
-		roboto.Player = player.New(discord)
+		roboto.Player = player.New(*discord)
 	}
 
 	return roboto, nil

internal/command/music.go

@@ -137,7 +137,7 @@ func musicCommands(bot *bot.RobotoBot, r *handler.Mux) discord.ApplicationComman
 						})
 					}
 
-					caches := client.Caches()
+					caches := client.Caches
 					if *channelID != e.Channel().ID() {
 						channel, _ := caches.Channel(*channelID)
 						return e.Respond(discord.InteractionResponseTypeCreateMessage, discord.MessageUpdate{
@@ -181,7 +181,7 @@ type MusicHandler struct {
 
 func (h *MusicHandler) onPlay(data discord.SlashCommandInteractionData, e *handler.CommandEvent) error {
 	client := e.Client()
-	vsUser, ok := client.Caches().VoiceState(*e.GuildID(), e.User().ID)
+	vsUser, ok := client.Caches.VoiceState(*e.GuildID(), e.User().ID)
 	if !ok {
 		return e.CreateMessage(discord.MessageCreate{
 			Embeds: Embeds("Must be in a voice channel to queue songs", MessageColorError),
@@ -218,7 +218,7 @@ func (h *MusicHandler) onPlay(data discord.SlashCommandInteractionData, e *handl
 				return
 			}
 
-			vsBot, ok := client.Caches().VoiceState(*e.GuildID(), e.ApplicationID())
+			vsBot, ok := client.Caches.VoiceState(*e.GuildID(), e.ApplicationID())
 			if ok {
 				if *vsUser.ChannelID != *vsBot.ChannelID {
 					e.UpdateInteractionResponse(discord.MessageUpdate{

internal/command/owner.go

@@ -22,7 +22,7 @@ func ownerCommands(bot *bot.RobotoBot, r *handler.Mux) discord.ApplicationComman
 	r.Route("/owner", func(r handler.Router) {
 		r.Use(func(next handler.Handler) handler.Handler {
 			return func(e *handler.InteractionEvent) error {
-				app, err := e.Client().Rest().GetBotApplicationInfo()
+				app, err := e.Client().Rest.GetBotApplicationInfo()
 				if err != nil {
 					return e.Respond(discord.InteractionResponseTypeCreateMessage, discord.MessageUpdate{
 						Embeds: json.Ptr(Embeds("Failed to retrieve bot app info", MessageColorError)),

internal/player/components.go

@@ -120,12 +120,29 @@ func Embeds(title string, simple bool, tracks ...lavalink.Track) []discord.Embed
 	return []discord.Embed{embed}
 }
 
-func Components(queueEmpty bool) []discord.ContainerComponent {
-	components := []discord.ContainerComponent{discord.ActionRowComponent{
-		discord.NewPrimaryButton("Skip", "/music/skip").WithEmoji(discord.ComponentEmoji{Name: "👉"}).WithDisabled(queueEmpty),
-		discord.NewPrimaryButton("Queue", "/music/queue").WithEmoji(discord.ComponentEmoji{Name: "👏"}).WithStyle(discord.ButtonStyleSecondary).WithDisabled(queueEmpty),
-		discord.NewPrimaryButton("Stop", "/music/stop").WithEmoji(discord.ComponentEmoji{Name: "👋"}).WithStyle(discord.ButtonStyleDanger),
-	}}
-
+func Components(queueEmpty bool) []discord.LayoutComponent {
+	// disabled temporarily to get things running
+	components := []discord.LayoutComponent{}
 	return components
 }
+
+// func Components(queueEmpty bool) []discord.ContainerComponent {
+// 	// disabled temporarily to get things running
+// 	components := []discord.ContainerComponent{discord.ActionRowComponent{
+// 		discord.NewPrimaryButton("Skip", "/music/skip").WithEmoji(discord.ComponentEmoji{Name: "👉"}).WithDisabled(queueEmpty),
+// 		discord.NewPrimaryButton("Queue", "/music/queue").WithEmoji(discord.ComponentEmoji{Name: "👏"}).WithStyle(discord.ButtonStyleSecondary).WithDisabled(queueEmpty),
+// 		discord.NewPrimaryButton("Stop", "/music/stop").WithEmoji(discord.ComponentEmoji{Name: "👋"}).WithStyle(discord.ButtonStyleDanger),
+// 	}}
+// 	return components
+// }
+
+// func Components(queueEmpty bool) []discord.LayoutComponent {
+// 	// disabled temporarily to get things running
+// 	components := []discord.ContainerComponent{discord.ActionRowComponent{
+// 		discord.NewPrimaryButton("Skip", "/music/skip").WithEmoji(discord.ComponentEmoji{Name: "👉"}).WithDisabled(queueEmpty),
+// 		discord.NewPrimaryButton("Queue", "/music/queue").WithEmoji(discord.ComponentEmoji{Name: "👏"}).WithStyle(discord.ButtonStyleSecondary).WithDisabled(queueEmpty),
+// 		discord.NewPrimaryButton("Stop", "/music/stop").WithEmoji(discord.ComponentEmoji{Name: "👋"}).WithStyle(discord.ButtonStyleDanger),
+// 	}}
+
+// 	return components
+// }

internal/player/handlers.go

@@ -19,7 +19,7 @@ func (p *Player) onVoiceServerUpdate(e *events.VoiceServerUpdate) {
 }
 
 func (p *Player) onGuildVoiceStateUpdate(e *events.GuildVoiceStateUpdate) {
-	if e.VoiceState.UserID == e.Client().ApplicationID() {
+	if e.VoiceState.UserID == e.Client().ApplicationID {
 		p.lavalink.OnVoiceStateUpdate(context.Background(), e.VoiceState.GuildID, e.VoiceState.ChannelID, e.VoiceState.SessionID)
 	}
 }
@@ -34,7 +34,7 @@ func (p *Player) onTrackStart(lp disgolink.Player, e lavalink.TrackStartEvent) {
 	defer p.m.Unlock()
 
 	channelID := p.playingChannels[guildID]
-	msg, err := p.discord.Rest().CreateMessage(channelID, discord.MessageCreate{
+	msg, err := p.discord.Rest.CreateMessage(channelID, discord.MessageCreate{
 		Embeds:     Embeds("Now playing", false, e.Track),
 		Components: Components(len(queue) < 1),
 	})
@@ -57,7 +57,7 @@ func (p *Player) onTrackEnd(lp disgolink.Player, e lavalink.TrackEndEvent) {
 		return
 	}
 
-	err := p.discord.Rest().DeleteMessage(channelID, messageID)
+	err := p.discord.Rest.DeleteMessage(channelID, messageID)
 	if err != nil {
 		log.Warn().Err(err).Msgf("Failed to delete the message with ID '%s' in channel ID '%s'", messageID, channelID)
 	}
@@ -90,7 +90,7 @@ func (p *Player) onWebSocketClosed(lp disgolink.Player, e lavalink.WebSocketClos
 	channelID := p.playingChannels[guildID]
 	messageID := p.playingMessages[channelID]
 
-	p.discord.Rest().DeleteMessage(channelID, messageID)
+	p.discord.Rest.DeleteMessage(channelID, messageID)
 
 	delete(p.playingChannels, guildID)
 	delete(p.playingMessages, channelID)

internal/player/player.go

@@ -176,7 +176,7 @@ func (p *Player) Add(ctx context.Context, guildID snowflake.ID, channelID snowfl
 		p.playingChannels[guildID] = channelID
 	} else {
 		messageID := p.playingMessages[channelID]
-		_, err = p.discord.Rest().UpdateMessage(channelID, messageID, discord.MessageUpdate{
+		_, err = p.discord.Rest.UpdateMessage(channelID, messageID, discord.MessageUpdate{
 			Components: json.Ptr(Components(false)),
 		})
 		return err
@@ -218,7 +218,7 @@ func (p *Player) Clear(ctx context.Context, guildID snowflake.ID) error {
 
 	channelID := p.playingMessages[guildID]
 	messageID := p.playingMessages[channelID]
-	_, err = p.discord.Rest().UpdateMessage(channelID, messageID, discord.MessageUpdate{
+	_, err = p.discord.Rest.UpdateMessage(channelID, messageID, discord.MessageUpdate{
 		Components: json.Ptr(Components(true)),
 	})
 
@@ -290,7 +290,7 @@ func (p *Player) Close() {
 	// NOTE:
 	// We gracefully clean up sent messages to avoid user confusion.
 	for channelID, messageID := range p.playingMessages {
-		p.discord.Rest().DeleteMessage(channelID, messageID)
+		p.discord.Rest.DeleteMessage(channelID, messageID)
 		delete(p.playingMessages, channelID)
 	}
 
@@ -300,7 +300,7 @@ func (p *Player) Close() {
 }
 
 func New(discord bot.Client) *Player {
-	lavalink := disgolink.New(discord.ApplicationID(),
+	lavalink := disgolink.New(discord.ApplicationID,
 		disgolink.WithPlugins(
 			lavaqueue.New(),
 		),