diff options
| author | louiz’ <louiz@louiz.org> | 2018-04-24 19:19:06 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-04-24 20:25:40 +0200 |
| commit | 61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24 (patch) | |
| tree | f1da873798506627587ef7cdce23062d556b454a /src/xmpp | |
| parent | a90f196a1ce779d502baf0aadff6e6917fec8a02 (diff) | |
| download | biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.gz biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.bz2 biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.tar.xz biboumi-61de6b1dac4ef29627f3bdb9ce11b6c0d06f4a24.zip | |
Revert "Use a different Date data type"
This reverts commit 857c7d3972a03cbeebf730d99b924d3710dee6a0.
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/biboumi_component.cpp | 2 | ||||
| -rw-r--r-- | src/xmpp/xmpp_component.cpp | 4 | ||||
| -rw-r--r-- | src/xmpp/xmpp_component.hpp | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp index 95b38f0..6dc5fc5 100644 --- a/src/xmpp/biboumi_component.cpp +++ b/src/xmpp/biboumi_component.cpp @@ -805,7 +805,7 @@ void BiboumiComponent::send_archived_message(const Database::MucLogLine& log_lin XmlSubNode delay(forwarded, "delay"); delay["xmlns"] = DELAY_NS; - delay["stamp"] = log_line.col<Database::Date>().to_string(); + delay["stamp"] = utils::to_string(log_line.col<Database::Date>()); XmlSubNode submessage(forwarded, "message"); submessage["xmlns"] = CLIENT_NS; diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp index bec88ea..b3d925e 100644 --- a/src/xmpp/xmpp_component.cpp +++ b/src/xmpp/xmpp_component.cpp @@ -399,7 +399,7 @@ void XmppComponent::send_muc_message(const std::string& muc_name, const std::str } #ifdef USE_DATABASE -void XmppComponent::send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body_txt, const std::string& jid_to, const DateTime& timestamp) +void XmppComponent::send_history_message(const std::string& muc_name, const std::string& nick, const std::string& body_txt, const std::string& jid_to, Database::time_point::rep timestamp) { Stanza message("message"); message["to"] = jid_to; @@ -417,7 +417,7 @@ void XmppComponent::send_history_message(const std::string& muc_name, const std: XmlSubNode delay(message, "delay"); delay["xmlns"] = DELAY_NS; delay["from"] = muc_name + "@" + this->served_hostname; - delay["stamp"] = timestamp.to_string(); + delay["stamp"] = utils::to_string(timestamp); } this->send_stanza(message); diff --git a/src/xmpp/xmpp_component.hpp b/src/xmpp/xmpp_component.hpp index 960c801..e18da40 100644 --- a/src/xmpp/xmpp_component.hpp +++ b/src/xmpp/xmpp_component.hpp @@ -6,7 +6,6 @@ #include <network/tcp_client_socket_handler.hpp> #include <database/database.hpp> #include <xmpp/xmpp_parser.hpp> -#include <utils/datetime.hpp> #include <xmpp/body.hpp> #include <unordered_map> @@ -142,7 +141,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 DateTime& timestamp); + const std::string& jid_to, Database::time_point::rep timestamp); #endif /** * Send an unavailable presence for this nick |