1 files changed, 36 insertions, 4 deletions

diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp
index 1df1e5d..0e2531d 100644
--- a/src/xmpp/xmpp_component.cpp
+++ b/src/xmpp/xmpp_component.cpp
@@ -4,6 +4,7 @@
 #include <logger/logger.hpp>
 
 #include <xmpp/xmpp_component.hpp>
+#include <bridge/list_element.hpp>
 #include <config/config.hpp>
 #include <xmpp/jid.hpp>
 #include <utils/sha1.hpp>
@@ -17,7 +18,7 @@
 
 #include <uuid.h>
 
-#ifdef SYSTEMDDAEMON_FOUND
+#ifdef SYSTEMD_FOUND
 # include <systemd/sd-daemon.h>
 #endif
 
@@ -89,7 +90,7 @@ void XmppComponent::on_connection_failed(const std::string& reason)
 {
   this->first_connection_try = false;
   log_error("Failed to connect to the XMPP server: " << reason);
-#ifdef SYSTEMDDAEMON_FOUND
+#ifdef SYSTEMD_FOUND
   sd_notifyf(0, "STATUS=Failed to connect to the XMPP server: %s", reason.data());
 #endif
 }
@@ -279,7 +280,7 @@ void XmppComponent::handle_handshake(const Stanza& stanza)
   this->authenticated = true;
   this->ever_auth = true;
   log_info("Authenticated with the XMPP server");
-#ifdef SYSTEMDDAEMON_FOUND
+#ifdef SYSTEMD_FOUND
   sd_notify(0, "READY=1");
   // Install an event that sends a keepalive to systemd.  If biboumi crashes
   // or hangs for too long, systemd will restart it.
@@ -556,12 +557,18 @@ void XmppComponent::handle_iq(const Stanza& stanza)
         }
       else if ((query = stanza.get_child("query", DISCO_ITEMS_NS)))
         {
+          Iid iid(to.local);
           const std::string node = query->get_tag("node");
           if (node == ADHOC_NS)
             {
               this->send_adhoc_commands_list(id, from);
               stanza_error.disable();
             }
+          else if (node.empty() && !iid.is_user && !iid.is_channel)
+            { // Disco on an IRC server: get the list of channels
+              bridge->send_irc_channel_list_request(iid, id, from);
+              stanza_error.disable();
+            }
         }
       else if ((query = stanza.get_child("ping", PING_NS)))
         {
@@ -626,7 +633,7 @@ void XmppComponent::handle_error(const Stanza& stanza)
   if (text)
     error_message = text->get_inner();
   log_error("Stream error received from the XMPP server: " << error_message);
-#ifdef SYSTEMDDAEMON_FOUND
+#ifdef SYSTEMD_FOUND
   if (!this->ever_auth)
     sd_notifyf(0, "STATUS=Failed to authenticate to the XMPP server: %s", error_message.data());
 #endif
@@ -1152,6 +1159,31 @@ void XmppComponent::send_iq_result(const std::string& id, const std::string& to_
   this->send_stanza(iq);
 }
 
+void XmppComponent::send_iq_room_list_result(const std::string& id,
+                                             const std::string to_jid,
+                                             const std::string& from,
+                                             const std::vector<ListElement>& rooms_list)
+{
+  Stanza iq("iq");
+  iq["from"] = from + "@" + this->served_hostname;
+  iq["to"] = to_jid;
+  iq["id"] = id;
+  iq["type"] = "result";
+  XmlNode query("query");
+  query["xmlns"] = DISCO_ITEMS_NS;
+  for (const auto& room: rooms_list)
+    {
+      XmlNode item("item");
+      item["jid"] = room.channel + "%" + from + "@" + this->served_hostname;
+      item.close();
+      query.add_child(std::move(item));
+    }
+  query.close();
+  iq.add_child(std::move(query));
+  iq.close();
+  this->send_stanza(iq);
+}
+
 std::string XmppComponent::next_id()
 {
   char uuid_str[37];