ソースを参照

rename a variable

tags/v2.1.0-rc1
Shivaram Lingamneni 4年前
コミット
b32dd5ce33
1個のファイルの変更13行の追加13行の削除
  1. 13
    13
      irc/client_lookup_set.go

+ 13
- 13
irc/client_lookup_set.go ファイルの表示

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

読み込み中…
キャンセル
保存