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

Merge branch 'master' into release

This commit is contained in:
Alex Bramley 2011-07-29 23:11:14 +01:00
parent f0a9246c7a 4994263773
commit 2528d13314
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/handlers.go
View File

@ -220,7 +220,7 @@ func (conn *Conn) h_352(line *Line) {
// XXX: do we care about the actual server the nick is on? // XXX: do we care about the actual server the nick is on?
// or the hop count to this server? // or the hop count to this server?
// last arg contains "<hop count> <real name>" // last arg contains "<hop count> <real name>"
a := strings.Split(line.Args[len(line.Args)-1], " ", 2) a := strings.SplitN(line.Args[len(line.Args)-1], " ", 2)
n.Name = a[1] n.Name = a[1]
if idx := strings.Index(line.Args[6], "*"); idx != -1 { if idx := strings.Index(line.Args[6], "*"); idx != -1 {
n.Modes.Oper = true n.Modes.Oper = true
@ -236,7 +236,7 @@ func (conn *Conn) h_352(line *Line) {
// Handle 353 names reply // Handle 353 names reply
func (conn *Conn) h_353(line *Line) { func (conn *Conn) h_353(line *Line) {
if ch := conn.GetChannel(line.Args[2]); ch != nil { if ch := conn.GetChannel(line.Args[2]); ch != nil {
nicks := strings.Split(line.Args[len(line.Args)-1], " ", -1) nicks := strings.Split(line.Args[len(line.Args)-1], " ")
for _, nick := range nicks { for _, nick := range nicks {
// UnrealIRCd's coders are lazy and leave a trailing space // UnrealIRCd's coders are lazy and leave a trailing space
if nick == "" { if nick == "" {

2
client/line.go
View File

@ -49,7 +49,7 @@ func parseLine(s string) *Line {
// now we're here, we've parsed a :nick!user@host or :server off // now we're here, we've parsed a :nick!user@host or :server off
// s should contain "cmd args[] :text" // s should contain "cmd args[] :text"
args := strings.Split(s, " :", 2) args := strings.SplitN(s, " :", 2)
if len(args) > 1 { if len(args) > 1 {
args = append(strings.Fields(args[0]), args[1]) args = append(strings.Fields(args[0]), args[1])
} else { } else {

2
event/registry_test.go
View File

@ -66,7 +66,7 @@ func TestParallelDispatch(t *testing.T) {
func TestSerialDispatch(t *testing.T) { func TestSerialDispatch(t *testing.T) {
r := NewRegistry() r := NewRegistry()
r.Serial() r.(*registry).Serial()
// ensure we have enough of a buffer that all sends complete // ensure we have enough of a buffer that all sends complete
out := make(chan int, 5) out := make(chan int, 5)
// handler factory :-) // handler factory :-)