From 37340e593ffb61eaccc444a1efdb3aa6f784a14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 26 Dec 2017 19:52:41 +0100
Subject: Add a <x muc#user> node on outgoing private MUC messages

See https://xmpp.org/extensions/xep-0045.html#privatemessage

fix #3321
---
 src/xmpp/xmpp_component.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/xmpp/xmpp_component.hpp')

diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp
index 22d5c48..2bbbe3b 100644
--- a/src/xmpp/xmpp_component.hpp
+++ b/src/xmpp/xmpp_component.hpp
@@ -112,7 +112,8 @@ public:
    * server-part of the JID and must be added.
    */
   void send_message(const std::string& from, Xmpp::body&& body, const std::string& to,
-                    const std::string& type, const bool fulljid, const bool nocopy=false);
+                    const std::string& type, const bool fulljid, const bool nocopy=false,
+                    const bool muc_private=false);
   /**
    * Send a join from a new participant
    */
-- 
cgit v1.2.3


From 131ef9946fff0f5cfd794203e819df931b72600f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 26 Dec 2017 20:21:18 +0100
Subject: Include the <fin><set><first/><last/></></> nodes in the MAM iq
 result

fix #3322
---
 src/xmpp/xmpp_component.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/xmpp/xmpp_component.hpp')

diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp
index 2bbbe3b..3950863 100644
--- a/src/xmpp/xmpp_component.hpp
+++ b/src/xmpp/xmpp_component.hpp
@@ -203,7 +203,7 @@ public:
    */
   void send_iq_result(const std::string& id, const std::string& to_jid, const std::string& from);
   void send_iq_result_full_jid(const std::string& id, const std::string& to_jid,
-                               const std::string& from_full_jid);
+                               const std::string& from_full_jid, std::unique_ptr<XmlNode> inner=nullptr);
 
   void handle_handshake(const Stanza& stanza);
   void handle_error(const Stanza& stanza);
-- 
cgit v1.2.3


From 58fd68916636df2372f8187b375245ef5922833a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 30 Jan 2018 09:14:26 +0100
Subject: Add a ifndef USE_DATABASE guard around send_history_message

---
 src/xmpp/xmpp_component.hpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/xmpp/xmpp_component.hpp')

diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp
index 3950863..cef26c1 100644
--- a/src/xmpp/xmpp_component.hpp
+++ b/src/xmpp/xmpp_component.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
+#include "biboumi.h"
 
 #include <xmpp/adhoc_commands_handler.hpp>
 #include <network/tcp_client_socket_handler.hpp>
+#include <database/database.hpp>
 #include <xmpp/xmpp_parser.hpp>
 #include <xmpp/body.hpp>
 
@@ -133,11 +135,13 @@ public:
    */
   void send_muc_message(const std::string& muc_name, const std::string& nick, Xmpp::body&& body, const std::string& jid_to,
                         std::string uuid);
+#ifdef USE_DATABASE
   /**
    * Send a message, with a <delay/> element, part of a MUC history
    */
   void send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body,
                             const std::string& jid_to, const std::time_t timestamp);
+#endif
   /**
    * Send an unavailable presence for this nick
    */
-- 
cgit v1.2.3


From d7cf736adb4837c55d8112160cd4718e549ebaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Sun, 4 Feb 2018 11:02:56 +0100
Subject: Fix argument types in declaration of send_history_message

---
 src/xmpp/xmpp_component.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/xmpp/xmpp_component.hpp')

diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp
index cef26c1..1daa6fb 100644
--- a/src/xmpp/xmpp_component.hpp
+++ b/src/xmpp/xmpp_component.hpp
@@ -140,7 +140,7 @@ public:
    * Send a message, with a <delay/> element, part of a MUC history
    */
   void send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body,
-                            const std::string& jid_to, const std::time_t timestamp);
+                            const std::string& jid_to, Database::time_point::rep timestamp);
 #endif
   /**
    * Send an unavailable presence for this nick
-- 
cgit v1.2.3