mirror of
https://github.com/fluffle/goirc
synced 2025-09-06 00:43:20 +00:00
gofix weekly fixes for state.
This commit is contained in:
parent
0dc19703ab
commit
81eb9ee3df
3 changed files with 22 additions and 22 deletions
|
@ -45,7 +45,7 @@ func NewTracker(mynick string, l logging.Logger) *stateTracker {
|
|||
st := &stateTracker{
|
||||
chans: make(map[string]*Channel),
|
||||
nicks: make(map[string]*Nick),
|
||||
l: l,
|
||||
l: l,
|
||||
}
|
||||
st.me = st.NewNick(mynick)
|
||||
return st
|
||||
|
@ -88,12 +88,12 @@ func (st *stateTracker) ReNick(old, neu string) {
|
|||
if nk, ok := st.nicks[old]; ok {
|
||||
if _, ok := st.nicks[neu]; !ok {
|
||||
nk.Nick = neu
|
||||
st.nicks[old] = nil, false
|
||||
delete(st.nicks, old)
|
||||
st.nicks[neu] = nk
|
||||
for ch, _ := range nk.chans {
|
||||
// We also need to update the lookup maps of all the channels
|
||||
// the nick is on, to keep things in sync.
|
||||
ch.lookup[old] = nil, false
|
||||
delete(ch.lookup, old)
|
||||
ch.lookup[neu] = nk
|
||||
}
|
||||
} else {
|
||||
|
@ -123,7 +123,7 @@ func (st *stateTracker) delNick(nk *Nick) {
|
|||
st.l.Error("StateTracker.DelNick(): TRYING TO DELETE ME :-(")
|
||||
return
|
||||
}
|
||||
st.nicks[nk.Nick] = nil, false
|
||||
delete(st.nicks, nk.Nick)
|
||||
for ch, _ := range nk.chans {
|
||||
nk.delChannel(ch)
|
||||
ch.delNick(nk)
|
||||
|
@ -165,7 +165,7 @@ func (st *stateTracker) DelChannel(c string) {
|
|||
}
|
||||
|
||||
func (st *stateTracker) delChannel(ch *Channel) {
|
||||
st.chans[ch.Name] = nil, false
|
||||
delete(st.chans, ch.Name)
|
||||
for nk, _ := range ch.nicks {
|
||||
ch.delNick(nk)
|
||||
nk.delChannel(ch)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue