From 566c1b0777b690c5e582b174e38aa66ea52ae279 Mon Sep 17 00:00:00 2001
From: Christopher F <foxbot@protonmail.com>
Date: Wed, 22 Aug 2018 21:07:22 -0400
Subject: [PATCH] fix: use discordgo fork, complete lavalink handshake

this works.
---
 example/main.go | 12 +++++-------
 player.go       |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/example/main.go b/example/main.go
index 3271bbf..89cb537 100644
--- a/example/main.go
+++ b/example/main.go
@@ -5,12 +5,12 @@ import (
 	"log"
 	"os"
 	"os/signal"
-	"strconv"
 	"syscall"
 
 	"github.com/foxbot/gavalink"
 
-	"github.com/bwmarrin/discordgo"
+	// this requires the "feature/manual-voice-connection branch!!"
+	"github.com/foxbot/discordgo"
 )
 
 var token string
@@ -33,6 +33,7 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
+	dg.SyncEvents = false
 
 	dg.AddHandler(ready)
 	dg.AddHandler(messageCreate)
@@ -87,7 +88,7 @@ func messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
 		for _, vs := range g.VoiceStates {
 			if vs.UserID == m.Author.ID {
 				log.Println("trying to connect to channel")
-				_, err := s.ChannelVoiceJoin(c.GuildID, vs.ChannelID, false, false)
+				err = s.ChannelVoiceJoinManual(c.GuildID, vs.ChannelID, false, false)
 				if err != nil {
 					log.Println(err)
 				} else {
@@ -125,10 +126,9 @@ func voiceServerUpdate(s *discordgo.Session, event *discordgo.VoiceServerUpdate)
 		return
 	}
 
-	gid, _ := strconv.Atoi(event.GuildID)
 	vsu := gavalink.VoiceServerUpdate{
 		Endpoint: event.Endpoint,
-		GuildID:  gid,
+		GuildID:  event.GuildID,
 		Token:    event.Token,
 	}
 	handler := new(gavalink.DummyEventHandler)
@@ -137,6 +137,4 @@ func voiceServerUpdate(s *discordgo.Session, event *discordgo.VoiceServerUpdate)
 		log.Println(err)
 		return
 	}
-
-	panic("discordgo: cancel event")
 }
diff --git a/player.go b/player.go
index ac91bb1..affa9eb 100644
--- a/player.go
+++ b/player.go
@@ -31,6 +31,7 @@ func (player *Player) PlayAt(track string, startTime int, endTime int) error {
 
 	msg := message{
 		Op:        opPlay,
+		GuildID:   player.guildID,
 		Track:     track,
 		StartTime: start,
 		EndTime:   end,