mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return a proper iq when the IRC server responds to our kick

Browse Source 
A result or an error, depending on the type of message
This commit is contained in:
Florent Le Coz
2014-06-19 22:22:29 +02:00
parent 26ffc8fe12
commit 2117838cf9
4 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bridge/bridge.cpp
+40 -2
View File
@@ -216,11 +216,49 @@ void Bridge::send_irc_nick_change(const Iid& iid, const std::string& new_nick)
irc->send_nick_command(new_nick);
}
void Bridge::send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason)
void Bridge::send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason,
const std::string& iq_id, const std::string& to_jid)
{
IrcClient* irc = this->get_irc_client(iid.get_server());
if (irc)
irc->send_kick_command(iid.get_local(), target, reason);
{
irc->send_kick_command(iid.get_local(), target, reason);
this->add_waiting_iq([this, target, iq_id, to_jid, iid](const std::string& irc_hostname, const IrcMessage& message){
if (irc_hostname != iid.get_server())
return false;
if (message.command == "KICK" && message.arguments.size() >= 2)
{
const std::string target_later = message.arguments[1];
const std::string chan_name_later = utils::tolower(message.arguments[0]);
if (target_later != target || chan_name_later != iid.get_local())
return false;
this->xmpp->send_iq_result(iq_id, to_jid, std::to_string(iid));
}
else if (message.command == "401" && message.arguments.size() >= 2)
{
const std::string target_later = message.arguments[1];
if (target_later != target)
return false;
std::string error_message = "No such nick";
if (message.arguments.size() >= 3)
error_message = message.arguments[2];
this->xmpp->send_stanza_error("iq", to_jid, std::to_string(iid), iq_id, "cancel", "item-not-found",
error_message, false);
}
else if (message.command == "482" && message.arguments.size() >= 2)
{
const std::string chan_name_later = utils::tolower(message.arguments[1]);
if (chan_name_later != iid.get_local())
return false;
std::string error_message = "You're not channel operator";
if (message.arguments.size() >= 3)
error_message = message.arguments[2];
this->xmpp->send_stanza_error("iq", to_jid, std::to_string(iid), iq_id, "cancel", "not-allowed",
error_message, false);
}
return true;
});
}
}
void Bridge::set_channel_topic(const Iid& iid, const std::string& subject)