summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2015-12-03 21:09:26 +0100
committerFlorent Le Coz <louiz@louiz.org>2015-12-03 21:15:22 +0100
commit700a6c7bc39aa48af5037ecbb9778b20fb6f87df (patch)
treed5f1b23da3ceadf2f476a4a0bdb83f1e52359318
parent756b297045c5ec3ce051b48379a692d80398ef47 (diff)
downloadbiboumi-700a6c7bc39aa48af5037ecbb9778b20fb6f87df.tar.gz
biboumi-700a6c7bc39aa48af5037ecbb9778b20fb6f87df.tar.bz2
biboumi-700a6c7bc39aa48af5037ecbb9778b20fb6f87df.tar.xz
biboumi-700a6c7bc39aa48af5037ecbb9778b20fb6f87df.zip
JID class provides bare() and full() methods
-rw-r--r--louloulibs/xmpp/jid.hpp9
-rw-r--r--src/xmpp/biboumi_component.cpp4
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();
}