|
@@ -117,7 +117,7 @@ func (clients *ClientManager) Resume(oldClient *Client, session *Session) (err e
|
117
|
117
|
func (clients *ClientManager) SetNick(client *Client, session *Session, newNick string) (setNick string, err error) {
|
118
|
118
|
config := client.server.Config()
|
119
|
119
|
|
120
|
|
- var newcfnick, newSkeleton string
|
|
120
|
+ var newCfNick, newSkeleton string
|
121
|
121
|
|
122
|
122
|
client.stateMutex.RLock()
|
123
|
123
|
account := client.account
|
|
@@ -139,7 +139,7 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
139
|
139
|
return "", errNickAccountMismatch
|
140
|
140
|
}
|
141
|
141
|
newNick = accountName
|
142
|
|
- newcfnick = account
|
|
142
|
+ newCfNick = account
|
143
|
143
|
newSkeleton, err = Skeleton(newNick)
|
144
|
144
|
if err != nil {
|
145
|
145
|
return "", errNicknameInvalid
|
|
@@ -151,23 +151,23 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
151
|
151
|
}
|
152
|
152
|
|
153
|
153
|
if account == "" && config.Accounts.NickReservation.ForceGuestFormat {
|
154
|
|
- newcfnick, err = CasefoldName(newNick)
|
|
154
|
+ newCfNick, err = CasefoldName(newNick)
|
155
|
155
|
if err != nil {
|
156
|
156
|
return "", errNicknameInvalid
|
157
|
157
|
}
|
158
|
|
- if !config.Accounts.NickReservation.guestRegexpFolded.MatchString(newcfnick) {
|
|
158
|
+ if !config.Accounts.NickReservation.guestRegexpFolded.MatchString(newCfNick) {
|
159
|
159
|
newNick = strings.Replace(config.Accounts.NickReservation.GuestFormat, "*", newNick, 1)
|
160
|
|
- newcfnick = "" // re-fold it below
|
|
160
|
+ newCfNick = "" // re-fold it below
|
161
|
161
|
}
|
162
|
162
|
}
|
163
|
163
|
|
164
|
|
- if newcfnick == "" {
|
165
|
|
- newcfnick, err = CasefoldName(newNick)
|
|
164
|
+ if newCfNick == "" {
|
|
165
|
+ newCfNick, err = CasefoldName(newNick)
|
166
|
166
|
}
|
167
|
167
|
if err != nil {
|
168
|
168
|
return "", errNicknameInvalid
|
169
|
169
|
}
|
170
|
|
- if len(newNick) > config.Limits.NickLen || len(newcfnick) > config.Limits.NickLen {
|
|
170
|
+ if len(newNick) > config.Limits.NickLen || len(newCfNick) > config.Limits.NickLen {
|
171
|
171
|
return "", errNicknameInvalid
|
172
|
172
|
}
|
173
|
173
|
newSkeleton, err = Skeleton(newNick)
|
|
@@ -175,11 +175,11 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
175
|
175
|
return "", errNicknameInvalid
|
176
|
176
|
}
|
177
|
177
|
|
178
|
|
- if restrictedCasefoldedNicks[newcfnick] || restrictedSkeletons[newSkeleton] {
|
|
178
|
+ if restrictedCasefoldedNicks[newCfNick] || restrictedSkeletons[newSkeleton] {
|
179
|
179
|
return "", errNicknameInvalid
|
180
|
180
|
}
|
181
|
181
|
|
182
|
|
- reservedAccount, method := client.server.accounts.EnforcementStatus(newcfnick, newSkeleton)
|
|
182
|
+ reservedAccount, method := client.server.accounts.EnforcementStatus(newCfNick, newSkeleton)
|
183
|
183
|
if method == NickEnforcementStrict && reservedAccount != "" && reservedAccount != account {
|
184
|
184
|
return "", errNicknameReserved
|
185
|
185
|
}
|
|
@@ -201,7 +201,7 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
201
|
201
|
clients.Lock()
|
202
|
202
|
defer clients.Unlock()
|
203
|
203
|
|
204
|
|
- currentClient := clients.byNick[newcfnick]
|
|
204
|
+ currentClient := clients.byNick[newCfNick]
|
205
|
205
|
// the client may just be changing case
|
206
|
206
|
if currentClient != nil && currentClient != client && session != nil {
|
207
|
207
|
// these conditions forbid reattaching to an existing session:
|
|
@@ -234,9 +234,9 @@ func (clients *ClientManager) SetNick(client *Client, session *Session, newNick
|
234
|
234
|
}
|
235
|
235
|
|
236
|
236
|
clients.removeInternal(client)
|
237
|
|
- clients.byNick[newcfnick] = client
|
|
237
|
+ clients.byNick[newCfNick] = client
|
238
|
238
|
clients.bySkeleton[newSkeleton] = client
|
239
|
|
- client.updateNick(newNick, newcfnick, newSkeleton)
|
|
239
|
+ client.updateNick(newNick, newCfNick, newSkeleton)
|
240
|
240
|
return newNick, nil
|
241
|
241
|
}
|
242
|
242
|
|