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

Use the same function for both history orders

Browse Source
This commit is contained in:
louiz’
2018-02-13 03:10:00 +01:00
parent fd9c713938
commit fd7c365288
3 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/database.cpp
+13 -27
View File
@@ -165,8 +165,11 @@ 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)
int limit, const std::string& start, const std::string& end, const Id::real_type after_id, Database::Paging paging)
{
if (limit == 0)
return {};
auto request = Database::muc_log_lines.select();
request.where() << Database::Owner{} << "=" << owner << \
" and " << Database::IrcChanName{} << "=" << chan_name << \
@@ -189,37 +192,20 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
request << " and " << Id{} << ">" << after_id;
}
if (limit >= 0)
request.limit() << limit;
auto result = request.execute(*Database::db);
return {result.cbegin(), result.cend()};
}
std::vector<Database::MucLogLine> Database::get_muc_most_recent_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit, const std::string& start)
{
auto request = Database::muc_log_lines.select();
request.where() << Database::Owner{} << "=" << owner << \
" and " << Database::IrcChanName{} << "=" << chan_name << \
" and " << Database::IrcServerName{} << "=" << server;
if (!start.empty())
{
const auto start_time = utils::parse_datetime(start);
if (start_time != -1)
request << " and " << Database::Date{} << ">=" << start_time;
}
request.order_by() << Id{} << " DESC ";
if (paging == Database::Paging::first)
request.order_by() << Id{} << " ASC ";
else
request.order_by() << Id{} << " DESC ";
if (limit >= 0)
request.limit() << limit;
auto result = request.execute(*Database::db);
return {result.crbegin(), result.crend()};
if (paging == Database::Paging::first)
return result;
else
return {result.crbegin(), result.crend()};
}
Database::MucLogLine Database::get_muc_log(const std::string& owner, const std::string& chan_name, const std::string& server,
src/database/database.hpp
+2 -6
View File
@@ -23,6 +23,7 @@ class Database
public:
using time_point = std::chrono::system_clock::time_point;
struct RecordNotFound: public std::exception {};
enum class Paging { first, last };
struct Uuid: Column<std::string> { static constexpr auto name = "uuid_"; };
@@ -125,13 +126,8 @@ 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);
const Id::real_type after_id=Id::unset_value, Paging=Paging::first);
/**
* Get the most recent messages from the archive, with optional limit and start date
*/
static std::vector<MucLogLine> get_muc_most_recent_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
int limit=-1, const std::string& start="");
/**
* Get just one single record matching the given uuid, between (optional) end and start.
* If it does not exist (or is not between end and start), throw a RecordNotFound exception.