e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Store nick in Message.Nick, keep full prefix in Message.Prefix

Browse source
This commit is contained in:
Ken-Håvard Lieng 2015-06-01 01:48:07 +02:00
parent 65b3aac977
commit 5cf2822c34
2 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
server/irc.go
View file

@ -52,6 +52,7 @@ const (
type Message struct {
Prefix string
Nick string
Command string
Params []string
Trailing string
@ -246,8 +247,6 @@ func (i *IRC) recv() {
}
msg := parseMessage(line)
msg.Prefix = parseUser(msg.Prefix)
i.Messages <- msg
switch msg.Command {
@ -276,6 +275,7 @@ func parseMessage(line string) *Message {
if strings.HasPrefix(line, ":") {
cmdStart = strings.Index(line, " ") + 1
msg.Prefix = line[1 : cmdStart-1]
msg.Nick = parseNick(msg.Prefix)
}
if i := strings.Index(line, " :"); i > 0 {
@ -296,9 +296,9 @@ func parseMessage(line string) *Message {
return &msg
}
func parseUser(user string) string {
if i := strings.Index(user, "!"); i > 0 {
return user[:i]
func parseNick(prefix string) string {
if i := strings.Index(prefix, "!"); i > 0 {
return prefix[:i]
}
return user
return prefix
}