mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support the <before/> element in MAM requests

Browse Source
This commit is contained in:
louiz’
2018-02-13 03:51:03 +01:00
parent 50d3c4a0b2
commit 4a2a280d76
4 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/database.cpp
+11 -5
View File
@@ -165,7 +165,7 @@ std::string Database::store_muc_message(const std::string& owner, const std::str
}
std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit, const std::string& start, const std::string& end, const Id::real_type after_id, Database::Paging paging)
int limit, const std::string& start, const std::string& end, const Id::real_type reference_record_id, Database::Paging paging)
{
if (limit == 0)
return {};
@@ -187,15 +187,21 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
if (end_time != -1)
request << " and " << Database::Date{} << "<=" << end_time;
}
if (after_id != Id::unset_value)
if (reference_record_id != Id::unset_value)
{
request << " and " << Id{} << ">" << after_id;
request << " and " << Id{};
if (paging == Database::Paging::first)
request << ">";
else
request << "<";
request << reference_record_id;
}
request.order_by() << Id{};
if (paging == Database::Paging::first)
request.order_by() << Id{} << " ASC ";
request << " ASC ";
else
request.order_by() << Id{} << " DESC ";
request << " DESC ";
if (limit >= 0)
request.limit() << limit;
src/database/database.hpp
+1 -1
View File
@@ -126,7 +126,7 @@ class Database
*/
static std::vector<MucLogLine> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit=-1, const std::string& start="", const std::string& end="",
const Id::real_type after_id=Id::unset_value, Paging=Paging::first);
const Id::real_type reference_record_id=Id::unset_value, Paging=Paging::first);
/**
* Get just one single record matching the given uuid, between (optional) end and start.