containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing build issues

Browse source
This commit is contained in:
MichaelOultram 2015-07-27 23:35:19 +01:00
parent 13feac24bd
commit 1ec27383af
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
service_youtube.go
View file

@ -63,15 +63,14 @@ func (y YouTube) URLRegex(url string) bool {
// Creates the requested song/playlist and adds to the queue // Creates the requested song/playlist and adds to the queue
func (y YouTube) NewRequest(user *gumble.User, url string) error { func (y YouTube) NewRequest(user *gumble.User, url string) error {
var matches, shortURL, startOffset
youtubePlaylistPattern := `https?:\/\/www\.youtube\.com\/playlist\?list=([\w-]+)` youtubePlaylistPattern := `https?:\/\/www\.youtube\.com\/playlist\?list=([\w-]+)`
if re, err := regexp.Compile(youtubePlaylistPattern); err == nil { if re, err := regexp.Compile(youtubePlaylistPattern); err == nil {
if re.MatchString(url) { if re.MatchString(url) {
if dj.HasPermission(username, dj.conf.Permissions.AdminAddPlaylists) { if dj.HasPermission(user.Name, dj.conf.Permissions.AdminAddPlaylists) {
shortURL = re.FindStringSubmatch(url)[1] shortURL := re.FindStringSubmatch(url)[1]
NewYouTubePlaylist(username, shortURL) NewYouTubePlaylist(user.Name, shortURL)
} else { } else {
return errors.new("NO_PLAYLIST_PERMISSION") return errors.New("NO_PLAYLIST_PERMISSION")
} }
} else { } else {
matches = re.FindAllStringSubmatch(url, -1) matches = re.FindAllStringSubmatch(url, -1)
@ -79,7 +78,7 @@ func (y YouTube) NewRequest(user *gumble.User, url string) error {
if len(matches[0]) == 3 { if len(matches[0]) == 3 {
startOffset = matches[0][2] startOffset = matches[0][2]
} }
NewYouTubeSong(user, shortURL, startOffset, nil) NewYouTubeSong(user.Name, shortURL, startOffset, nil)
} }
return nil return nil
} }