summaryrefslogtreecommitdiff
path: root/louloulibs
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-04-25 11:29:52 +0200
committerlouiz’ <louiz@louiz.org>2016-04-27 11:03:52 +0200
commit1e56c59e8241dbfc6a2526c371cc2e894f9d0f18 (patch)
tree5f4e2de755e26e751f03e09c8ad02ebb17a31b09 /louloulibs
parent82e0cf99b0dd0ba48f31060656d03a9586b939c6 (diff)
downloadbiboumi-1e56c59e8241dbfc6a2526c371cc2e894f9d0f18.tar.gz
biboumi-1e56c59e8241dbfc6a2526c371cc2e894f9d0f18.tar.bz2
biboumi-1e56c59e8241dbfc6a2526c371cc2e894f9d0f18.tar.xz
biboumi-1e56c59e8241dbfc6a2526c371cc2e894f9d0f18.zip
Include the Configure ad-hoc command on biboumi's JID for fixed_irc_server
Because a jid like “freenode.example.org” is both the JID for the configured IRC server, and biboumi’s JID. fix #3175
Diffstat (limited to 'louloulibs')
-rw-r--r--louloulibs/xmpp/adhoc_command.cpp4
-rw-r--r--louloulibs/xmpp/adhoc_command.hpp6
-rw-r--r--louloulibs/xmpp/xmpp_component.cpp4
3 files changed, 8 insertions, 6 deletions
diff --git a/louloulibs/xmpp/adhoc_command.cpp b/louloulibs/xmpp/adhoc_command.cpp
index 8a8bcff..99701d7 100644
--- a/louloulibs/xmpp/adhoc_command.cpp
+++ b/louloulibs/xmpp/adhoc_command.cpp
@@ -11,10 +11,6 @@ AdhocCommand::AdhocCommand(std::vector<AdhocStep>&& callbacks, const std::string
{
}
-AdhocCommand::~AdhocCommand()
-{
-}
-
bool AdhocCommand::is_admin_only() const
{
return this->admin_only;
diff --git a/louloulibs/xmpp/adhoc_command.hpp b/louloulibs/xmpp/adhoc_command.hpp
index a2e033a..1c4e4de 100644
--- a/louloulibs/xmpp/adhoc_command.hpp
+++ b/louloulibs/xmpp/adhoc_command.hpp
@@ -19,7 +19,11 @@ class AdhocCommand
friend class AdhocSession;
public:
AdhocCommand(std::vector<AdhocStep>&& callback, const std::string& name, const bool admin_only);
- ~AdhocCommand();
+ ~AdhocCommand() = default;
+ AdhocCommand(const AdhocCommand&) = default;
+ AdhocCommand(AdhocCommand&&) = default;
+ AdhocCommand& operator=(AdhocCommand&&) = delete;
+ AdhocCommand& operator=(const AdhocCommand&) = delete;
const std::string name;
diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index 8a0ca52..b92d9a3 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -591,7 +591,9 @@ void XmppComponent::send_version(const std::string& id, const std::string& jid_t
this->send_stanza(iq);
}
-void XmppComponent::send_adhoc_commands_list(const std::string& id, const std::string& requester_jid, const std::string& from_jid, const bool with_admin_only, const AdhocCommandsHandler& adhoc_handler)
+void XmppComponent::send_adhoc_commands_list(const std::string& id, const std::string& requester_jid,
+ const std::string& from_jid,
+ const bool with_admin_only, const AdhocCommandsHandler& adhoc_handler)
{
Stanza iq("iq");
iq["type"] = "result";