Add an AdhocCommandsHandler to store commands specific to IRC servers

2 files changed, 6 insertions, 6 deletions

diff --git a/louloulibs/xmpp/xmpp_component.cpp b/louloulibs/xmpp/xmpp_component.cpp
index 2214ecf..3017c0b 100644
--- a/louloulibs/xmpp/xmpp_component.cpp
+++ b/louloulibs/xmpp/xmpp_component.cpp
@@ -587,22 +587,22 @@ 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 bool with_admin_only)
+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";
   iq["id"] = id;
   iq["to"] = requester_jid;
-  iq["from"] = this->served_hostname;
+  iq["from"] = from_jid;
   XmlNode query("query");
   query["xmlns"] = DISCO_ITEMS_NS;
   query["node"] = ADHOC_NS;
-  for (const auto& kv: this->adhoc_commands_handler.get_commands())
+  for (const auto& kv: adhoc_handler.get_commands())
     {
       if (kv.second.is_admin_only() && !with_admin_only)
         continue;
       XmlNode item("item");
-      item["jid"] = this->served_hostname;
+      item["jid"] = from_jid;
       item["node"] = kv.first;
       item["name"] = kv.second.name;
       query.add_child(std::move(item));
diff --git a/louloulibs/xmpp/xmpp_component.hpp b/louloulibs/xmpp/xmpp_component.hpp
index e45bb36..06236fe 100644
--- a/louloulibs/xmpp/xmpp_component.hpp
+++ b/louloulibs/xmpp/xmpp_component.hpp
@@ -184,8 +184,8 @@ public:
    * Send the list of all available ad-hoc commands to that JID. The list is
    * different depending on what JID made the request.
    */
-  void send_adhoc_commands_list(const std::string& id, const std::string& requester_jid,
-                                const bool with_admin_only);
+  void 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);
   /**
    * Send an iq version request
    */