From 39a32d55248808637cee78b9218053306964f7aa Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 31 Mar 2018 16:36:57 +0200 Subject: Use jid.bare() instead of manual concatenation --- src/bridge/bridge.cpp | 2 +- src/xmpp/adhoc_commands_handler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp index afc8ad3..7f21254 100644 --- a/src/bridge/bridge.cpp +++ b/src/bridge/bridge.cpp @@ -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) diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp index bb48781..60c85ae 100644 --- a/src/xmpp/adhoc_commands_handler.cpp +++ b/src/xmpp/adhoc_commands_handler.cpp @@ -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"; -- cgit v1.2.3