summaryrefslogtreecommitdiff
path: root/src/database
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-08-23 00:28:12 +0200
committerlouiz’ <louiz@louiz.org>2016-08-23 01:28:12 +0200
commit88499d037962b4a0bd85d812cb77ef0452c985f8 (patch)
treeb36ce26801962f529fd96093cd6fccaf0233c713 /src/database
parent91285d144d9ff8692a812840985cf2501e6b71c5 (diff)
downloadbiboumi-88499d037962b4a0bd85d812cb77ef0452c985f8.tar.gz
biboumi-88499d037962b4a0bd85d812cb77ef0452c985f8.tar.bz2
biboumi-88499d037962b4a0bd85d812cb77ef0452c985f8.tar.xz
biboumi-88499d037962b4a0bd85d812cb77ef0452c985f8.zip
If the maxHistoryLength is negative, make it 0
Instead of doing a broken SQL request that returns weird lines
Diffstat (limited to 'src/database')
-rw-r--r--src/database/database.cpp4
-rw-r--r--src/database/database.hpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 48cdea8..009ff0e 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -136,8 +136,10 @@ void Database::store_muc_message(const std::string& owner, const Iid& iid,
line.update();
}
-std::vector<db::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server, const int limit)
+std::vector<db::MucLogLine> Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server, int limit)
{
+ if (limit < 0)
+ limit = 0;
auto res = litesql::select<db::MucLogLine>(*Database::db,
db::MucLogLine::Owner == owner &&
db::MucLogLine::IrcChanName == chan_name &&
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 14012ff..e7fdd5f 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -49,7 +49,7 @@ public:
const std::string& server,
const std::string& channel);
static std::vector<db::MucLogLine> get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server,
- const int limit);
+ int limit);
static void store_muc_message(const std::string& owner, const Iid& iid,
time_point date, const std::string& body, const std::string& nick);