mirror
/
goirc
mirror of https://github.com/fluffle/goirc
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle youtube links only after consider commands

This commit is contained in:
raylu 2011-04-10 21:37:14 -04:00
parent eddff91b7a
commit 3fd23e765a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
handler.go
View File

@ -62,20 +62,20 @@ func handlePrivmsg(conn *irc.Conn, line *irc.Line) {
target := line.Args[0] target := line.Args[0]
if isChannel(target) { if isChannel(target) {
// message to a channel // message to a channel
var video string if !command(conn, nick, line.Args[1], target) {
if start := strings.Index(line.Args[1], "youtube.com/watch?v="); start > -1 { var video string
video = line.Args[1][start+20:] if start := strings.Index(line.Args[1], "youtube.com/watch?v="); start > -1 {
} video = line.Args[1][start+20:]
if start := strings.Index(line.Args[1], "youtu.be/"); start > -1 { }
video = line.Args[1][start+9:] if start := strings.Index(line.Args[1], "youtu.be/"); start > -1 {
} video = line.Args[1][start+9:]
if video != "" { }
if end := strings.IndexAny(video, " &#"); end > -1 { if video != "" {
video = video[0:end] if end := strings.IndexAny(video, " &#"); end > -1 {
video = video[0:end]
}
youtube(conn, nick, video, target)
} }
youtube(conn, nick, video, target)
} else {
command(conn, nick, line.Args[1], target)
} }
} else if target == conn.Me.Nick { } else if target == conn.Me.Nick {
// message to us // message to us
@ -133,13 +133,13 @@ func isChannel(target string) bool {
return target[0] == '#' || target[0] == '&' return target[0] == '#' || target[0] == '&'
} }
func command(conn *irc.Conn, nick *irc.Nick, text, target string) { func command(conn *irc.Conn, nick *irc.Nick, text, target string) bool {
if !strings.HasPrefix(text, trigger) { if !strings.HasPrefix(text, trigger) {
return return false
} }
split := strings.Split(text, " ", 2) split := strings.Split(text, " ", 2)
if len(split[0]) < 2 { if len(split[0]) < 2 {
return return false
} }
handler := commands[split[0][1:]] handler := commands[split[0][1:]]
if handler != nil { if handler != nil {
@ -148,7 +148,9 @@ func command(conn *irc.Conn, nick *irc.Nick, text, target string) {
} else { } else {
handler(conn, nick, "", target) handler(conn, nick, "", target)
} }
return true
} }
return false
} }
func say(conn *irc.Conn, target, message string, a ...interface{}) { func say(conn *irc.Conn, target, message string, a ...interface{}) {