~singpolyma/biboumi

b5beb043325ca5625f4eb53cb9451daf499c586b — louiz’ 7 years ago f36bccd
Remove a never reached (and non-sensical) error
M louloulibs/xmpp/xmpp_component.cpp => louloulibs/xmpp/xmpp_component.cpp +0 -25
@@ 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");

M louloulibs/xmpp/xmpp_component.hpp => louloulibs/xmpp/xmpp_component.hpp +0 -6
@@ 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);

M src/xmpp/biboumi_component.cpp => src/xmpp/biboumi_component.cpp +0 -2
@@ 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,