Merge tag 'upstream/4.0'

Upstream version 4.0

# gpg: Signature made Wed Dec 21 21:25:11 2016 CET
# gpg:                using RSA key 2C7C3146C1A00121
# gpg: Good signature from "Jonas Smedegaard <dr@jones.dk>"
# gpg:                 aka "Jonas Smedegaard <jonas@homebase.dk>"
# gpg:                 aka "Jonas Smedegaard <js@debian.org>"
# gpg:                 aka "[jpeg image of size 4165]"

1 files changed, 13 insertions, 0 deletions

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 */