Handle nickname conflicts by sending the correct XMPP error presence

2 files changed, 19 insertions, 0 deletions

diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index afdc629..10a5b12 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -303,6 +303,19 @@ void IrcClient::on_erroneous_nickname(const IrcMessage& message)
   this->send_gateway_message(error_msg + ": " + message.arguments[1], message.prefix);
 }
 
+void IrcClient::on_nickname_conflict(const IrcMessage& message)
+{
+  const std::string nickname = message.arguments[1];
+  this->on_generic_error(message);
+  for (auto it = this->channels.begin(); it != this->channels.end(); ++it)
+  {
+    Iid iid;
+    iid.chan = it->first;
+    iid.server = this->hostname;
+    this->bridge->send_nickname_conflict_error(iid, nickname);
+  }
+}
+
 void IrcClient::on_generic_error(const IrcMessage& message)
 {
   const std::string error_msg = message.arguments.size() >= 3 ?
diff --git a/src/irc/irc_client.hpp b/src/irc/irc_client.hpp
index e695e53..eced4b6 100644
--- a/src/irc/irc_client.hpp
+++ b/src/irc/irc_client.hpp
@@ -149,6 +149,11 @@ public:
    */
   void on_erroneous_nickname(const IrcMessage& message);
   /**
+   * When the IRC servers denies our nickname because of a conflict.  Send a
+   * presence conflict from all channels, because the name is server-wide.
+   */
+  void on_nickname_conflict(const IrcMessage& message);
+  /**
    * Handles most errors from the server by just forwarding the message to the user.
    */
   void on_generic_error(const IrcMessage& message);
@@ -237,6 +242,7 @@ static const std::unordered_map<std::string, irc_callback_t> irc_callbacks = {
   {"TOPIC", &IrcClient::on_topic_received},
   {"366", &IrcClient::on_channel_completely_joined},
   {"432", &IrcClient::on_erroneous_nickname},
+  {"433", &IrcClient::on_nickname_conflict},
   {"461", &IrcClient::on_generic_error},
   {"001", &IrcClient::on_welcome_message},
   {"PART", &IrcClient::on_part},