Added live stream detection

Author: bela333

README.md

@@ -21,6 +21,7 @@ vigne:welcomer:main | | ID of the channel where welcome messages should go
 vigne:welcomer:secret | | ID of the channel where messages of leaves and joins should go
 vigne:welcomer:text:before | | Message, that should be displayed when a user joins. Example: `Welcome %s! Have fun!`
 vigne:welcomer:text:after | | After a short period of time, the original message gets replaced by this one. Example: `Welcome %s!`
+vigne:canPlayLive | | 1 or 0. Whether the music bot can play live streams or not.
 
 ## Default commands
 

database/Music.go

@@ -59,4 +59,19 @@ func (d MusicDatabase) CanPlay(duration time.Duration) bool {
 	}
 	return true
 
+}
+
+func (d MusicDatabase) CanPlayLive() bool {
+	if d.d.Redis.Exists(d.d.Decorate("canPlayLive")).Val() == 0{
+		return true
+	}
+	val, err := d.d.Redis.Get(d.d.Decorate("canPlayLive")).Int()
+	if err != nil {
+		return  true
+	}
+	if val != 0 {
+		return true
+	}
+
+	return false
 }

errors/errors.go

@@ -15,4 +15,5 @@ var NoCommand = New("", "Couldn't find this command")
 var NoMusic = New("couldn't find musicChannel and musicVoiceChannel in the config. Music bot functionality will be unavailable", "The Music Bot is unavailable")
 var NotPlaying = New("", "There is nothing playing currently...")
 var NotRequester = New("", "You can't skip this music")
-var MusicTooLong = New("", "The selected song is too long")
+var MusicTooLong = New("", "The selected song is too long")
+var MusicIsLive = New("", "Sorry, but I can't play live streams")

modules/music/music.go

@@ -177,6 +177,10 @@ func (p *MusicPlayer) AddMusic(url string, user *discordgo.User) (*Music, error)
 	if !d.CanPlay(time.Duration(m.Duration) * time.Second) {
 		return m, errors.MusicTooLong
 	}
+	//Make sure that it isn't live
+	if m.IsLive && !d.CanPlayLive() {
+		return m, errors.MusicIsLive
+	}
 	//Convert music data to JSON
 	jsonData, err := json.Marshal(m)
 	if err != nil {

modules/music/playCommand.go

@@ -34,18 +34,22 @@ func (p PlayCommand) Action(m *discordgo.MessageCreate, args []string, creator *
 	message := creator.NewMessage()
 	message.SetContent("Loading...")
 	go func() {
-		//new message builder
-		newMessage := &messages.MessageBuilder{}
 		//Replace Loading... with new message after loading is done
-		defer message.ReplaceMessage(newMessage)
+		newMessage := message.GetAfter()
+		defer message.Delete()
 		//Actually add music to queue
 		info, err := p.module.Player.AddMusic(strings.Join(args, " "), m.Author)
 		if err == errors.InvalidExtractor {
 			newMessage.SetContent("Sorry, I can't play music from this site")
 			return
 		}
 		if err != nil {
+			e, ok := err.(*errors.PublicError)
 			newMessage.SetContent("Couldn't play music")
+			if ok {
+				newMessage.SetContent(e.PublicPart)
+			}
+			newMessage.SetExpiry(time.Second*10)
 			return
 		}
 		embed := newMessage.GetEmbedBuilder()

modules/music/types.go

@@ -9,6 +9,7 @@ type Music struct {
 	Entries       []Music `json:"entries"`
 	URL           string  `json:"webpage_url"`
 	Duration      int     `json:"duration"`
+	IsLive bool `json:"is_live"`
 	RequesterID   string
 	RequesterName string
 }