Преглед изворни кода

Merge pull request #937 from slingamn/issue936_reggednick

fix #936
tags/v2.1.0-rc1
Shivaram Lingamneni пре 4 година
родитељ
комит
33fd75ae54
No account linked to committer's email address
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1
    1
      irc/channel.go
  2. 1
    1
      irc/numerics.go

+ 1
- 1
irc/channel.go Прегледај датотеку

692
 	}
692
 	}
693
 
693
 
694
 	if !hasPrivs && channel.flags.HasMode(modes.RegisteredOnly) && details.account == "" && !isInvited {
694
 	if !hasPrivs && channel.flags.HasMode(modes.RegisteredOnly) && details.account == "" && !isInvited {
695
-		rb.Add(nil, client.server.name, ERR_BANNEDFROMCHAN, details.nick, chname, client.t("You must be registered to join that channel"))
695
+		rb.Add(nil, client.server.name, ERR_NEEDREGGEDNICK, details.nick, chname, client.t("You must be registered to join that channel"))
696
 		return
696
 		return
697
 	}
697
 	}
698
 
698
 

+ 1
- 1
irc/numerics.go Прегледај датотеку

153
 	ERR_BANNEDFROMCHAN            = "474"
153
 	ERR_BANNEDFROMCHAN            = "474"
154
 	ERR_BADCHANNELKEY             = "475"
154
 	ERR_BADCHANNELKEY             = "475"
155
 	ERR_BADCHANMASK               = "476"
155
 	ERR_BADCHANMASK               = "476"
156
-	ERR_NOCHANMODES               = "477"
156
+	ERR_NEEDREGGEDNICK            = "477" // conflicted with ERR_NOCHANMODES; see #936
157
 	ERR_BANLISTFULL               = "478"
157
 	ERR_BANLISTFULL               = "478"
158
 	ERR_NOPRIVILEGES              = "481"
158
 	ERR_NOPRIVILEGES              = "481"
159
 	ERR_CHANOPRIVSNEEDED          = "482"
159
 	ERR_CHANOPRIVSNEEDED          = "482"

Loading…
Откажи
Сачувај