summaryrefslogtreecommitdiff
path: root/src/xmpp/biboumi_component.cpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-06-13 10:38:39 +0200
committerlouiz’ <louiz@louiz.org>2017-06-14 00:19:15 +0200
commit50cadf3dac0d56ef8181d1800cc30f8dcb749141 (patch)
tree23e56307a6fba4f926d261f858c8df8b6b8d5ea7 /src/xmpp/biboumi_component.cpp
parent7ca95a09740297ae9c041c5f8ae4caa0a57a149a (diff)
downloadbiboumi-50cadf3dac0d56ef8181d1800cc30f8dcb749141.tar.gz
biboumi-50cadf3dac0d56ef8181d1800cc30f8dcb749141.tar.bz2
biboumi-50cadf3dac0d56ef8181d1800cc30f8dcb749141.tar.xz
biboumi-50cadf3dac0d56ef8181d1800cc30f8dcb749141.zip
Implement our own database ORM, and update the whole code to use it
Entirely replace LiteSQL fix #3271
Diffstat (limited to 'src/xmpp/biboumi_component.cpp')
-rw-r--r--src/xmpp/biboumi_component.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index ca3a887..881e757 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -18,8 +18,6 @@
#include <biboumi.h>
-#include <uuid/uuid.h>
-
#ifdef SYSTEMD_FOUND
# include <systemd/sd-daemon.h>
#endif
@@ -648,9 +646,9 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
limit = 100;
}
const auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), limit, start, end);
- for (const db::MucLogLine& line: lines)
+ for (const Database::MucLogLine& line: lines)
{
- if (!line.nick.value().empty())
+ if (!line.col<Database::Nick>().empty())
this->send_archived_message(line, to.full(), from.full(), query_id);
}
this->send_iq_result_full_jid(id, from.full(), to.full());
@@ -659,7 +657,7 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
return false;
}
-void BiboumiComponent::send_archived_message(const db::MucLogLine& log_line, const std::string& from, const std::string& to,
+void BiboumiComponent::send_archived_message(const Database::MucLogLine& log_line, const std::string& from, const std::string& to,
const std::string& queryid)
{
Stanza message("message");
@@ -671,22 +669,22 @@ void BiboumiComponent::send_archived_message(const db::MucLogLine& log_line, con
result["xmlns"] = MAM_NS;
if (!queryid.empty())
result["queryid"] = queryid;
- result["id"] = log_line.uuid.value();
+ result["id"] = log_line.col<Database::Uuid>();
XmlSubNode forwarded(result, "forwarded");
forwarded["xmlns"] = FORWARD_NS;
XmlSubNode delay(forwarded, "delay");
delay["xmlns"] = DELAY_NS;
- delay["stamp"] = utils::to_string(log_line.date.value().timeStamp());
+ delay["stamp"] = utils::to_string(log_line.col<Database::Date>());
XmlSubNode submessage(forwarded, "message");
submessage["xmlns"] = CLIENT_NS;
- submessage["from"] = from + "/" + log_line.nick.value();
+ submessage["from"] = from + "/" + log_line.col<Database::Nick>();
submessage["type"] = "groupchat";
XmlSubNode body(submessage, "body");
- body.set_inner(log_line.body.value());
+ body.set_inner(log_line.col<Database::Body>());
}
this->send_stanza(message);
}