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

Turns out gofmt isn't big on spaces sometimes.

This commit is contained in:
Alex Bramley 2011-09-29 22:58:04 +01:00
parent de66051d07
commit 3e1b2c0f81
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/handlers.go
View File

@ -97,7 +97,7 @@ func (conn *Conn) h_JOIN(line *Line) {
// first we've seen of this channel, so should be us joining it // first we've seen of this channel, so should be us joining it
// NOTE this will also take care of n == nil && ch == nil // NOTE this will also take care of n == nil && ch == nil
if n != conn.Me { if n != conn.Me {
logging.Warn("irc.JOIN(): JOIN to unknown channel %s recieved " + logging.Warn("irc.JOIN(): JOIN to unknown channel %s recieved "+
"from (non-me) nick %s", line.Args[0], line.Nick) "from (non-me) nick %s", line.Args[0], line.Nick)
return return
} }

2
client/handlers_test.go
View File

@ -131,7 +131,7 @@ func TestJOIN(t *testing.T) {
// verifying their expected side-effects instead. Fixing this requires // verifying their expected side-effects instead. Fixing this requires
// significant effort to move Conn to being a mockable interface type // significant effort to move Conn to being a mockable interface type
// instead of a concrete struct. I'm not sure how feasible this is :-/ // instead of a concrete struct. I'm not sure how feasible this is :-/
// //
// Soon, we'll find out :-) // Soon, we'll find out :-)
m, c := setUp(t) m, c := setUp(t)

12
client/nickchan.go
View File

@ -130,7 +130,7 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
if len(modeargs) != 0 { if len(modeargs) != 0 {
ch.Modes.Key, modeargs = modeargs[0], modeargs[1:] ch.Modes.Key, modeargs = modeargs[0], modeargs[1:]
} else { } else {
logging.Warn("irc.ParseChanModes(): not enough arguments to " + logging.Warn("irc.ParseChanModes(): not enough arguments to "+
"process MODE %s %s%s", ch.Name, modestr, m) "process MODE %s %s%s", ch.Name, modestr, m)
} }
case 'l': case 'l':
@ -138,7 +138,7 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
ch.Modes.Limit, _ = strconv.Atoi(modeargs[0]) ch.Modes.Limit, _ = strconv.Atoi(modeargs[0])
modeargs = modeargs[1:] modeargs = modeargs[1:]
} else { } else {
logging.Warn("irc.ParseChanModes(): not enough arguments to " + logging.Warn("irc.ParseChanModes(): not enough arguments to "+
"process MODE %s %s%s", ch.Name, modestr, m) "process MODE %s %s%s", ch.Name, modestr, m)
} }
case 'q', 'a', 'o', 'h', 'v': case 'q', 'a', 'o', 'h', 'v':
@ -159,11 +159,11 @@ func (conn *Conn) ParseChannelModes(ch *Channel, modes string, modeargs []string
} }
modeargs = modeargs[1:] modeargs = modeargs[1:]
} else { } else {
logging.Warn("irc.ParseChanModes(): untracked nick %s " + logging.Warn("irc.ParseChanModes(): untracked nick %s "+
"recieved MODE on channel %s", modeargs[0], ch.Name) "recieved MODE on channel %s", modeargs[0], ch.Name)
} }
} else { } else {
logging.Warn("irc.ParseChanModes(): not enough arguments to " + logging.Warn("irc.ParseChanModes(): not enough arguments to "+
"process MODE %s %s%s", ch.Name, modestr, m) "process MODE %s %s%s", ch.Name, modestr, m)
} }
} }
@ -208,7 +208,7 @@ func (ch *Channel) AddNick(n *Nick) {
ch.Nicks[n] = new(ChanPrivs) ch.Nicks[n] = new(ChanPrivs)
n.Channels[ch] = ch.Nicks[n] n.Channels[ch] = ch.Nicks[n]
} else { } else {
logging.Warn("irc.Channel.AddNick(): trying to add already-present " + logging.Warn("irc.Channel.AddNick(): trying to add already-present "+
"nick %s to channel %s", n.Nick, ch.Name) "nick %s to channel %s", n.Nick, ch.Name)
} }
} }
@ -257,7 +257,7 @@ func (n *Nick) AddChannel(ch *Channel) {
ch.Nicks[n] = new(ChanPrivs) ch.Nicks[n] = new(ChanPrivs)
n.Channels[ch] = ch.Nicks[n] n.Channels[ch] = ch.Nicks[n]
} else { } else {
logging.Warn("irc.Nick.AddChannel(): trying to add already-present " + logging.Warn("irc.Nick.AddChannel(): trying to add already-present "+
"channel %s to nick %s", ch.Name, n.Nick) "channel %s to nick %s", ch.Name, n.Nick)
} }
} }