From e3ea0d62c79cf74e154f24d7f5a0fa8c7d26d73b Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Fri, 8 Aug 2014 00:46:27 +0200
Subject: Use generic send_presence_error() instead of almost identical
 specializations

---
 src/xmpp/xmpp_component.cpp | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

(limited to 'src/xmpp/xmpp_component.cpp')

diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp
index bc54bcd..1aa98b0 100644
--- a/src/xmpp/xmpp_component.cpp
+++ b/src/xmpp/xmpp_component.cpp
@@ -911,38 +911,13 @@ void XmppComponent::kick_user(const std::string& muc_name,
   this->send_stanza(presence);
 }
 
-void XmppComponent::send_nickname_conflict_error(const std::string& muc_name,
-                                                 const std::string& nickname,
-                                                 const std::string& jid_to)
-{
-  Stanza presence("presence");
-  presence["from"] = muc_name + "@" + this->served_hostname + "/" + nickname;
-  presence["to"] = jid_to;
-  presence["type"] = "error";
-  XmlNode x("x");
-  x["xmlns"] = MUC_NS;
-  x.close();
-  presence.add_child(std::move(x));
-  XmlNode error("error");
-  error["by"] = muc_name + "@" + this->served_hostname;
-  error["type"] = "cancel";
-  error["code"] = "409";
-  XmlNode conflict("conflict");
-  conflict["xmlns"] = STANZA_NS;
-  conflict.close();
-  error.add_child(std::move(conflict));
-  error.close();
-  presence.add_child(std::move(error));
-  presence.close();
-  this->send_stanza(presence);
-}
-
 void XmppComponent::send_presence_error(const std::string& muc_name,
-                                   const std::string& nickname,
-                                   const std::string& jid_to,
-                                   const std::string& type,
-                                   const std::string& condition,
-                                   const std::string&)
+                                        const std::string& nickname,
+                                        const std::string& jid_to,
+                                        const std::string& type,
+                                        const std::string& condition,
+                                        const std::string& error_code,
+                                        const std::string& /* text */)
 {
   Stanza presence("presence");
   presence["from"] = muc_name + "@" + this->served_hostname + "/" + nickname;
@@ -955,6 +930,8 @@ void XmppComponent::send_presence_error(const std::string& muc_name,
   XmlNode error("error");
   error["by"] = muc_name + "@" + this->served_hostname;
   error["type"] = type;
+  if (!error_code.empty())
+    error["code"] = error_code;
   XmlNode subnode(condition);
   subnode["xmlns"] = STANZA_NS;
   subnode.close();
-- 
cgit v1.2.3