Преглед на файлове

review fixes

1. Use FAIL instead of WARN
2. Use NICKNAME_RESERVED instead of ACCOUNT_REQUIRED
3. Don't send 433 at all for registered clients, just send the FAIL
tags/v2.6.0-rc1
Shivaram Lingamneni преди 3 години
родител
ревизия
46c32094d7
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4
    2
      irc/nickname.go

+ 4
- 2
irc/nickname.go Целия файл

@@ -43,8 +43,10 @@ func performNickChange(server *Server, client *Client, target *Client, session *
43 43
 		}
44 44
 	} else if err == errNicknameReserved {
45 45
 		if !isSanick {
46
-			rb.Add(nil, server.name, ERR_NICKNAMEINUSE, details.nick, utils.SafeErrorParam(nickname), client.t("Nickname is reserved by a different account"))
47
-			rb.Add(nil, server.name, "WARN", "NICK", "ACCOUNT_REQUIRED", utils.SafeErrorParam(nickname), client.t("Nickname is reserved by a different account"))
46
+			if !client.registered {
47
+				rb.Add(nil, server.name, ERR_NICKNAMEINUSE, details.nick, utils.SafeErrorParam(nickname), client.t("Nickname is reserved by a different account"))
48
+			}
49
+			rb.Add(nil, server.name, "FAIL", "NICK", "NICKNAME_RESERVED", utils.SafeErrorParam(nickname), client.t("Nickname is reserved by a different account"))
48 50
 		} else {
49 51
 			rb.Add(nil, server.name, "FAIL", "SANICK", "NICKNAME_RESERVED", utils.SafeErrorParam(nickname), client.t("Nickname is reserved by a different account"))
50 52
 		}

Loading…
Отказ
Запис