New upstream version 4.0upstream/4.0

2 files changed, 113 insertions, 5 deletions

diff --git a/src/database/database.cpp b/src/database/database.cpp
index 61e1b47..f7d309b 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -3,7 +3,10 @@
 
 #include <database/database.hpp>
 #include <logger/logger.hpp>
-#include <string>
+#include <irc/iid.hpp>
+#include <uuid/uuid.h>
+#include <utils/get_first_non_empty.hpp>
+#include <utils/time.hpp>
 
 using namespace std::string_literals;
 
@@ -29,6 +32,19 @@ void Database::set_verbose(const bool val)
   Database::db->verbose = val;
 }
 
+db::GlobalOptions Database::get_global_options(const std::string& owner)
+{
+  try {
+    auto options = litesql::select<db::GlobalOptions>(*Database::db,
+                                                      db::GlobalOptions::Owner == owner).one();
+    return options;
+  } catch (const litesql::NotFound& e) {
+    db::GlobalOptions options(*Database::db);
+    options.owner = owner;
+    return options;
+  }
+}
+
 db::IrcServerOptions Database::get_irc_server_options(const std::string& owner,
                                                       const std::string& server)
 {
@@ -71,17 +87,96 @@ db::IrcChannelOptions Database::get_irc_channel_options_with_server_default(cons
 {
   auto coptions = Database::get_irc_channel_options(owner, server, channel);
   auto soptions = Database::get_irc_server_options(owner, server);
-  if (coptions.encodingIn.value().empty())
-    coptions.encodingIn = soptions.encodingIn;
-  if (coptions.encodingOut.value().empty())
-    coptions.encodingOut = soptions.encodingOut;
+
+  coptions.encodingIn = get_first_non_empty(coptions.encodingIn.value(),
+                                            soptions.encodingIn.value());
+  coptions.encodingOut = get_first_non_empty(coptions.encodingOut.value(),
+                                             soptions.encodingOut.value());
+
+  coptions.maxHistoryLength = get_first_non_empty(coptions.maxHistoryLength.value(),
+                                                  soptions.maxHistoryLength.value());
 
   return coptions;
 }
 
+db::IrcChannelOptions Database::get_irc_channel_options_with_server_and_global_default(const std::string& owner,
+                                                                                       const std::string& server,
+                                                                                       const std::string& channel)
+{
+  auto coptions = Database::get_irc_channel_options(owner, server, channel);
+  auto soptions = Database::get_irc_server_options(owner, server);
+  auto goptions = Database::get_global_options(owner);
+
+  coptions.encodingIn = get_first_non_empty(coptions.encodingIn.value(),
+                                            soptions.encodingIn.value());
+  coptions.encodingOut = get_first_non_empty(coptions.encodingOut.value(),
+                                             soptions.encodingOut.value());
+
+  coptions.maxHistoryLength = get_first_non_empty(coptions.maxHistoryLength.value(),
+                                                  soptions.maxHistoryLength.value(),
+                                                  goptions.maxHistoryLength.value());
+
+  return coptions;
+}
+
+void Database::store_muc_message(const std::string& owner, const Iid& iid,
+                                 Database::time_point date,
+                                 const std::string& body,
+                                 const std::string& nick)
+{
+  db::MucLogLine line(*Database::db);
+
+  line.uuid = Database::gen_uuid();
+  line.owner = owner;
+  line.ircChanName = iid.get_local();
+  line.ircServerName = iid.get_server();
+  line.date = date.time_since_epoch().count() / 1'000'000'000;
+  line.body = body;
+  line.nick = nick;
+
+  line.update();
+}
+
+std::vector<db::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)
+{
+  auto request = litesql::select<db::MucLogLine>(*Database::db,
+                                              db::MucLogLine::Owner == owner &&
+                                              db::MucLogLine::IrcChanName == chan_name &&
+                                              db::MucLogLine::IrcServerName == server);
+  request.orderBy(db::MucLogLine::Id, false);
+
+  if (limit >= 0)
+    request.limit(limit);
+  if (!start.empty())
+    {
+      const auto start_time = utils::parse_datetime(start);
+      if (start_time != -1)
+        request.where(db::MucLogLine::Date >= start_time);
+    }
+  if (!end.empty())
+    {
+      const auto end_time = utils::parse_datetime(end);
+      if (end_time != -1)
+        request.where(db::MucLogLine::Date <= end_time);
+    }
+  const auto& res = request.all();
+  return {res.crbegin(), res.crend()};
+}
+
 void Database::close()
 {
   Database::db.reset(nullptr);
 }
 
+std::string Database::gen_uuid()
+{
+  char uuid_str[37];
+  uuid_t uuid;
+  uuid_generate(uuid);
+  uuid_unparse(uuid, uuid_str);
+  return uuid_str;
+}
+
+
 #endif
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 7173bcd..6823574 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -9,10 +9,14 @@
 #include <memory>
 
 #include <litesql.hpp>
+#include <chrono>
+
+class Iid;
 
 class Database
 {
 public:
+  using time_point = std::chrono::system_clock::time_point;
   Database() = default;
   ~Database() = default;
 
@@ -32,6 +36,7 @@ public:
    * Return the object from the db. Create it beforehand (with all default
    * values) if it is not already present.
    */
+  static db::GlobalOptions get_global_options(const std::string& owner);
   static db::IrcServerOptions get_irc_server_options(const std::string& owner,
                                                      const std::string& server);
   static db::IrcChannelOptions get_irc_channel_options(const std::string& owner,
@@ -40,12 +45,20 @@ public:
   static db::IrcChannelOptions get_irc_channel_options_with_server_default(const std::string& owner,
                                                                            const std::string& server,
                                                                            const std::string& channel);
+  static db::IrcChannelOptions get_irc_channel_options_with_server_and_global_default(const std::string& owner,
+                                                                                      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,
+                                                  int limit=-1, const std::string& before="", const std::string& after="");
+  static void store_muc_message(const std::string& owner, const Iid& iid,
+                                time_point date, const std::string& body, const std::string& nick);
 
   static void close();
   static void open(const std::string& filename, const std::string& db_type="sqlite3");
 
 
 private:
+  static std::string gen_uuid();
   static std::unique_ptr<db::BibouDB> db;
 };
 #endif /* USE_DATABASE */