mirror/goirc
1
0
Fork 0
mirror of https://github.com/fluffle/goirc synced 2025-07-17 09:11:13 +00:00
Code Issues Releases Wiki Activity

gofix weekly fixes for state.

Browse source
This commit is contained in:
Alex Bramley 2011-11-13 13:32:53 +00:00
parent 0dc19703ab
commit 81eb9ee3df
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
state/channel.go
View file

@ -11,9 +11,9 @@ import (
type Channel struct {
Name, Topic string
Modes *ChanMode
lookup map[string]*Nick
lookup map[string]*Nick
nicks map[*Nick]*ChanPrivs
l logging.Logger
l logging.Logger
}
// A struct representing the modes of an IRC Channel
@ -93,11 +93,11 @@ func init() {
func NewChannel(name string, l logging.Logger) *Channel {
return &Channel{
Name: name,
Modes: new(ChanMode),
nicks: make(map[*Nick]*ChanPrivs),
Name: name,
Modes: new(ChanMode),
nicks: make(map[*Nick]*ChanPrivs),
lookup: make(map[string]*Nick),
l: l,
l: l,
}
}
@ -125,8 +125,8 @@ func (ch *Channel) addNick(nk *Nick, cp *ChanPrivs) {
// Disassociates a Nick from a Channel.
func (ch *Channel) delNick(nk *Nick) {
if _, ok := ch.nicks[nk]; ok {
ch.nicks[nk] = nil, false
ch.lookup[nk.Nick] = nil, false
delete(ch.nicks, nk)
delete(ch.lookup, nk.Nick)
} else {
ch.l.Warn("Channel.delNick(): %s not on %s.", nk.Nick, ch.Name)
}
@ -181,7 +181,7 @@ func (ch *Channel) ParseModes(modes string, modeargs ...string) {
}
case 'q', 'a', 'o', 'h', 'v':
if len(modeargs) != 0 {
if nk, ok := ch.lookup[modeargs[0]]; ok {
if nk, ok := ch.lookup[modeargs[0]]; ok {
cp := ch.nicks[nk]
switch m {
case 'q':