GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-02-16 21:50:39 +01:00
Code Issues Projects Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Shivaram Lingamneni 2017-11-22 16:35:38 -05:00
parent 52b0fb71e7
commit d5a5f939dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
irc/client_lookup_set.go
View File

@ -39,7 +39,7 @@ func ExpandUserHost(userhost string) (expanded string) {
// ClientManager keeps track of clients by nick, enforcing uniqueness of casefolded nicks // ClientManager keeps track of clients by nick, enforcing uniqueness of casefolded nicks
type ClientManager struct { type ClientManager struct {
sync.RWMutex // tier 2 sync.RWMutex // tier 2
byNick map[string]*Client byNick map[string]*Client
} }
// NewClientManager returns a new ClientManager. // NewClientManager returns a new ClientManager.
@ -70,7 +70,7 @@ func (clients *ClientManager) Get(nick string) *Client {
} }
func (clients *ClientManager) removeInternal(client *Client) (removed bool) { func (clients *ClientManager) removeInternal(client *Client) (removed bool) {
// requires holding ByNickMutex // requires holding the writable Lock()
oldcfnick := client.NickCasefolded() oldcfnick := client.NickCasefolded()
currentEntry, present := clients.byNick[oldcfnick] currentEntry, present := clients.byNick[oldcfnick]
if present { if present {
@ -123,7 +123,7 @@ func (clients *ClientManager) AllClients() (result []*Client) {
defer clients.RUnlock() defer clients.RUnlock()
result = make([]*Client, len(clients.byNick)) result = make([]*Client, len(clients.byNick))
i := 0 i := 0
for _, client := range(clients.byNick) { for _, client := range clients.byNick {
result[i] = client result[i] = client
i++ i++
} }

2
irc/nickname.go
View File

@ -61,7 +61,7 @@ func performNickChange(server *Server, client *Client, target *Client, newnick s
return false return false
} }
client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s", origNickMask, nickname)) client.server.logger.Debug("nick", fmt.Sprintf("%s changed nickname to %s [%s]", origNickMask, nicknameRaw, nickname))
if hadNick { if hadNick {
target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), origNick, nicknameRaw)) target.server.snomasks.Send(sno.LocalNicks, fmt.Sprintf(ircfmt.Unescape("$%s$r changed nickname to %s"), origNick, nicknameRaw))
target.server.whoWas.Append(client) target.server.whoWas.Append(client)