1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-07-04 04:19:23 +00:00

Move line parsing done in dispatchEvent into ParseLine().

This commit is contained in:
Alex Bramley 2011-07-27 21:10:37 +01:00
parent 5e814babc7
commit 33a5bff35b
3 changed files with 27 additions and 31 deletions

View file

@ -51,6 +51,30 @@ func parseLine(s string) *Line {
if len(args) > 1 {
line.Args = args[1:]
}
// So, I think CTCP and (in particular) CTCP ACTION are better handled as
// separate events as opposed to forcing people to have gargantuan PRIVMSG
// handlers to cope with the possibilities.
if line.Cmd == "PRIVMSG" &&
len(line.Args[1]) > 2 &&
strings.HasPrefix(line.Args[1], "\001") &&
strings.HasSuffix(line.Args[1], "\001") {
// WOO, it's a CTCP message
t := strings.Split(strings.Trim(line.Args[1], "\001"), " ", 2)
if len(t) > 1 {
// Replace the line with the unwrapped CTCP
line.Args[1] = t[1]
}
if c := strings.ToUpper(t[0]); c == "ACTION" {
// make a CTCP ACTION it's own event a-la PRIVMSG
line.Cmd = c
} else {
// otherwise, dispatch a generic CTCP event that
// contains the type of CTCP in line.Args[0]
line.Cmd = "CTCP"
line.Args = append([]string{c}, line.Args...)
}
}
return line
}