mirror/goirc
1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-09-06 00:43:20 +00:00
Code Issues Releases Wiki Activity

Accept nick from 001 message. Fixes #110.

Browse source
This commit is contained in:
Alex Bramley 2021-03-26 11:20:00 +00:00
parent cb4b7e5d82
commit 1bb2dff298
5 changed files with 91 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/line.go
View file

@ -154,11 +154,10 @@ func ParseLine(s string) *Line {
// src can be the hostname of the irc server or a nick!user@host
line.Host = line.Src
nidx, uidx := strings.Index(line.Src, "!"), strings.Index(line.Src, "@")
if uidx != -1 && nidx != -1 {
line.Nick = line.Src[:nidx]
line.Ident = line.Src[nidx+1 : uidx]
line.Host = line.Src[uidx+1:]
if n, i, h, ok := parseUserHost(line.Src); ok {
line.Nick = n
line.Ident = i
line.Host = h
}
}
@ -205,6 +204,15 @@ func ParseLine(s string) *Line {
return line
}
func parseUserHost(uh string) (nick, ident, host string, ok bool) {
uh = strings.TrimSpace(uh)
nidx, uidx := strings.Index(uh, "!"), strings.Index(uh, "@")
if uidx == -1 || nidx == -1 {
return "", "", "", false
}
return uh[:nidx], uh[nidx+1 : uidx], uh[uidx+1:], true
}
func (line *Line) argslen(minlen int) bool {
pc, _, _, _ := runtime.Caller(1)
fn := runtime.FuncForPC(pc)