Browse Source

use utils.StringSet in more places

tags/v2.4.0-rc1
Shivaram Lingamneni 3 years ago
parent
commit
1dd0c432fd
4 changed files with 6 additions and 6 deletions
  1. 1
    1
      irc/accounts.go
  2. 1
    1
      irc/client_lookup_set.go
  3. 2
    2
      irc/nickname.go
  4. 2
    2
      irc/services.go

+ 1
- 1
irc/accounts.go View File

381
 		return errAccountCreation
381
 		return errAccountCreation
382
 	}
382
 	}
383
 
383
 
384
-	if restrictedCasefoldedNicks[casefoldedAccount] || restrictedSkeletons[skeleton] {
384
+	if restrictedCasefoldedNicks.Has(casefoldedAccount) || restrictedSkeletons.Has(skeleton) {
385
 		return errAccountAlreadyRegistered
385
 		return errAccountAlreadyRegistered
386
 	}
386
 	}
387
 
387
 

+ 1
- 1
irc/client_lookup_set.go View File

173
 			return "", errNicknameInvalid, false
173
 			return "", errNicknameInvalid, false
174
 		}
174
 		}
175
 
175
 
176
-		if restrictedCasefoldedNicks[newCfNick] || restrictedSkeletons[newSkeleton] {
176
+		if restrictedCasefoldedNicks.Has(newCfNick) || restrictedSkeletons.Has(newSkeleton) {
177
 			return "", errNicknameInvalid, false
177
 			return "", errNicknameInvalid, false
178
 		}
178
 		}
179
 
179
 

+ 2
- 2
irc/nickname.go View File

23
 		"MemoServ", "BotServ", "OperServ",
23
 		"MemoServ", "BotServ", "OperServ",
24
 	}
24
 	}
25
 
25
 
26
-	restrictedCasefoldedNicks = make(map[string]bool)
27
-	restrictedSkeletons       = make(map[string]bool)
26
+	restrictedCasefoldedNicks = make(utils.StringSet)
27
+	restrictedSkeletons       = make(utils.StringSet)
28
 )
28
 )
29
 
29
 
30
 func performNickChange(server *Server, client *Client, target *Client, session *Session, nickname string, rb *ResponseBuffer) error {
30
 func performNickChange(server *Server, client *Client, target *Client, session *Session, nickname string, rb *ResponseBuffer) error {

+ 2
- 2
irc/services.go View File

350
 		if err != nil {
350
 		if err != nil {
351
 			panic(err)
351
 			panic(err)
352
 		}
352
 		}
353
-		restrictedCasefoldedNicks[cfName] = true
353
+		restrictedCasefoldedNicks.Add(cfName)
354
 		skeleton, err := Skeleton(restrictedNickname)
354
 		skeleton, err := Skeleton(restrictedNickname)
355
 		if err != nil {
355
 		if err != nil {
356
 			panic(err)
356
 			panic(err)
357
 		}
357
 		}
358
-		restrictedSkeletons[skeleton] = true
358
+		restrictedSkeletons.Add(skeleton)
359
 	}
359
 	}
360
 }
360
 }

Loading…
Cancel
Save