diff --git a/service.go b/service.go index af598ef..dabaa69 100644 --- a/service.go +++ b/service.go @@ -8,10 +8,7 @@ package main import ( - "github.com/layeh/gopus" "github.com/layeh/gumble/gumble" - "github.com/layeh/gumble/gumble_ffmpeg" - "github.com/layeh/gumble/gumbleutil" ) // Service interface. Each service should implement these functions diff --git a/service_youtube.go b/service_youtube.go index 23a9b68..0be1734 100644 --- a/service_youtube.go +++ b/service_youtube.go @@ -21,6 +21,7 @@ import ( "time" "github.com/jmoiron/jsonq" + "github.com/layeh/gumble/gumble" "github.com/layeh/gumble/gumble_ffmpeg" ) @@ -37,7 +38,7 @@ func (yt *YoutubeService) ServiceName() string { } // Checks to see if service will accept URL -func (yt *YoutubeService) URLRegex(url) bool { +func (yt *YoutubeService) URLRegex(url string) bool { youtubePatterns := []string{ `https?:\/\/www\.youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`, `https?:\/\/youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`, @@ -61,7 +62,7 @@ func (yt *YoutubeService) URLRegex(url) bool { } // Creates the requested song/playlist and adds to the queue -func (yt *YoutubeService) NewRequest(user, url) { +func (yt *YoutubeService) NewRequest(user *gumble.User, url string) { }