Send a proper error on IRC message 438 (nickname change too fast)
fix #2576
This commit is contained in:
@@ -478,6 +478,25 @@ void IrcClient::on_nickname_conflict(const IrcMessage& message)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IrcClient::on_nickname_change_too_fast(const IrcMessage& message)
|
||||||
|
{
|
||||||
|
const std::string nickname = message.arguments[1];
|
||||||
|
std::string txt;
|
||||||
|
if (message.arguments.size() >= 3)
|
||||||
|
txt = message.arguments[2];
|
||||||
|
this->on_generic_error(message);
|
||||||
|
for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
|
||||||
|
{
|
||||||
|
Iid iid;
|
||||||
|
iid.set_local(it->first);
|
||||||
|
iid.set_server(this->hostname);
|
||||||
|
iid.is_channel = true;
|
||||||
|
this->bridge->send_presence_error(iid, nickname,
|
||||||
|
"cancel", "not-acceptable",
|
||||||
|
"", txt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void IrcClient::on_generic_error(const IrcMessage& message)
|
void IrcClient::on_generic_error(const IrcMessage& message)
|
||||||
{
|
{
|
||||||
const std::string error_msg = message.arguments.size() >= 3 ?
|
const std::string error_msg = message.arguments.size() >= 3 ?
|
||||||
|
|||||||
@@ -171,6 +171,10 @@ public:
|
|||||||
* presence conflict from all channels, because the name is server-wide.
|
* presence conflict from all channels, because the name is server-wide.
|
||||||
*/
|
*/
|
||||||
void on_nickname_conflict(const IrcMessage& message);
|
void on_nickname_conflict(const IrcMessage& message);
|
||||||
|
/**
|
||||||
|
* Idem, but for when the user changes their nickname too quickly
|
||||||
|
*/
|
||||||
|
void on_nickname_change_too_fast(const IrcMessage& message);
|
||||||
/**
|
/**
|
||||||
* Handles most errors from the server by just forwarding the message to the user.
|
* Handles most errors from the server by just forwarding the message to the user.
|
||||||
*/
|
*/
|
||||||
@@ -317,6 +321,7 @@ static const std::unordered_map<std::string, irc_callback_t> irc_callbacks = {
|
|||||||
{"366", &IrcClient::on_channel_completely_joined},
|
{"366", &IrcClient::on_channel_completely_joined},
|
||||||
{"432", &IrcClient::on_erroneous_nickname},
|
{"432", &IrcClient::on_erroneous_nickname},
|
||||||
{"433", &IrcClient::on_nickname_conflict},
|
{"433", &IrcClient::on_nickname_conflict},
|
||||||
|
{"438", &IrcClient::on_nickname_change_too_fast},
|
||||||
{"001", &IrcClient::on_welcome_message},
|
{"001", &IrcClient::on_welcome_message},
|
||||||
{"PART", &IrcClient::on_part},
|
{"PART", &IrcClient::on_part},
|
||||||
{"ERROR", &IrcClient::on_error},
|
{"ERROR", &IrcClient::on_error},
|
||||||
|
|||||||
Reference in New Issue
Block a user