CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix ban regexp not being recompiled on removal

Browse source
This commit is contained in:
Shivaram Lingamneni 2017-11-13 03:12:17 -05:00
parent b1e12ca1eb
commit b83d454554
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
irc/client_lookup_set.go
View file

@ -240,7 +240,7 @@ func NewUserMaskSet() *UserMaskSet {
} }
// Add adds the given mask to this set. // Add adds the given mask to this set.
func (set *UserMaskSet) Add(mask string) bool { func (set *UserMaskSet) Add(mask string) (added bool) {
casefoldedMask, err := Casefold(mask) casefoldedMask, err := Casefold(mask)
if err != nil { if err != nil {
log.Println(fmt.Sprintf("ERROR: Could not add mask to usermaskset: [%s]", mask)) log.Println(fmt.Sprintf("ERROR: Could not add mask to usermaskset: [%s]", mask))
@ -248,16 +248,16 @@ func (set *UserMaskSet) Add(mask string) bool {
} }
set.Lock() set.Lock()
already := set.masks[casefoldedMask] added = !set.masks[casefoldedMask]
if added {
set.masks[casefoldedMask] = true set.masks[casefoldedMask] = true
}
set.Unlock() set.Unlock()
if already { if added {
return false
} else {
set.setRegexp() set.setRegexp()
return true
} }
return
} }
// AddAll adds the given masks to this set. // AddAll adds the given masks to this set.
@ -271,23 +271,25 @@ func (set *UserMaskSet) AddAll(masks []string) (added bool) {
} }
set.masks[mask] = true set.masks[mask] = true
} }
if added {
set.setRegexp() set.setRegexp()
}
return return
} }
// Remove removes the given mask from this set. // Remove removes the given mask from this set.
func (set *UserMaskSet) Remove(mask string) bool { func (set *UserMaskSet) Remove(mask string) (removed bool) {
set.Lock() set.Lock()
already := !set.masks[mask] removed = set.masks[mask]
if removed {
delete(set.masks, mask) delete(set.masks, mask)
}
set.Unlock() set.Unlock()
if !already { if removed {
return false
} else {
set.setRegexp() set.setRegexp()
return true
} }
return
} }
// Match matches the given n!u@h. // Match matches the given n!u@h.