From 700a6c7bc39aa48af5037ecbb9778b20fb6f87df Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Thu, 3 Dec 2015 21:09:26 +0100 Subject: JID class provides bare() and full() methods --- louloulibs/xmpp/jid.hpp | 9 +++++++++ src/xmpp/biboumi_component.cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/louloulibs/xmpp/jid.hpp b/louloulibs/xmpp/jid.hpp index b6975a2..e2ee586 100644 --- a/louloulibs/xmpp/jid.hpp +++ b/louloulibs/xmpp/jid.hpp @@ -15,6 +15,15 @@ public: std::string local; std::string resource; + std::string bare() const + { + return this->local + "@" + this->domain; + } + std::string full() const + { + return this->local + "@" + this->domain + "/" + this->resource; + } + private: Jid(const Jid&) = delete; Jid(Jid&&) = delete; diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp index f4de302..6f1e585 100644 --- a/src/xmpp/biboumi_component.cpp +++ b/src/xmpp/biboumi_component.cpp @@ -394,7 +394,7 @@ void BiboumiComponent::handle_iq(const Stanza& stanza) { // Get biboumi's adhoc commands this->send_adhoc_commands_list(id, from, this->served_hostname, (Config::get("admin", "") == - from_jid.local + "@" + from_jid.domain), + from_jid.bare()), this->adhoc_commands_handler); stanza_error.disable(); } @@ -402,7 +402,7 @@ void BiboumiComponent::handle_iq(const Stanza& stanza) { // Get the server's adhoc commands this->send_adhoc_commands_list(id, from, to_str, (Config::get("admin", "") == - from_jid.local + "@" + from_jid.domain), + from_jid.bare()), this->irc_server_adhoc_commands_handler); stanza_error.disable(); } -- cgit v1.2.3