summaryrefslogtreecommitdiff
path: root/src/xmpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-06-01 12:49:33 +0200
committerlouiz’ <louiz@louiz.org>2018-06-01 12:49:33 +0200
commit5ff3696d6f7ffffa339e222b79513c91175acd5c (patch)
tree5645c7a560cdd01379f8474562a214605faec506 /src/xmpp
parent68d86a9daa0a3b407ec1c98715e927e5b7e79eb9 (diff)
parentac8cd7082b070eb74ccd3d5b669c419941fc29ac (diff)
downloadbiboumi-5ff3696d6f7ffffa339e222b79513c91175acd5c.tar.gz
biboumi-5ff3696d6f7ffffa339e222b79513c91175acd5c.tar.bz2
biboumi-5ff3696d6f7ffffa339e222b79513c91175acd5c.tar.xz
biboumi-5ff3696d6f7ffffa339e222b79513c91175acd5c.zip
Merge branch 'v8'
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/biboumi_component.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index dbaf8a4..be34873 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -72,11 +72,16 @@ BiboumiComponent::BiboumiComponent(std::shared_ptr<Poller>& poller, const std::s
AdhocCommand configure_global_command({&ConfigureGlobalStep1, &ConfigureGlobalStep2}, "Configure a few settings", false);
if (!Config::get("fixed_irc_server", "").empty())
- this->adhoc_commands_handler.add_command("configure", configure_server_command);
+ {
+ this->adhoc_commands_handler.add_command("server-configure", configure_server_command);
+ this->adhoc_commands_handler.add_command("global-configure", configure_global_command);
+ }
else
- this->adhoc_commands_handler.add_command("configure", configure_global_command);
+ {
+ this->adhoc_commands_handler.add_command("configure", configure_global_command);
+ this->irc_server_adhoc_commands_handler.add_command("configure", configure_server_command);
+ }
- this->irc_server_adhoc_commands_handler.add_command("configure", configure_server_command);
this->irc_channel_adhoc_commands_handler.add_command("configure", {{&ConfigureIrcChannelStep1, &ConfigureIrcChannelStep2}, "Configure a few settings for that IRC channel", false});
#endif
}