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:30:59 +01:00
parent 31f467591c
commit 13feac24bd
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands.go
View file

@ -175,10 +175,9 @@ func add(user *gumble.User, username, url string) {
if urlService == nil { if urlService == nil {
dj.SendPrivateMessage(user, INVALID_URL_MSG) dj.SendPrivateMessage(user, INVALID_URL_MSG)
} else {
urlService.NewRequest(user, url)
} }
// else {
// urlService.NewRequest(user, url)
// }
youtubePatterns := []string{ youtubePatterns := []string{
`https?:\/\/www\.youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`, `https?:\/\/www\.youtube\.com\/watch\?v=([\w-]+)(\&t=\d*m?\d*s?)?`,

20
service_youtube.go
View file

@ -63,7 +63,27 @@ 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-]+)`
if re, err := regexp.Compile(youtubePlaylistPattern); err == nil {
if re.MatchString(url) {
if dj.HasPermission(username, dj.conf.Permissions.AdminAddPlaylists) {
shortURL = re.FindStringSubmatch(url)[1]
NewYouTubePlaylist(username, shortURL)
} else {
return errors.new("NO_PLAYLIST_PERMISSION")
}
} else {
matches = re.FindAllStringSubmatch(url, -1)
shortURL = matches[0][1]
if len(matches[0]) == 3 {
startOffset = matches[0][2]
}
NewYouTubeSong(user, shortURL, startOffset, nil)
}
return nil return nil
}
return err
} }
// ------------ // ------------