summaryrefslogtreecommitdiff
path: root/src/bridge
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-06-19 22:22:29 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-06-19 22:22:29 +0200
commit2117838cf9fb083f6f74386abbb56e3b28d4db46 (patch)
treea70c1d2a9522b04ff9a66ae2e91441f1372455df /src/bridge
parent26ffc8fe121e03e1b663aa0015a71b0fc914f95e (diff)
downloadbiboumi-2117838cf9fb083f6f74386abbb56e3b28d4db46.tar.gz
biboumi-2117838cf9fb083f6f74386abbb56e3b28d4db46.tar.bz2
biboumi-2117838cf9fb083f6f74386abbb56e3b28d4db46.tar.xz
biboumi-2117838cf9fb083f6f74386abbb56e3b28d4db46.zip
Return a proper iq when the IRC server responds to our kick
A result or an error, depending on the type of message
Diffstat (limited to 'src/bridge')
-rw-r--r--src/bridge/bridge.cpp42
-rw-r--r--src/bridge/bridge.hpp4
2 files changed, 43 insertions, 3 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index c2ac11f..384131f 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -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)
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp
index 0983595..9eb239d 100644
--- a/src/bridge/bridge.hpp
+++ b/src/bridge/bridge.hpp
@@ -1,6 +1,7 @@
#ifndef BRIDGE_INCLUDED
# define BRIDGE_INCLUDED
+#include <irc/irc_message.hpp>
#include <irc/irc_client.hpp>
#include <bridge/colors.hpp>
#include <irc/irc_user.hpp>
@@ -62,7 +63,8 @@ public:
void send_private_message(const Iid& iid, const std::string& body, const std::string& type="PRIVMSG");
void leave_irc_channel(Iid&& iid, std::string&& status_message);
void send_irc_nick_change(const Iid& iid, const std::string& new_nick);
- void send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason);
+ void send_irc_kick(const Iid& iid, const std::string& target, const std::string& reason,
+ const std::string& iq_id, const std::string& to_jid);
void set_channel_topic(const Iid& iid, const std::string& subject);
void send_xmpp_version_to_irc(const Iid& iid, const std::string& name, const std::string& version, const std::string& os);