~singpolyma/biboumi

39a32d55248808637cee78b9218053306964f7aa — Emmanuel Gil Peyrot 4 years ago 5ef7ba0
Use jid.bare() instead of manual concatenation
2 files changed, 2 insertions(+), 2 deletions(-)

M src/bridge/bridge.cpp
M src/xmpp/adhoc_commands_handler.cpp
M src/bridge/bridge.cpp => src/bridge/bridge.cpp +1 -1
@@ 103,7 103,7 @@ const std::string& Bridge::get_jid() const
std::string Bridge::get_bare_jid() const
{
  Jid jid(this->user_jid);
  return jid.local + "@" + jid.domain;
  return jid.bare();
}

Xmpp::body Bridge::make_xmpp_body(const std::string& str, const std::string& encoding)

M src/xmpp/adhoc_commands_handler.cpp => src/xmpp/adhoc_commands_handler.cpp +1 -1
@@ 41,7 41,7 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co
      XmlSubNode condition(error, STANZA_NS":item-not-found");
    }
  else if (command_it->second.is_admin_only() &&
           Config::get("admin", "") != jid.local + "@" + jid.domain)
           Config::get("admin", "") != jid.bare())
    {
      XmlSubNode error(command_node, ADHOC_NS":error");
      error["type"] = "cancel";