summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-11-07 21:57:39 +0100
committerlouiz’ <louiz@louiz.org>2016-11-07 21:57:39 +0100
commitb5beb043325ca5625f4eb53cb9451daf499c586b (patch)
tree1d9c4dbc43f6eed5b02df52ea502121e31bf01f2
parentf36bccd7bbd685cc34370da4ab4b7d124bcc69a0 (diff)
downloadbiboumi-b5beb043325ca5625f4eb53cb9451daf499c586b.tar.gz
biboumi-b5beb043325ca5625f4eb53cb9451daf499c586b.tar.bz2
biboumi-b5beb043325ca5625f4eb53cb9451daf499c586b.tar.xz
biboumi-b5beb043325ca5625f4eb53cb9451daf499c586b.zip
Remove a never reached (and non-sensical) error
-rw-r--r--louloulibs/xmpp/xmpp_component.cpp25
-rw-r--r--louloulibs/xmpp/xmpp_component.hpp6
-rw-r--r--src/xmpp/biboumi_component.cpp2
3 files changed, 0 insertions, 33 deletions
diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index 3ac617c..fa8b0a5 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -367,31 +367,6 @@ void XmppComponent::send_invalid_room_error(const std::string& muc_name,
this->send_stanza(presence);
}
-void XmppComponent::send_invalid_user_error(const std::string& user_name, const std::string& to)
-{
- Stanza message("message");
- message["from"] = user_name + "@" + this->served_hostname;
- message["to"] = to;
- message["type"] = "error";
- XmlNode x("x");
- x["xmlns"] = MUC_NS;
- message.add_child(std::move(x));
- XmlNode error("error");
- error["type"] = "cancel";
- XmlNode item_not_found("item-not-found");
- item_not_found["xmlns"] = STANZA_NS;
- error.add_child(std::move(item_not_found));
- XmlNode text("text");
- text["xmlns"] = STANZA_NS;
- text["xml:lang"] = "en";
- text.set_inner(user_name +
- " is not a valid IRC user name. A correct user jid is of the form: <nick>!<server>@" +
- this->served_hostname);
- error.add_child(std::move(text));
- message.add_child(std::move(error));
- this->send_stanza(message);
-}
-
void XmppComponent::send_topic(const std::string& from, Xmpp::body&& topic, const std::string& to, const std::string& who)
{
XmlNode message("message");
diff --git a/louloulibs/xmpp/xmpp_component.hpp b/louloulibs/xmpp/xmpp_component.hpp
index 45a4038..5f5f937 100644
--- a/louloulibs/xmpp/xmpp_component.hpp
+++ b/louloulibs/xmpp/xmpp_component.hpp
@@ -128,12 +128,6 @@ public:
const std::string& nick,
const std::string& to);
/**
- * Send an error to indicate that the user tried to send a message to an
- * invalid user.
- */
- void send_invalid_user_error(const std::string& user_name,
- const std::string& to);
- /**
* Send the MUC topic to the user
*/
void send_topic(const std::string& from, Xmpp::body&& xmpp_topic, const std::string& to, const std::string& who);
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 010b415..d6782e2 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -269,8 +269,6 @@ void BiboumiComponent::handle_message(const Stanza& stanza)
}
}
- else if (iid.type == Iid::Type::User)
- this->send_invalid_user_error(to.local, from_str);
} catch (const IRCNotConnected& ex)
{
this->send_stanza_error("message", from_str, to_str, id,