Skip to content

Commit 232e252

Browse files
topi314topi314
committed
update examples
1 parent ae3768b commit 232e252

File tree

14 files changed

+66
-58
lines changed

14 files changed

+66
-58
lines changed

‎_examples/discordgo/go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
module github.com/disgoorg/disgolink/v3/_examples/discordgo
1+
module github.com/disgoorg/disgolink/v4/_examples/discordgo
22

3-
go 1.21
4-
5-
toolchain go1.22.0
3+
go 1.24
64

75
require (
86
github.com/bwmarrin/discordgo v0.28.1
9-
github.com/disgoorg/disgolink/v3 v3.0.3
10-
github.com/disgoorg/json v1.2.0
7+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01
118
github.com/disgoorg/log v1.2.1
9+
github.com/disgoorg/omit v1.0.0
1210
github.com/disgoorg/snowflake/v2 v2.0.3
1311
)
1412

1513
require (
14+
github.com/disgoorg/json/v2 v2.0.0 // indirect
1615
github.com/gorilla/websocket v1.5.3 // indirect
17-
golang.org/x/crypto v0.31.0 // indirect
18-
golang.org/x/sys v0.28.0 // indirect
16+
golang.org/x/crypto v0.37.0 // indirect
17+
golang.org/x/sys v0.32.0 // indirect
1918
)

‎_examples/discordgo/go.sum‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@ github.com/bwmarrin/discordgo v0.28.1 h1:gXsuo2GBO7NbR6uqmrrBDplPUx2T3nzu775q/Rd
22
github.com/bwmarrin/discordgo v0.28.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
33
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
44
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/disgoorg/disgolink/v3 v3.0.3 h1:9eHV5lVAGtPzDHjp3IJJ5xdWcFEjc24VJZWsA1341Wo=
6-
github.com/disgoorg/disgolink/v3 v3.0.3/go.mod h1:34D/dfdfrj08fSjtdKSXYz1TsMcjrX2RKoSpdxG3lHo=
7-
github.com/disgoorg/json v1.2.0 h1:6e/j4BCfSHIvucG1cd7tJPAOp1RgnnMFSqkvZUtEd1Y=
8-
github.com/disgoorg/json v1.2.0/go.mod h1:BHDwdde0rpQFDVsRLKhma6Y7fTbQKub/zdGO5O9NqqA=
5+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01 h1:mvorjiLN/GRIY7u+2ZtyxaEDmb1mH7cM7q5ZWQ9xJ+g=
6+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01/go.mod h1:x46rjrJgsFZyCNGSv4VrRoQO7m1tN/qFDVuVzysS184=
7+
github.com/disgoorg/json/v2 v2.0.0 h1:U16yy/ARK7/aEpzjjqK1b/KaqqGHozUdeVw/DViEzQI=
8+
github.com/disgoorg/json/v2 v2.0.0/go.mod h1:jZTBC0nIE1WeetSEI3/Dka8g+qglb4FPVmp5I5HpEfI=
99
github.com/disgoorg/log v1.2.1 h1:kZYAWkUBcGy4LbZcgYtgYu49xNVLy+xG5Uq3yz5VVQs=
1010
github.com/disgoorg/log v1.2.1/go.mod h1:hhQWYTFTnIGzAuFPZyXJEi11IBm9wq+/TVZt/FEwX0o=
11+
github.com/disgoorg/omit v1.0.0 h1:y0LkVUOyUHT8ZlnhIAeOZEA22UYykeysK8bLJ0SfT78=
12+
github.com/disgoorg/omit v1.0.0/go.mod h1:RTmSARkf6PWT/UckwI0bV8XgWkWQoPppaT01rYKLcFQ=
1113
github.com/disgoorg/snowflake/v2 v2.0.3 h1:3B+PpFjr7j4ad7oeJu4RlQ+nYOTadsKapJIzgvSI2Ro=
1214
github.com/disgoorg/snowflake/v2 v2.0.3/go.mod h1:W6r7NUA7DwfZLwr00km6G4UnZ0zcoLBRufhkFWgAc4c=
1315
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
1416
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
1517
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
1618
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1719
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
18-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
19-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
20+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
21+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2022
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
21-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
22-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
23+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
24+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
2325
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
2426
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
25-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
26-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
27+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
28+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
2729
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
2830
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
2931
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎_examples/discordgo/handlers.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"time"
77

88
"github.com/bwmarrin/discordgo"
9-
"github.com/disgoorg/json"
9+
"github.com/disgoorg/omit"
1010
"github.com/disgoorg/snowflake/v2"
1111

12-
"github.com/disgoorg/disgolink/v3/disgolink"
13-
"github.com/disgoorg/disgolink/v3/lavalink"
12+
"github.com/disgoorg/disgolink/v4/disgolink"
13+
"github.com/disgoorg/disgolink/v4/lavalink"
1414
)
1515

1616
func (b *Bot) shuffle(event *discordgo.InteractionCreate, data discordgo.ApplicationCommandInteractionData) error {
@@ -235,7 +235,7 @@ func (b *Bot) play(event *discordgo.InteractionCreate, data discordgo.Applicatio
235235
b.Lavalink.BestNode().LoadTracksHandler(ctx, identifier, disgolink.NewResultHandler(
236236
func(track lavalink.Track) {
237237
_, _ = b.Session.InteractionResponseEdit(event.Interaction, &discordgo.WebhookEdit{
238-
Content: json.Ptr(fmt.Sprintf("Loading track: [`%s`](<%s>)", track.Info.Title, *track.Info.URI)),
238+
Content: omit.Ptr(fmt.Sprintf("Loading track: [`%s`](<%s>)", track.Info.Title, *track.Info.URI)),
239239
})
240240
if player.Track() == nil {
241241
toPlay = &track
@@ -245,7 +245,7 @@ func (b *Bot) play(event *discordgo.InteractionCreate, data discordgo.Applicatio
245245
},
246246
func(playlist lavalink.Playlist) {
247247
_, _ = b.Session.InteractionResponseEdit(event.Interaction, &discordgo.WebhookEdit{
248-
Content: json.Ptr(fmt.Sprintf("Loaded playlist: `%s` with `%d` tracks", playlist.Info.Name, len(playlist.Tracks))),
248+
Content: omit.Ptr(fmt.Sprintf("Loaded playlist: `%s` with `%d` tracks", playlist.Info.Name, len(playlist.Tracks))),
249249
})
250250
if player.Track() == nil {
251251
toPlay = &playlist.Tracks[0]
@@ -256,7 +256,7 @@ func (b *Bot) play(event *discordgo.InteractionCreate, data discordgo.Applicatio
256256
},
257257
func(tracks []lavalink.Track) {
258258
_, _ = b.Session.InteractionResponseEdit(event.Interaction, &discordgo.WebhookEdit{
259-
Content: json.Ptr(fmt.Sprintf("Loaded search result: [`%s`](<%s>)", tracks[0].Info.Title, *tracks[0].Info.URI)),
259+
Content: omit.Ptr(fmt.Sprintf("Loaded search result: [`%s`](<%s>)", tracks[0].Info.Title, *tracks[0].Info.URI)),
260260
})
261261
if player.Track() == nil {
262262
toPlay = &tracks[0]
@@ -266,20 +266,20 @@ func (b *Bot) play(event *discordgo.InteractionCreate, data discordgo.Applicatio
266266
},
267267
func() {
268268
_, _ = b.Session.InteractionResponseEdit(event.Interaction, &discordgo.WebhookEdit{
269-
Content: json.Ptr(fmt.Sprintf("Nothing found for: `%s`", identifier)),
269+
Content: omit.Ptr(fmt.Sprintf("Nothing found for: `%s`", identifier)),
270270
})
271271
},
272272
func(err error) {
273273
_, _ = b.Session.InteractionResponseEdit(event.Interaction, &discordgo.WebhookEdit{
274-
Content: json.Ptr(fmt.Sprintf("Error while looking up query: `%s`", err)),
274+
Content: omit.Ptr(fmt.Sprintf("Error while looking up query: `%s`", err)),
275275
})
276276
},
277277
))
278278
if toPlay == nil {
279279
return nil
280280
}
281281

282-
if err := b.Session.ChannelVoiceJoinManual(event.GuildID, voiceState.ChannelID, false, false); err != nil {
282+
if err = b.Session.ChannelVoiceJoinManual(event.GuildID, voiceState.ChannelID, false, false); err != nil {
283283
return err
284284
}
285285

‎_examples/discordgo/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
"github.com/disgoorg/log"
1616

17-
"github.com/disgoorg/disgolink/v3/disgolink"
17+
"github.com/disgoorg/disgolink/v4/disgolink"
1818
)
1919

2020
var (

‎_examples/discordgo/player_handlers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/disgoorg/log"
88

9-
"github.com/disgoorg/disgolink/v3/disgolink"
10-
"github.com/disgoorg/disgolink/v3/lavalink"
9+
"github.com/disgoorg/disgolink/v4/disgolink"
10+
"github.com/disgoorg/disgolink/v4/lavalink"
1111
)
1212

1313
func (b *Bot) onPlayerPause(player disgolink.Player, event lavalink.PlayerPauseEvent) {
@@ -29,7 +29,7 @@ func (b *Bot) onTrackEnd(player disgolink.Player, event lavalink.TrackEndEvent)
2929
return
3030
}
3131

32-
queue := b.Queues.Get(event.GuildID().String())
32+
queue := b.Queues.Get(event.GetGuildID().String())
3333
var (
3434
nextTrack lavalink.Track
3535
ok bool

‎_examples/discordgo/queue.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"math/rand"
55
"time"
66

7-
"github.com/disgoorg/disgolink/v3/lavalink"
7+
"github.com/disgoorg/disgolink/v4/lavalink"
88
)
99

1010
func init() {

‎_examples/disgo/bot.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import (
77
"github.com/disgoorg/disgo/bot"
88
"github.com/disgoorg/disgo/discord"
99
"github.com/disgoorg/disgo/events"
10-
"github.com/disgoorg/disgolink/v3/disgolink"
1110
"github.com/disgoorg/snowflake/v2"
11+
12+
"github.com/disgoorg/disgolink/v4/disgolink"
1213
)
1314

1415
func newBot() *Bot {

‎_examples/disgo/commands.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"github.com/disgoorg/disgo/bot"
77
"github.com/disgoorg/disgo/discord"
88
"github.com/disgoorg/disgo/handler"
9-
"github.com/disgoorg/json"
9+
"github.com/disgoorg/omit"
1010
"github.com/disgoorg/snowflake/v2"
1111

12-
"github.com/disgoorg/disgolink/v3/lavalink"
12+
"github.com/disgoorg/disgolink/v4/lavalink"
1313
)
1414

1515
var commands = []discord.ApplicationCommandCreate{
@@ -109,8 +109,8 @@ var commands = []discord.ApplicationCommandCreate{
109109
Name: "volume",
110110
Description: "The volume to set",
111111
Required: true,
112-
MaxValue: json.Ptr(1000),
113-
MinValue: json.Ptr(0),
112+
MaxValue: omit.Ptr(1000),
113+
MinValue: omit.Ptr(0),
114114
},
115115
},
116116
},

‎_examples/disgo/go.mod‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
module github.com/disgoorg/disgolink/v3/_examples/disgo
1+
module github.com/disgoorg/disgolink/v4/_examples/disgo
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
github.com/disgoorg/disgo v0.18.15
7-
github.com/disgoorg/disgolink/v3 v3.0.4
8-
github.com/disgoorg/json v1.2.0
7+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01
8+
github.com/disgoorg/json/v2 v2.0.0
9+
github.com/disgoorg/omit v1.0.0
910
github.com/disgoorg/snowflake/v2 v2.0.3
1011
)
1112

1213
require (
14+
github.com/disgoorg/json v1.2.0 // indirect
1315
github.com/gorilla/websocket v1.5.3 // indirect
1416
github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad // indirect
15-
golang.org/x/crypto v0.36.0 // indirect
16-
golang.org/x/sys v0.31.0 // indirect
17+
golang.org/x/crypto v0.37.0 // indirect
18+
golang.org/x/sys v0.32.0 // indirect
1719
)

‎_examples/disgo/go.sum‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/disgoorg/disgo v0.18.15 h1:T24I/NdUUody4FDvb8YkhSxHtsgRKD8Ui5Vi5PXnIrQ=
44
github.com/disgoorg/disgo v0.18.15/go.mod h1:dXYVH059d6aK7mI+Nh/3svSRWedNd09P7C2VX3RqbJY=
5-
github.com/disgoorg/disgolink/v3 v3.0.4 h1:ymSb9PPbgvA1zQBkecnopRBB+ybJyqizLxP+SCoRfpM=
6-
github.com/disgoorg/disgolink/v3 v3.0.4/go.mod h1:UjHfrC4NT4vzibG3GyqtY5l3aMzFwfkU+B3RiW3AQQ8=
5+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01 h1:mvorjiLN/GRIY7u+2ZtyxaEDmb1mH7cM7q5ZWQ9xJ+g=
6+
github.com/disgoorg/disgolink/v4 v4.0.0-20250425182408-ae3768bebd01/go.mod h1:x46rjrJgsFZyCNGSv4VrRoQO7m1tN/qFDVuVzysS184=
77
github.com/disgoorg/json v1.2.0 h1:6e/j4BCfSHIvucG1cd7tJPAOp1RgnnMFSqkvZUtEd1Y=
88
github.com/disgoorg/json v1.2.0/go.mod h1:BHDwdde0rpQFDVsRLKhma6Y7fTbQKub/zdGO5O9NqqA=
9+
github.com/disgoorg/json/v2 v2.0.0 h1:U16yy/ARK7/aEpzjjqK1b/KaqqGHozUdeVw/DViEzQI=
10+
github.com/disgoorg/json/v2 v2.0.0/go.mod h1:jZTBC0nIE1WeetSEI3/Dka8g+qglb4FPVmp5I5HpEfI=
11+
github.com/disgoorg/omit v1.0.0 h1:y0LkVUOyUHT8ZlnhIAeOZEA22UYykeysK8bLJ0SfT78=
12+
github.com/disgoorg/omit v1.0.0/go.mod h1:RTmSARkf6PWT/UckwI0bV8XgWkWQoPppaT01rYKLcFQ=
913
github.com/disgoorg/snowflake/v2 v2.0.3 h1:3B+PpFjr7j4ad7oeJu4RlQ+nYOTadsKapJIzgvSI2Ro=
1014
github.com/disgoorg/snowflake/v2 v2.0.3/go.mod h1:W6r7NUA7DwfZLwr00km6G4UnZ0zcoLBRufhkFWgAc4c=
1115
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
@@ -16,9 +20,9 @@ github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad h1:qIQkSlF5vAUHxE
1620
github.com/sasha-s/go-csync v0.0.0-20240107134140-fcbab37b09ad/go.mod h1:/pA7k3zsXKdjjAiUhB5CjuKib9KJGCaLvZwtxGC8U0s=
1721
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1822
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
19-
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
20-
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
21-
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
22-
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
23+
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
24+
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
25+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
26+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
2327
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2428
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)