diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-03-31 16:36:57 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-04-16 00:53:25 +0200 |
| commit | 39a32d55248808637cee78b9218053306964f7aa (patch) | |
| tree | c86950675a59c725b2ce04f0d22bd1ddccfa23aa | |
| parent | 5ef7ba08028065b03d51d1dc70bb35aeb41ae19d (diff) | |
| download | biboumi-39a32d55248808637cee78b9218053306964f7aa.tar.gz biboumi-39a32d55248808637cee78b9218053306964f7aa.tar.bz2 biboumi-39a32d55248808637cee78b9218053306964f7aa.tar.xz biboumi-39a32d55248808637cee78b9218053306964f7aa.zip | |
Use jid.bare() instead of manual concatenation
| -rw-r--r-- | src/bridge/bridge.cpp | 2 | ||||
| -rw-r--r-- | src/xmpp/adhoc_commands_handler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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"; |