summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-09-29 23:10:41 +0200
committerlouiz’ <louiz@louiz.org>2016-09-29 23:10:41 +0200
commit265b5df61b5f3d4b5f30bbc6518f833f73bda1ff (patch)
treed31bbd3de2b4d2d955d26c026863568d2b21f48f
parentee4cf5dc2d3eaa43794a8ac736a6409e08082882 (diff)
downloadbiboumi-265b5df61b5f3d4b5f30bbc6518f833f73bda1ff.tar.gz
biboumi-265b5df61b5f3d4b5f30bbc6518f833f73bda1ff.tar.bz2
biboumi-265b5df61b5f3d4b5f30bbc6518f833f73bda1ff.tar.xz
biboumi-265b5df61b5f3d4b5f30bbc6518f833f73bda1ff.zip
Re-add the ad-hoc command the was removed by mistake in the previous commit
Thank you, e2e tests
-rw-r--r--louloulibs/xmpp/adhoc_commands_handler.cpp3
-rw-r--r--src/xmpp/biboumi_component.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/louloulibs/xmpp/adhoc_commands_handler.cpp b/louloulibs/xmpp/adhoc_commands_handler.cpp
index 573c9ec..540cac0 100644
--- a/louloulibs/xmpp/adhoc_commands_handler.cpp
+++ b/louloulibs/xmpp/adhoc_commands_handler.cpp
@@ -17,6 +17,9 @@ const std::map<const std::string, const AdhocCommand>& AdhocCommandsHandler::get
void AdhocCommandsHandler::add_command(std::string name, AdhocCommand command)
{
+ const auto found = this->commands.find(name);
+ if (found != this->commands.end())
+ throw std::runtime_error("Trying to add an ad-hoc command that already exist: "s + name);
this->commands.emplace(std::make_pair(std::move(name), std::move(command)));
}
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 2b4ff18..3a016b9 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -59,7 +59,7 @@ BiboumiComponent::BiboumiComponent(std::shared_ptr<Poller> poller, const std::st
this->adhoc_commands_handler.add_command("ping", {{&PingStep1}, "Do a ping", false});
this->adhoc_commands_handler.add_command("hello", {{&HelloStep1, &HelloStep2}, "Receive a custom greeting", false});
this->adhoc_commands_handler.add_command("disconnect-user", {{&DisconnectUserStep1, &DisconnectUserStep2}, "Disconnect selected users from the gateway", true});
- this->adhoc_commands_handler.add_command("hello", {{&HelloStep1, &HelloStep2}, "Receive a custom greeting", false});
+ this->adhoc_commands_handler.add_command("disconnect-from-irc-server", {{&DisconnectUserFromServerStep1, &DisconnectUserFromServerStep2, &DisconnectUserFromServerStep3}, "Disconnect from the selected IRC servers", false});
this->adhoc_commands_handler.add_command("reload", {{&Reload}, "Reload biboumi’s configuration", true});
#ifdef USE_DATABASE