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

gofix weekly fixes for state.

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
state/channel.go
View File

@ -125,8 +125,8 @@ func (ch *Channel) addNick(nk *Nick, cp *ChanPrivs) {
// Disassociates a Nick from a Channel. // Disassociates a Nick from a Channel.
func (ch *Channel) delNick(nk *Nick) { func (ch *Channel) delNick(nk *Nick) {
if _, ok := ch.nicks[nk]; ok { if _, ok := ch.nicks[nk]; ok {
ch.nicks[nk] = nil, false delete(ch.nicks, nk)
ch.lookup[nk.Nick] = nil, false delete(ch.lookup, nk.Nick)
} else { } else {
ch.l.Warn("Channel.delNick(): %s not on %s.", nk.Nick, ch.Name) ch.l.Warn("Channel.delNick(): %s not on %s.", nk.Nick, ch.Name)
} }

4
state/nick.go
View File

@ -78,8 +78,8 @@ func (nk *Nick) addChannel(ch *Channel, cp *ChanPrivs) {
// Disassociates a Channel from a Nick. // Disassociates a Channel from a Nick.
func (nk *Nick) delChannel(ch *Channel) { func (nk *Nick) delChannel(ch *Channel) {
if _, ok := nk.chans[ch]; ok { if _, ok := nk.chans[ch]; ok {
nk.chans[ch] = nil, false delete(nk.chans, ch)
nk.lookup[ch.Name] = nil, false delete(nk.lookup, ch.Name)
} else { } else {
nk.l.Warn("Nick.delChannel(): %s not on %s.", nk.Nick, ch.Name) nk.l.Warn("Nick.delChannel(): %s not on %s.", nk.Nick, ch.Name)
} }

8
state/tracker.go
View File

@ -88,12 +88,12 @@ func (st *stateTracker) ReNick(old, neu string) {
if nk, ok := st.nicks[old]; ok { if nk, ok := st.nicks[old]; ok {
if _, ok := st.nicks[neu]; !ok { if _, ok := st.nicks[neu]; !ok {
nk.Nick = neu nk.Nick = neu
st.nicks[old] = nil, false delete(st.nicks, old)
st.nicks[neu] = nk st.nicks[neu] = nk
for ch, _ := range nk.chans { for ch, _ := range nk.chans {
// We also need to update the lookup maps of all the channels // We also need to update the lookup maps of all the channels
// the nick is on, to keep things in sync. // the nick is on, to keep things in sync.
ch.lookup[old] = nil, false delete(ch.lookup, old)
ch.lookup[neu] = nk ch.lookup[neu] = nk
} }
} else { } else {
@ -123,7 +123,7 @@ func (st *stateTracker) delNick(nk *Nick) {
st.l.Error("StateTracker.DelNick(): TRYING TO DELETE ME :-(") st.l.Error("StateTracker.DelNick(): TRYING TO DELETE ME :-(")
return return
} }
st.nicks[nk.Nick] = nil, false delete(st.nicks, nk.Nick)
for ch, _ := range nk.chans { for ch, _ := range nk.chans {
nk.delChannel(ch) nk.delChannel(ch)
ch.delNick(nk) ch.delNick(nk)
@ -165,7 +165,7 @@ func (st *stateTracker) DelChannel(c string) {
} }
func (st *stateTracker) delChannel(ch *Channel) { func (st *stateTracker) delChannel(ch *Channel) {
st.chans[ch.Name] = nil, false delete(st.chans, ch.Name)
for nk, _ := range ch.nicks { for nk, _ := range ch.nicks {
ch.delNick(nk) ch.delNick(nk)
nk.delChannel(ch) nk.delChannel(ch)