core: Use QLatin1String in a few places
[quassel.git] / src / core / sqlitestorage.cpp
index ad610a0..f56f914 100644 (file)
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "sqlitestorage.h"
 
 #include <QtSql>
 
-#include "logger.h"
+#include <QLatin1String>
+
 #include "network.h"
 #include "quassel.h"
 
 int SqliteStorage::_maxRetryCount = 150;
 
-SqliteStorage::SqliteStorage(QObject *parent)
-  : AbstractSqlStorage(parent)
+SqliteStorage::SqliteStorage(QObject* parent)
+    : AbstractSqlStorage(parent)
+{}
+
+bool SqliteStorage::isAvailable() const
 {
+    if (!QSqlDatabase::isDriverAvailable("QSQLITE"))
+        return false;
+    return true;
 }
 
-SqliteStorage::~SqliteStorage() {
+QString SqliteStorage::backendId() const
+{
+    return QString("SQLite");
 }
 
-bool SqliteStorage::isAvailable() const {
-  if(!QSqlDatabase::isDriverAvailable("QSQLITE")) return false;
-  return true;
+QString SqliteStorage::displayName() const
+{
+    // Note: Pre-0.13 clients use the displayName property for backend idenfication
+    // We identify the backend to use for the monolithic core by its displayname.
+    // so only change this string if you _really_ have to and make sure the core
+    // setup for the mono client still works ;)
+    return backendId();
 }
 
-QString SqliteStorage::displayName() const {
-  return QString("SQLite");
+QString SqliteStorage::description() const
+{
+    return tr("SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized "
+              "databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine "
+              "it is running on, and if you only expect a few users to use your core.");
 }
 
-QString SqliteStorage::description() const {
-  return tr("SQLite is a file-based database engine that does not require any setup. It is suitable for small and medium-sized "
-            "databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine "
-            "it is running on, and if you only expect a few users to use your core.");
+int SqliteStorage::installedSchemaVersion()
+{
+    // only used when there is a singlethread (during startup)
+    // so we don't need locking here
+    QSqlQuery query = logDb().exec("SELECT value FROM coreinfo WHERE key = 'schemaversion'");
+    if (query.first())
+        return query.value(0).toInt();
+
+    // maybe it's really old... (schema version 0)
+    query = logDb().exec("SELECT MAX(version) FROM coreinfo");
+    if (query.first())
+        return query.value(0).toInt();
+
+    return AbstractSqlStorage::installedSchemaVersion();
 }
 
-int SqliteStorage::installedSchemaVersion() {
-  // only used when there is a singlethread (during startup)
-  // so we don't need locking here
-  QSqlQuery query = logDb().exec("SELECT value FROM coreinfo WHERE key = 'schemaversion'");
-  if(query.first())
-    return query.value(0).toInt();
+bool SqliteStorage::updateSchemaVersion(int newVersion, bool clearUpgradeStep)
+{
+    // only used when there is a singlethread (during startup)
+    // so we don't need locking here
 
-  // maybe it's really old... (schema version 0)
-  query = logDb().exec("SELECT MAX(version) FROM coreinfo");
-  if(query.first())
-    return query.value(0).toInt();
+    QSqlDatabase db = logDb();
 
-  return AbstractSqlStorage::installedSchemaVersion();
-}
+    // Atomically update the schema version and clear the upgrade step, if specified
+    // Note: This will need reworked if "updateSchemaVersion" is ever called within a transaction.
+    db.transaction();
 
-bool SqliteStorage::updateSchemaVersion(int newVersion) {
-  // only used when there is a singlethread (during startup)
-  // so we don't need locking here
-  QSqlQuery query(logDb());
-  query.prepare("UPDATE coreinfo SET value = :version WHERE key = 'schemaversion'");
-  query.bindValue(":version", newVersion);
-  query.exec();
+    QSqlQuery query(db);
+    query.prepare("UPDATE coreinfo SET value = :version WHERE key = 'schemaversion'");
+    query.bindValue(":version", newVersion);
+    safeExec(query);
 
-  bool success = true;
-  if(query.lastError().isValid()) {
-    qCritical() << "SqliteStorage::updateSchemaVersion(int): Updating schema version failed!";
-    success = false;
-  }
-  return success;
-}
+    if (!watchQuery(query)) {
+        qCritical() << "SqliteStorage::updateSchemaVersion(int, bool): Updating schema version failed!";
+        db.rollback();
+        return false;
+    }
 
-bool SqliteStorage::setupSchemaVersion(int version) {
-  // only used when there is a singlethread (during startup)
-  // so we don't need locking here
-  QSqlQuery query(logDb());
-  query.prepare("INSERT INTO coreinfo (key, value) VALUES ('schemaversion', :version)");
-  query.bindValue(":version", version);
-  query.exec();
+    if (clearUpgradeStep) {
+        // Try clearing the upgrade step if requested
+        if (!setSchemaVersionUpgradeStep("")) {
+            db.rollback();
+            return false;
+        }
+    }
 
-  bool success = true;
-  if(query.lastError().isValid()) {
-    qCritical() << "SqliteStorage::setupSchemaVersion(int): Updating schema version failed!";
-    success = false;
-  }
-  return success;
+    // Successful, commit and return true
+    db.commit();
+    return true;
 }
 
-UserId SqliteStorage::addUser(const QString &user, const QString &password) {
-  QSqlDatabase db = logDb();
-  UserId uid;
+bool SqliteStorage::setupSchemaVersion(int version)
+{
+    // only used when there is a singlethread (during startup)
+    // so we don't need locking here
+    QSqlQuery query(logDb());
+    query.prepare("INSERT INTO coreinfo (key, value) VALUES ('schemaversion', :version)");
+    query.bindValue(":version", version);
+    query.exec();
+
+    bool success = true;
+    if (query.lastError().isValid()) {
+        qCritical() << "SqliteStorage::setupSchemaVersion(int): Updating schema version failed!";
+        success = false;
+    }
+    return success;
+}
 
-  db.transaction();
-  // this scope ensures that the query is freed in sqlite before we call unlock()
-  // this ensures that our thread doesn't hold a internal after unlock is called
-  // (see sqlites doc on implicit locking for details)
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("insert_quasseluser"));
-    query.bindValue(":username", user);
-    query.bindValue(":password", cryptedPassword(password));
-    lockForWrite();
+QString SqliteStorage::schemaVersionUpgradeStep()
+{
+    // Only used when there is a singlethread (during startup), so we don't need locking here
+    QSqlQuery query(logDb());
+    query.prepare("SELECT value FROM coreinfo WHERE key = 'schemaupgradestep'");
     safeExec(query);
-    if(query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error...
-      db.rollback();
-    } else {
-      uid = query.lastInsertId().toInt();
-      db.commit();
-    }
-  }
-  unlock();
+    watchQuery(query);
+    if (query.first())
+        return query.value(0).toString();
 
-  if(uid.isValid())
-    emit userAdded(uid, user);
-  return uid;
+    // Fall back to the default value
+    return AbstractSqlStorage::schemaVersionUpgradeStep();
 }
 
-bool SqliteStorage::updateUser(UserId user, const QString &password) {
-  QSqlDatabase db = logDb();
-  bool success = false;
+bool SqliteStorage::setSchemaVersionUpgradeStep(QString upgradeQuery)
+{
+    // Only used when there is a singlethread (during startup), so we don't need locking here
 
-  db.transaction();
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_userpassword"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":password", cryptedPassword(password));
-    lockForWrite();
+    // Intentionally do not wrap in a transaction so other functions can include multiple operations
+    QSqlQuery query(logDb());
+    query.prepare("UPDATE coreinfo SET value = :upgradestep WHERE key = 'schemaupgradestep'");
+    query.bindValue(":upgradestep", upgradeQuery);
     safeExec(query);
-    success = query.numRowsAffected() != 0;
-    db.commit();
-  }
-  unlock();
-  return success;
-}
 
-void SqliteStorage::renameUser(UserId user, const QString &newName) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_username"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":username", newName);
-    lockForWrite();
-    safeExec(query);
-    db.commit();
-  }
-  unlock();
-  emit userRenamed(user, newName);
+    // Don't wrap with watchQuery to avoid an alarming message in the log when the key is missing
+    // Make sure that the query didn't fail, and that some non-zero number of rows were affected
+    bool success = !query.lastError().isValid() && query.numRowsAffected() != 0;
+
+    if (!success) {
+        // The key might not exist (Quassel 0.13.0 and older).  Try inserting it...
+        query = QSqlQuery(logDb());
+        query.prepare("INSERT INTO coreinfo (key, value) VALUES ('schemaupgradestep', :upgradestep)");
+        query.bindValue(":upgradestep", upgradeQuery);
+        safeExec(query);
+
+        if (!watchQuery(query)) {
+            qCritical() << Q_FUNC_INFO << "Setting schema upgrade step failed!";
+            success = false;
+        }
+        else {
+            success = true;
+        }
+    }
+    return success;
 }
 
-UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
-  UserId userId;
+UserId SqliteStorage::addUser(const QString& user, const QString& password, const QString& authenticator)
+{
+    QSqlDatabase db = logDb();
+    UserId uid;
+
+    db.transaction();
+    // this scope ensures that the query is freed in sqlite before we call unlock()
+    // this ensures that our thread doesn't hold a internal after unlock is called
+    // (see sqlites doc on implicit locking for details)
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("insert_quasseluser"));
+        query.bindValue(":username", user);
+        query.bindValue(":password", hashPassword(password));
+        query.bindValue(":hashversion", Storage::HashVersion::Latest);
+        query.bindValue(":authenticator", authenticator);
+        lockForWrite();
+        safeExec(query);
+        if (query.lastError().isValid()
+            && query.lastError().nativeErrorCode() == QLatin1String{"19"}) {  // user already exists - sadly 19 seems to be the general constraint violation error...
+            db.rollback();
+        }
+        else {
+            uid = query.lastInsertId().toInt();
+            db.commit();
+        }
+    }
+    unlock();
+
+    if (uid.isValid())
+        emit userAdded(uid, user);
+    return uid;
+}
 
-  {
-    QSqlQuery query(logDb());
-    query.prepare(queryString("select_authuser"));
-    query.bindValue(":username", user);
-    query.bindValue(":password", cryptedPassword(password));
+bool SqliteStorage::updateUser(UserId user, const QString& password)
+{
+    QSqlDatabase db = logDb();
+    bool success = false;
+
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_userpassword"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":password", hashPassword(password));
+        query.bindValue(":hashversion", Storage::HashVersion::Latest);
+        lockForWrite();
+        safeExec(query);
+        success = query.numRowsAffected() != 0;
+        db.commit();
+    }
+    unlock();
+    return success;
+}
 
-    lockForRead();
-    safeExec(query);
+void SqliteStorage::renameUser(UserId user, const QString& newName)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_username"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":username", newName);
+        lockForWrite();
+        safeExec(query);
+        db.commit();
+    }
+    unlock();
+    emit userRenamed(user, newName);
+}
 
-    if(query.first()) {
-      userId = query.value(0).toInt();
+UserId SqliteStorage::validateUser(const QString& user, const QString& password)
+{
+    UserId userId;
+    QString hashedPassword;
+    Storage::HashVersion hashVersion = Storage::HashVersion::Latest;
+
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_authuser"));
+        query.bindValue(":username", user);
+
+        lockForRead();
+        safeExec(query);
+
+        if (query.first()) {
+            userId = query.value(0).toInt();
+            hashedPassword = query.value(1).toString();
+            hashVersion = static_cast<Storage::HashVersion>(query.value(2).toInt());
+        }
     }
-  }
-  unlock();
+    unlock();
 
-  return userId;
+    UserId returnUserId;
+    if (userId != 0 && checkHashedPassword(userId, password, hashedPassword, hashVersion)) {
+        returnUserId = userId;
+    }
+    return returnUserId;
 }
 
-UserId SqliteStorage::getUserId(const QString &username) {
-  UserId userId;
+UserId SqliteStorage::getUserId(const QString& username)
+{
+    UserId userId;
 
-  {
-    QSqlQuery query(logDb());
-    query.prepare(queryString("select_userid"));
-    query.bindValue(":username", username);
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_userid"));
+        query.bindValue(":username", username);
 
-    lockForRead();
-    safeExec(query);
+        lockForRead();
+        safeExec(query);
 
-    if(query.first()) {
-      userId = query.value(0).toInt();
+        if (query.first()) {
+            userId = query.value(0).toInt();
+        }
     }
-  }
-  unlock();
+    unlock();
 
-  return userId;
+    return userId;
 }
 
-UserId SqliteStorage::internalUser() {
-  UserId userId;
+QString SqliteStorage::getUserAuthenticator(const UserId userid)
+{
+    QString authenticator = QString("");
 
-  {
-    QSqlQuery query(logDb());
-    query.prepare(queryString("select_internaluser"));
-    lockForRead();
-    safeExec(query);
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_authenticator"));
+        query.bindValue(":userid", userid.toInt());
 
-    if(query.first()) {
-      userId = query.value(0).toInt();
+        lockForRead();
+        safeExec(query);
+
+        if (query.first()) {
+            authenticator = query.value(0).toString();
+        }
     }
-  }
-  unlock();
+    unlock();
 
-  return userId;
+    return authenticator;
 }
 
-void SqliteStorage::delUser(UserId user) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  lockForWrite();
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("delete_backlog_by_uid"));
-    query.bindValue(":userid", user.toInt());
-    safeExec(query);
-
-    query.prepare(queryString("delete_buffers_by_uid"));
-    query.bindValue(":userid", user.toInt());
-    safeExec(query);
+UserId SqliteStorage::internalUser()
+{
+    UserId userId;
 
-    query.prepare(queryString("delete_networks_by_uid"));
-    query.bindValue(":userid", user.toInt());
-    safeExec(query);
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_internaluser"));
+        lockForRead();
+        safeExec(query);
 
-    query.prepare(queryString("delete_quasseluser"));
-    query.bindValue(":userid", user.toInt());
-    safeExec(query);
-    // I hate the lack of foreign keys and on delete cascade... :(
-    db.commit();
-  }
-  unlock();
+        if (query.first()) {
+            userId = query.value(0).toInt();
+        }
+    }
+    unlock();
 
-  emit userRemoved(user);
+    return userId;
 }
 
-void SqliteStorage::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) {
-  QByteArray rawData;
-  QDataStream out(&rawData, QIODevice::WriteOnly);
-  out.setVersion(QDataStream::Qt_4_2);
-  out << data;
+void SqliteStorage::delUser(UserId user)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
 
-  QSqlDatabase db = logDb();
-  db.transaction();
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("insert_user_setting"));
-    query.bindValue(":userid", userId.toInt());
-    query.bindValue(":settingname", settingName);
-    query.bindValue(":settingvalue", rawData);
     lockForWrite();
-    safeExec(query);
-
-    if(query.lastError().isValid()) {
-      QSqlQuery updateQuery(db);
-      updateQuery.prepare(queryString("update_user_setting"));
-      updateQuery.bindValue(":userid", userId.toInt());
-      updateQuery.bindValue(":settingname", settingName);
-      updateQuery.bindValue(":settingvalue", rawData);
-      safeExec(updateQuery);
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("delete_backlog_by_uid"));
+        query.bindValue(":userid", user.toInt());
+        safeExec(query);
+
+        query.prepare(queryString("delete_buffers_by_uid"));
+        query.bindValue(":userid", user.toInt());
+        safeExec(query);
+
+        query.prepare(queryString("delete_networks_by_uid"));
+        query.bindValue(":userid", user.toInt());
+        safeExec(query);
+
+        query.prepare(queryString("delete_quasseluser"));
+        query.bindValue(":userid", user.toInt());
+        safeExec(query);
+        // I hate the lack of foreign keys and on delete cascade... :(
+        db.commit();
     }
-    db.commit();
-  }
-  unlock();
+    unlock();
+
+    emit userRemoved(user);
 }
 
-QVariant SqliteStorage::getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData) {
-  QVariant data = defaultData;
-  {
-    QSqlQuery query(logDb());
-    query.prepare(queryString("select_user_setting"));
-    query.bindValue(":userid", userId.toInt());
-    query.bindValue(":settingname", settingName);
-    lockForRead();
-    safeExec(query);
+void SqliteStorage::setUserSetting(UserId userId, const QString& settingName, const QVariant& data)
+{
+    QByteArray rawData;
+    QDataStream out(&rawData, QIODevice::WriteOnly);
+    out.setVersion(QDataStream::Qt_4_2);
+    out << data;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("insert_user_setting"));
+        query.bindValue(":userid", userId.toInt());
+        query.bindValue(":settingname", settingName);
+        query.bindValue(":settingvalue", rawData);
+        lockForWrite();
+        safeExec(query);
+
+        if (query.lastError().isValid()) {
+            QSqlQuery updateQuery(db);
+            updateQuery.prepare(queryString("update_user_setting"));
+            updateQuery.bindValue(":userid", userId.toInt());
+            updateQuery.bindValue(":settingname", settingName);
+            updateQuery.bindValue(":settingvalue", rawData);
+            safeExec(updateQuery);
+        }
+        db.commit();
+    }
+    unlock();
+}
 
-    if(query.first()) {
-      QByteArray rawData = query.value(0).toByteArray();
-      QDataStream in(&rawData, QIODevice::ReadOnly);
-      in.setVersion(QDataStream::Qt_4_2);
-      in >> data;
+QVariant SqliteStorage::getUserSetting(UserId userId, const QString& settingName, const QVariant& defaultData)
+{
+    QVariant data = defaultData;
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_user_setting"));
+        query.bindValue(":userid", userId.toInt());
+        query.bindValue(":settingname", settingName);
+        lockForRead();
+        safeExec(query);
+
+        if (query.first()) {
+            QByteArray rawData = query.value(0).toByteArray();
+            QDataStream in(&rawData, QIODevice::ReadOnly);
+            in.setVersion(QDataStream::Qt_4_2);
+            in >> data;
+        }
     }
-  }
-  unlock();
-  return data;
+    unlock();
+    return data;
 }
 
-IdentityId SqliteStorage::createIdentity(UserId user, CoreIdentity &identity) {
-  IdentityId identityId;
+void SqliteStorage::setCoreState(const QVariantList& data)
+{
+    QByteArray rawData;
+    QDataStream out(&rawData, QIODevice::WriteOnly);
+    out.setVersion(QDataStream::Qt_4_2);
+    out << data;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("insert_core_state"));
+        query.bindValue(":key", "active_sessions");
+        query.bindValue(":value", rawData);
+        lockForWrite();
+        safeExec(query);
+
+        if (query.lastError().isValid()) {
+            QSqlQuery updateQuery(db);
+            updateQuery.prepare(queryString("update_core_state"));
+            updateQuery.bindValue(":key", "active_sessions");
+            updateQuery.bindValue(":value", rawData);
+            safeExec(updateQuery);
+        }
+        db.commit();
+    }
+    unlock();
+}
 
-  QSqlDatabase db = logDb();
-  db.transaction();
+QVariantList SqliteStorage::getCoreState(const QVariantList& defaultData)
+{
+    QVariantList data;
+    {
+        QSqlQuery query(logDb());
+        query.prepare(queryString("select_core_state"));
+        query.bindValue(":key", "active_sessions");
+        lockForRead();
+        safeExec(query);
+
+        if (query.first()) {
+            QByteArray rawData = query.value(0).toByteArray();
+            QDataStream in(&rawData, QIODevice::ReadOnly);
+            in.setVersion(QDataStream::Qt_4_2);
+            in >> data;
+        }
+        else {
+            data = defaultData;
+        }
+    }
+    unlock();
+    return data;
+}
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("insert_identity"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":identityname", identity.identityName());
-    query.bindValue(":realname", identity.realName());
-    query.bindValue(":awaynick", identity.awayNick());
-    query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
-    query.bindValue(":awayreason", identity.awayReason());
-    query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
-    query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
-    query.bindValue(":autoawaytime", identity.autoAwayTime());
-    query.bindValue(":autoawayreason", identity.autoAwayReason());
-    query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
-    query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
-    query.bindValue(":detachawayreason", identity.detachAwayReason());
-    query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
-    query.bindValue(":ident", identity.ident());
-    query.bindValue(":kickreason", identity.kickReason());
-    query.bindValue(":partreason", identity.partReason());
-    query.bindValue(":quitreason", identity.quitReason());
+IdentityId SqliteStorage::createIdentity(UserId user, CoreIdentity& identity)
+{
+    IdentityId identityId;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("insert_identity"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":identityname", identity.identityName());
+        query.bindValue(":realname", identity.realName());
+        query.bindValue(":awaynick", identity.awayNick());
+        query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
+        query.bindValue(":awayreason", identity.awayReason());
+        query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
+        query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
+        query.bindValue(":autoawaytime", identity.autoAwayTime());
+        query.bindValue(":autoawayreason", identity.autoAwayReason());
+        query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
+        query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
+        query.bindValue(":detachawayreason", identity.detachAwayReason());
+        query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
+        query.bindValue(":ident", identity.ident());
+        query.bindValue(":kickreason", identity.kickReason());
+        query.bindValue(":partreason", identity.partReason());
+        query.bindValue(":quitreason", identity.quitReason());
 #ifdef HAVE_SSL
-    query.bindValue(":sslcert", identity.sslCert().toPem());
-    query.bindValue(":sslkey", identity.sslKey().toPem());
+        query.bindValue(":sslcert", identity.sslCert().toPem());
+        query.bindValue(":sslkey", identity.sslKey().toPem());
 #else
-    query.bindValue(":sslcert", QByteArray());
-    query.bindValue(":sslkey", QByteArray());
+        query.bindValue(":sslcert", QByteArray());
+        query.bindValue(":sslkey", QByteArray());
 #endif
 
-    lockForWrite();
-    safeExec(query);
+        lockForWrite();
+        safeExec(query);
 
-    identityId = query.lastInsertId().toInt();
-    if(!identityId.isValid()) {
-      watchQuery(query);
-    } else {
-      QSqlQuery deleteNickQuery(db);
-      deleteNickQuery.prepare(queryString("delete_nicks"));
-      deleteNickQuery.bindValue(":identityid", identityId.toInt());
-      safeExec(deleteNickQuery);
-
-      QSqlQuery insertNickQuery(db);
-      insertNickQuery.prepare(queryString("insert_nick"));
-      foreach(QString nick, identity.nicks()) {
-        insertNickQuery.bindValue(":identityid", identityId.toInt());
-        insertNickQuery.bindValue(":nick", nick);
-        safeExec(insertNickQuery);
-      }
+        identityId = query.lastInsertId().toInt();
+        if (!identityId.isValid()) {
+            watchQuery(query);
+        }
+        else {
+            QSqlQuery deleteNickQuery(db);
+            deleteNickQuery.prepare(queryString("delete_nicks"));
+            deleteNickQuery.bindValue(":identityid", identityId.toInt());
+            safeExec(deleteNickQuery);
+
+            QSqlQuery insertNickQuery(db);
+            insertNickQuery.prepare(queryString("insert_nick"));
+            foreach (QString nick, identity.nicks()) {
+                insertNickQuery.bindValue(":identityid", identityId.toInt());
+                insertNickQuery.bindValue(":nick", nick);
+                safeExec(insertNickQuery);
+            }
+        }
+        db.commit();
     }
-    db.commit();
-  }
-  unlock();
-  identity.setId(identityId);
-  return identityId;
-}
-
-bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
-  QSqlDatabase db = logDb();
-  bool error = false;
-  db.transaction();
-
-  {
-    QSqlQuery checkQuery(db);
-    checkQuery.prepare(queryString("select_checkidentity"));
-    checkQuery.bindValue(":identityid", identity.id().toInt());
-    checkQuery.bindValue(":userid", user.toInt());
-    lockForRead();
-    safeExec(checkQuery);
-
-    // there should be exactly one identity for the given id and user
-    error = (!checkQuery.first() || checkQuery.value(0).toInt() != 1);
-  }
-  if(error) {
     unlock();
-    return false;
-  }
+    identity.setId(identityId);
+    return identityId;
+}
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_identity"));
-    query.bindValue(":identityname", identity.identityName());
-    query.bindValue(":realname", identity.realName());
-    query.bindValue(":awaynick", identity.awayNick());
-    query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
-    query.bindValue(":awayreason", identity.awayReason());
-    query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
-    query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
-    query.bindValue(":autoawaytime", identity.autoAwayTime());
-    query.bindValue(":autoawayreason", identity.autoAwayReason());
-    query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
-    query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
-    query.bindValue(":detachawayreason", identity.detachAwayReason());
-    query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
-    query.bindValue(":ident", identity.ident());
-    query.bindValue(":kickreason", identity.kickReason());
-    query.bindValue(":partreason", identity.partReason());
-    query.bindValue(":quitreason", identity.quitReason());
+bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity& identity)
+{
+    QSqlDatabase db = logDb();
+    bool error = false;
+    db.transaction();
+
+    {
+        QSqlQuery checkQuery(db);
+        checkQuery.prepare(queryString("select_checkidentity"));
+        checkQuery.bindValue(":identityid", identity.id().toInt());
+        checkQuery.bindValue(":userid", user.toInt());
+        lockForRead();
+        safeExec(checkQuery);
+
+        // there should be exactly one identity for the given id and user
+        error = (!checkQuery.first() || checkQuery.value(0).toInt() != 1);
+    }
+    if (error) {
+        unlock();
+        return false;
+    }
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_identity"));
+        query.bindValue(":identityname", identity.identityName());
+        query.bindValue(":realname", identity.realName());
+        query.bindValue(":awaynick", identity.awayNick());
+        query.bindValue(":awaynickenabled", identity.awayNickEnabled() ? 1 : 0);
+        query.bindValue(":awayreason", identity.awayReason());
+        query.bindValue(":awayreasonenabled", identity.awayReasonEnabled() ? 1 : 0);
+        query.bindValue(":autoawayenabled", identity.awayReasonEnabled() ? 1 : 0);
+        query.bindValue(":autoawaytime", identity.autoAwayTime());
+        query.bindValue(":autoawayreason", identity.autoAwayReason());
+        query.bindValue(":autoawayreasonenabled", identity.autoAwayReasonEnabled() ? 1 : 0);
+        query.bindValue(":detachawayenabled", identity.detachAwayEnabled() ? 1 : 0);
+        query.bindValue(":detachawayreason", identity.detachAwayReason());
+        query.bindValue(":detachawayreasonenabled", identity.detachAwayReasonEnabled() ? 1 : 0);
+        query.bindValue(":ident", identity.ident());
+        query.bindValue(":kickreason", identity.kickReason());
+        query.bindValue(":partreason", identity.partReason());
+        query.bindValue(":quitreason", identity.quitReason());
 #ifdef HAVE_SSL
-    query.bindValue(":sslcert", identity.sslCert().toPem());
-    query.bindValue(":sslkey", identity.sslKey().toPem());
+        query.bindValue(":sslcert", identity.sslCert().toPem());
+        query.bindValue(":sslkey", identity.sslKey().toPem());
 #else
-    query.bindValue(":sslcert", QByteArray());
-    query.bindValue(":sslkey", QByteArray());
+        query.bindValue(":sslcert", QByteArray());
+        query.bindValue(":sslkey", QByteArray());
 #endif
-    query.bindValue(":identityid", identity.id().toInt());
-    safeExec(query);
-    watchQuery(query);
-
-    QSqlQuery deleteNickQuery(db);
-    deleteNickQuery.prepare(queryString("delete_nicks"));
-    deleteNickQuery.bindValue(":identityid", identity.id().toInt());
-    safeExec(deleteNickQuery);
-    watchQuery(deleteNickQuery);
-
-    QSqlQuery insertNickQuery(db);
-    insertNickQuery.prepare(queryString("insert_nick"));
-    foreach(QString nick, identity.nicks()) {
-      insertNickQuery.bindValue(":identityid", identity.id().toInt());
-      insertNickQuery.bindValue(":nick", nick);
-      safeExec(insertNickQuery);
-      watchQuery(insertNickQuery);
+        query.bindValue(":identityid", identity.id().toInt());
+        safeExec(query);
+        watchQuery(query);
+
+        QSqlQuery deleteNickQuery(db);
+        deleteNickQuery.prepare(queryString("delete_nicks"));
+        deleteNickQuery.bindValue(":identityid", identity.id().toInt());
+        safeExec(deleteNickQuery);
+        watchQuery(deleteNickQuery);
+
+        QSqlQuery insertNickQuery(db);
+        insertNickQuery.prepare(queryString("insert_nick"));
+        foreach (QString nick, identity.nicks()) {
+            insertNickQuery.bindValue(":identityid", identity.id().toInt());
+            insertNickQuery.bindValue(":nick", nick);
+            safeExec(insertNickQuery);
+            watchQuery(insertNickQuery);
+        }
+        db.commit();
     }
-    db.commit();
-  }
-  unlock();
-  return true;
-}
-
-void SqliteStorage::removeIdentity(UserId user, IdentityId identityId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  bool error = false;
-  {
-    QSqlQuery checkQuery(db);
-    checkQuery.prepare(queryString("select_checkidentity"));
-    checkQuery.bindValue(":identityid", identityId.toInt());
-    checkQuery.bindValue(":userid", user.toInt());
-    lockForRead();
-    safeExec(checkQuery);
-
-    // there should be exactly one identity for the given id and user
-    error = (!checkQuery.first() || checkQuery.value(0).toInt() != 1);
-  }
-  if(error) {
     unlock();
-    return;
-  }
-
-  {
-    QSqlQuery deleteNickQuery(db);
-    deleteNickQuery.prepare(queryString("delete_nicks"));
-    deleteNickQuery.bindValue(":identityid", identityId.toInt());
-    safeExec(deleteNickQuery);
-
-    QSqlQuery deleteIdentityQuery(db);
-    deleteIdentityQuery.prepare(queryString("delete_identity"));
-    deleteIdentityQuery.bindValue(":identityid", identityId.toInt());
-    deleteIdentityQuery.bindValue(":userid", user.toInt());
-    safeExec(deleteIdentityQuery);
-    db.commit();
-  }
-  unlock();
+    return true;
 }
 
-QList<CoreIdentity> SqliteStorage::identities(UserId user) {
-  QList<CoreIdentity> identities;
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_identities"));
-    query.bindValue(":userid", user.toInt());
-
-    QSqlQuery nickQuery(db);
-    nickQuery.prepare(queryString("select_nicks"));
+void SqliteStorage::removeIdentity(UserId user, IdentityId identityId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery checkQuery(db);
+        checkQuery.prepare(queryString("select_checkidentity"));
+        checkQuery.bindValue(":identityid", identityId.toInt());
+        checkQuery.bindValue(":userid", user.toInt());
+        lockForRead();
+        safeExec(checkQuery);
+
+        // there should be exactly one identity for the given id and user
+        error = (!checkQuery.first() || checkQuery.value(0).toInt() != 1);
+    }
+    if (error) {
+        unlock();
+        return;
+    }
 
-    lockForRead();
-    safeExec(query);
+    {
+        QSqlQuery deleteNickQuery(db);
+        deleteNickQuery.prepare(queryString("delete_nicks"));
+        deleteNickQuery.bindValue(":identityid", identityId.toInt());
+        safeExec(deleteNickQuery);
+
+        QSqlQuery deleteIdentityQuery(db);
+        deleteIdentityQuery.prepare(queryString("delete_identity"));
+        deleteIdentityQuery.bindValue(":identityid", identityId.toInt());
+        deleteIdentityQuery.bindValue(":userid", user.toInt());
+        safeExec(deleteIdentityQuery);
+        db.commit();
+    }
+    unlock();
+}
 
-    while(query.next()) {
-      CoreIdentity identity(IdentityId(query.value(0).toInt()));
-
-      identity.setIdentityName(query.value(1).toString());
-      identity.setRealName(query.value(2).toString());
-      identity.setAwayNick(query.value(3).toString());
-      identity.setAwayNickEnabled(!!query.value(4).toInt());
-      identity.setAwayReason(query.value(5).toString());
-      identity.setAwayReasonEnabled(!!query.value(6).toInt());
-      identity.setAutoAwayEnabled(!!query.value(7).toInt());
-      identity.setAutoAwayTime(query.value(8).toInt());
-      identity.setAutoAwayReason(query.value(9).toString());
-      identity.setAutoAwayReasonEnabled(!!query.value(10).toInt());
-      identity.setDetachAwayEnabled(!!query.value(11).toInt());
-      identity.setDetachAwayReason(query.value(12).toString());
-      identity.setDetachAwayReasonEnabled(!!query.value(13).toInt());
-      identity.setIdent(query.value(14).toString());
-      identity.setKickReason(query.value(15).toString());
-      identity.setPartReason(query.value(16).toString());
-      identity.setQuitReason(query.value(17).toString());
+QList<CoreIdentity> SqliteStorage::identities(UserId user)
+{
+    QList<CoreIdentity> identities;
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_identities"));
+        query.bindValue(":userid", user.toInt());
+
+        QSqlQuery nickQuery(db);
+        nickQuery.prepare(queryString("select_nicks"));
+
+        lockForRead();
+        safeExec(query);
+
+        while (query.next()) {
+            CoreIdentity identity(IdentityId(query.value(0).toInt()));
+
+            identity.setIdentityName(query.value(1).toString());
+            identity.setRealName(query.value(2).toString());
+            identity.setAwayNick(query.value(3).toString());
+            identity.setAwayNickEnabled(!!query.value(4).toInt());
+            identity.setAwayReason(query.value(5).toString());
+            identity.setAwayReasonEnabled(!!query.value(6).toInt());
+            identity.setAutoAwayEnabled(!!query.value(7).toInt());
+            identity.setAutoAwayTime(query.value(8).toInt());
+            identity.setAutoAwayReason(query.value(9).toString());
+            identity.setAutoAwayReasonEnabled(!!query.value(10).toInt());
+            identity.setDetachAwayEnabled(!!query.value(11).toInt());
+            identity.setDetachAwayReason(query.value(12).toString());
+            identity.setDetachAwayReasonEnabled(!!query.value(13).toInt());
+            identity.setIdent(query.value(14).toString());
+            identity.setKickReason(query.value(15).toString());
+            identity.setPartReason(query.value(16).toString());
+            identity.setQuitReason(query.value(17).toString());
 #ifdef HAVE_SSL
-      identity.setSslCert(query.value(18).toByteArray());
-      identity.setSslKey(query.value(19).toByteArray());
+            identity.setSslCert(query.value(18).toByteArray());
+            identity.setSslKey(query.value(19).toByteArray());
 #endif
 
-      nickQuery.bindValue(":identityid", identity.id().toInt());
-      QList<QString> nicks;
-      safeExec(nickQuery);
-      watchQuery(nickQuery);
-      while(nickQuery.next()) {
-        nicks << nickQuery.value(0).toString();
-      }
-      identity.setNicks(nicks);
-      identities << identity;
+            nickQuery.bindValue(":identityid", identity.id().toInt());
+            QList<QString> nicks;
+            safeExec(nickQuery);
+            watchQuery(nickQuery);
+            while (nickQuery.next()) {
+                nicks << nickQuery.value(0).toString();
+            }
+            identity.setNicks(nicks);
+            identities << identity;
+        }
+        db.commit();
     }
-    db.commit();
-  }
-  unlock();
-  return identities;
+    unlock();
+    return identities;
 }
 
-NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) {
-  NetworkId networkId;
-
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  bool error = false;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("insert_network"));
-    query.bindValue(":userid", user.toInt());
-    bindNetworkInfo(query, info);
-    lockForWrite();
-    safeExec(query);
-    if(!watchQuery(query)) {
-      db.rollback();
-      error = true;
-    } else {
-      networkId = query.lastInsertId().toInt();
-    }
-  }
-  if(error) {
-    unlock();
-    return NetworkId();
-  }
-
-  {
-    QSqlQuery insertServersQuery(db);
-    insertServersQuery.prepare(queryString("insert_server"));
-    foreach(Network::Server server, info.serverList) {
-      insertServersQuery.bindValue(":userid", user.toInt());
-      insertServersQuery.bindValue(":networkid", networkId.toInt());
-      bindServerInfo(insertServersQuery, server);
-      safeExec(insertServersQuery);
-      if(!watchQuery(insertServersQuery)) {
-        db.rollback();
-        error = true;
-        break;
-      }
-    }
-    if(!error)
-      db.commit();
-  }
-  unlock();
-  if(error)
-    return NetworkId();
-  else
-    return networkId;
-}
-
-void SqliteStorage::bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info) {
-  query.bindValue(":networkname", info.networkName);
-  query.bindValue(":identityid", info.identity.toInt());
-  query.bindValue(":encodingcodec", QString(info.codecForEncoding));
-  query.bindValue(":decodingcodec", QString(info.codecForDecoding));
-  query.bindValue(":servercodec", QString(info.codecForServer));
-  query.bindValue(":userandomserver", info.useRandomServer ? 1 : 0);
-  query.bindValue(":perform", info.perform.join("\n"));
-  query.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0);
-  query.bindValue(":autoidentifyservice", info.autoIdentifyService);
-  query.bindValue(":autoidentifypassword", info.autoIdentifyPassword);
-  query.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0);
-  query.bindValue(":autoreconnectinterval", info.autoReconnectInterval);
-  query.bindValue(":autoreconnectretries", info.autoReconnectRetries);
-  query.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries ? 1 : 0);
-  query.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
-  if(info.networkId.isValid())
-    query.bindValue(":networkid", info.networkId.toInt());
-}
-
-void SqliteStorage::bindServerInfo(QSqlQuery &query, const Network::Server &server) {
-  query.bindValue(":hostname", server.host);
-  query.bindValue(":port", server.port);
-  query.bindValue(":password", server.password);
-  query.bindValue(":ssl", server.useSsl ? 1 : 0);
-  query.bindValue(":sslversion", server.sslVersion);
-  query.bindValue(":useproxy", server.useProxy ? 1 : 0);
-  query.bindValue(":proxytype", server.proxyType);
-  query.bindValue(":proxyhost", server.proxyHost);
-  query.bindValue(":proxyport", server.proxyPort);
-  query.bindValue(":proxyuser", server.proxyUser);
-  query.bindValue(":proxypass", server.proxyPass);
-}
-
-bool SqliteStorage::updateNetwork(UserId user, const NetworkInfo &info) {
-  QSqlDatabase db = logDb();
-  bool error = false;
-  db.transaction();
-
-  {
-    QSqlQuery updateQuery(db);
-    updateQuery.prepare(queryString("update_network"));
-    updateQuery.bindValue(":userid", user.toInt());
-    bindNetworkInfo(updateQuery, info);
+NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo& info)
+{
+    NetworkId networkId;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("insert_network"));
+        query.bindValue(":userid", user.toInt());
+        bindNetworkInfo(query, info);
+        lockForWrite();
+        safeExec(query);
+        if (!watchQuery(query)) {
+            db.rollback();
+            error = true;
+        }
+        else {
+            networkId = query.lastInsertId().toInt();
+        }
+    }
+    if (error) {
+        unlock();
+        return {};
+    }
 
-    lockForWrite();
-    safeExec(updateQuery);
-    if(!watchQuery(updateQuery) || updateQuery.numRowsAffected() != 1) {
-      error = true;
-      db.rollback();
+    {
+        QSqlQuery insertServersQuery(db);
+        insertServersQuery.prepare(queryString("insert_server"));
+        foreach (Network::Server server, info.serverList) {
+            insertServersQuery.bindValue(":userid", user.toInt());
+            insertServersQuery.bindValue(":networkid", networkId.toInt());
+            bindServerInfo(insertServersQuery, server);
+            safeExec(insertServersQuery);
+            if (!watchQuery(insertServersQuery)) {
+                db.rollback();
+                error = true;
+                break;
+            }
+        }
+        if (!error)
+            db.commit();
     }
-  }
-  if(error) {
-    unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery dropServersQuery(db);
-    dropServersQuery.prepare("DELETE FROM ircserver WHERE networkid = :networkid");
-    dropServersQuery.bindValue(":networkid", info.networkId.toInt());
-    safeExec(dropServersQuery);
-    if(!watchQuery(dropServersQuery)) {
-      error = true;
-      db.rollback();
-    }
-  }
-  if(error) {
     unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery insertServersQuery(db);
-    insertServersQuery.prepare(queryString("insert_server"));
-    foreach(Network::Server server, info.serverList) {
-      insertServersQuery.bindValue(":userid", user.toInt());
-      insertServersQuery.bindValue(":networkid", info.networkId.toInt());
-      bindServerInfo(insertServersQuery, server);
-      safeExec(insertServersQuery);
-      if(!watchQuery(insertServersQuery)) {
-        error = true;
-        db.rollback();
-        break;
-      }
-    }
-  }
+    if (error)
+        return {};
+    else
+        return networkId;
+}
 
-  db.commit();
-  unlock();
-  return !error;
+void SqliteStorage::bindNetworkInfo(QSqlQuery& query, const NetworkInfo& info)
+{
+    query.bindValue(":networkname", info.networkName);
+    query.bindValue(":identityid", info.identity.toInt());
+    query.bindValue(":encodingcodec", QString(info.codecForEncoding));
+    query.bindValue(":decodingcodec", QString(info.codecForDecoding));
+    query.bindValue(":servercodec", QString(info.codecForServer));
+    query.bindValue(":userandomserver", info.useRandomServer ? 1 : 0);
+    query.bindValue(":perform", info.perform.join("\n"));
+    query.bindValue(":useautoidentify", info.useAutoIdentify ? 1 : 0);
+    query.bindValue(":autoidentifyservice", info.autoIdentifyService);
+    query.bindValue(":autoidentifypassword", info.autoIdentifyPassword);
+    query.bindValue(":usesasl", info.useSasl ? 1 : 0);
+    query.bindValue(":saslaccount", info.saslAccount);
+    query.bindValue(":saslpassword", info.saslPassword);
+    query.bindValue(":useautoreconnect", info.useAutoReconnect ? 1 : 0);
+    query.bindValue(":autoreconnectinterval", info.autoReconnectInterval);
+    query.bindValue(":autoreconnectretries", info.autoReconnectRetries);
+    query.bindValue(":unlimitedconnectretries", info.unlimitedReconnectRetries ? 1 : 0);
+    query.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
+    // Custom rate limiting
+    query.bindValue(":usecustomessagerate", info.useCustomMessageRate ? 1 : 0);
+    query.bindValue(":messagerateburstsize", info.messageRateBurstSize);
+    query.bindValue(":messageratedelay", info.messageRateDelay);
+    query.bindValue(":unlimitedmessagerate", info.unlimitedMessageRate ? 1 : 0);
+    if (info.networkId.isValid())
+        query.bindValue(":networkid", info.networkId.toInt());
 }
 
-bool SqliteStorage::removeNetwork(UserId user, const NetworkId &networkId) {
-  QSqlDatabase db = logDb();
-  bool error = false;
-  db.transaction();
+void SqliteStorage::bindServerInfo(QSqlQuery& query, const Network::Server& server)
+{
+    query.bindValue(":hostname", server.host);
+    query.bindValue(":port", server.port);
+    query.bindValue(":password", server.password);
+    query.bindValue(":ssl", server.useSsl ? 1 : 0);
+    query.bindValue(":sslversion", server.sslVersion);
+    query.bindValue(":useproxy", server.useProxy ? 1 : 0);
+    query.bindValue(":proxytype", server.proxyType);
+    query.bindValue(":proxyhost", server.proxyHost);
+    query.bindValue(":proxyport", server.proxyPort);
+    query.bindValue(":proxyuser", server.proxyUser);
+    query.bindValue(":proxypass", server.proxyPass);
+    query.bindValue(":sslverify", server.sslVerify ? 1 : 0);
+}
 
-  {
-    QSqlQuery deleteNetworkQuery(db);
-    deleteNetworkQuery.prepare(queryString("delete_network"));
-    deleteNetworkQuery.bindValue(":networkid", networkId.toInt());
-    deleteNetworkQuery.bindValue(":userid", user.toInt());
-    lockForWrite();
-    safeExec(deleteNetworkQuery);
-    if(!watchQuery(deleteNetworkQuery) || deleteNetworkQuery.numRowsAffected() != 1) {
-      error = true;
-      db.rollback();
+bool SqliteStorage::updateNetwork(UserId user, const NetworkInfo& info)
+{
+    QSqlDatabase db = logDb();
+    bool error = false;
+    db.transaction();
+
+    {
+        QSqlQuery updateQuery(db);
+        updateQuery.prepare(queryString("update_network"));
+        updateQuery.bindValue(":userid", user.toInt());
+        bindNetworkInfo(updateQuery, info);
+
+        lockForWrite();
+        safeExec(updateQuery);
+        if (!watchQuery(updateQuery) || updateQuery.numRowsAffected() != 1) {
+            error = true;
+            db.rollback();
+        }
     }
-  }
-  if(error) {
-    unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery deleteBacklogQuery(db);
-    deleteBacklogQuery.prepare(queryString("delete_backlog_for_network"));
-    deleteBacklogQuery.bindValue(":networkid", networkId.toInt());
-    safeExec(deleteBacklogQuery);
-    if(!watchQuery(deleteBacklogQuery)) {
-      db.rollback();
-      error = true;
-    }
-  }
-  if(error) {
-    unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery deleteBuffersQuery(db);
-    deleteBuffersQuery.prepare(queryString("delete_buffers_for_network"));
-    deleteBuffersQuery.bindValue(":networkid", networkId.toInt());
-    safeExec(deleteBuffersQuery);
-    if(!watchQuery(deleteBuffersQuery)) {
-      db.rollback();
-      error = true;
-    }
-  }
-  if(error) {
-    unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery deleteServersQuery(db);
-    deleteServersQuery.prepare(queryString("delete_ircservers_for_network"));
-    deleteServersQuery.bindValue(":networkid", networkId.toInt());
-    safeExec(deleteServersQuery);
-    if(!watchQuery(deleteServersQuery)) {
-      db.rollback();
-      error = true;
-    }
-  }
-  if(error) {
-    unlock();
-    return false;
-  }
-
-  db.commit();
-  unlock();
-  return true;
-}
-
-QList<NetworkInfo> SqliteStorage::networks(UserId user) {
-  QList<NetworkInfo> nets;
-
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  {
-    QSqlQuery networksQuery(db);
-    networksQuery.prepare(queryString("select_networks_for_user"));
-    networksQuery.bindValue(":userid", user.toInt());
-
-    QSqlQuery serversQuery(db);
-    serversQuery.prepare(queryString("select_servers_for_network"));
-
-    lockForRead();
-    safeExec(networksQuery);
-    if(watchQuery(networksQuery)) {
-      while(networksQuery.next()) {
-        NetworkInfo net;
-        net.networkId = networksQuery.value(0).toInt();
-        net.networkName = networksQuery.value(1).toString();
-        net.identity = networksQuery.value(2).toInt();
-        net.codecForServer = networksQuery.value(3).toString().toAscii();
-        net.codecForEncoding = networksQuery.value(4).toString().toAscii();
-        net.codecForDecoding = networksQuery.value(5).toString().toAscii();
-        net.useRandomServer = networksQuery.value(6).toInt() == 1 ? true : false;
-        net.perform = networksQuery.value(7).toString().split("\n");
-        net.useAutoIdentify = networksQuery.value(8).toInt() == 1 ? true : false;
-        net.autoIdentifyService = networksQuery.value(9).toString();
-        net.autoIdentifyPassword = networksQuery.value(10).toString();
-        net.useAutoReconnect = networksQuery.value(11).toInt() == 1 ? true : false;
-        net.autoReconnectInterval = networksQuery.value(12).toUInt();
-        net.autoReconnectRetries = networksQuery.value(13).toInt();
-        net.unlimitedReconnectRetries = networksQuery.value(14).toInt() == 1 ? true : false;
-        net.rejoinChannels = networksQuery.value(15).toInt() == 1 ? true : false;
-
-        serversQuery.bindValue(":networkid", net.networkId.toInt());
-        safeExec(serversQuery);
-        if(!watchQuery(serversQuery)) {
-          nets.clear();
-          break;
-        } else {
-          Network::ServerList servers;
-          while(serversQuery.next()) {
-            Network::Server server;
-            server.host = serversQuery.value(0).toString();
-            server.port = serversQuery.value(1).toUInt();
-            server.password = serversQuery.value(2).toString();
-            server.useSsl = serversQuery.value(3).toInt() == 1 ? true : false;
-            server.sslVersion = serversQuery.value(4).toInt();
-            server.useProxy = serversQuery.value(5).toInt() == 1 ? true : false;
-            server.proxyType = serversQuery.value(6).toInt();
-            server.proxyHost = serversQuery.value(7).toString();
-            server.proxyPort = serversQuery.value(8).toUInt();
-            server.proxyUser = serversQuery.value(9).toString();
-            server.proxyPass = serversQuery.value(10).toString();
-            servers << server;
-          }
-          net.serverList = servers;
-          nets << net;
-        }
-      }
-    }
-  }
-  db.commit();
-  unlock();
-  return nets;
-}
-
-QList<NetworkId> SqliteStorage::connectedNetworks(UserId user) {
-  QList<NetworkId> connectedNets;
-
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_connected_networks"));
-    query.bindValue(":userid", user.toInt());
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-
-    while(query.next()) {
-      connectedNets << query.value(0).toInt();
+    if (error) {
+        unlock();
+        return false;
     }
-    db.commit();
-  }
-  unlock();
-  return connectedNets;
-}
 
-void SqliteStorage::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+    {
+        QSqlQuery dropServersQuery(db);
+        dropServersQuery.prepare("DELETE FROM ircserver WHERE networkid = :networkid");
+        dropServersQuery.bindValue(":networkid", info.networkId.toInt());
+        safeExec(dropServersQuery);
+        if (!watchQuery(dropServersQuery)) {
+            error = true;
+            db.rollback();
+        }
+    }
+    if (error) {
+        unlock();
+        return false;
+    }
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_network_connected"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
-    query.bindValue(":connected", isConnected ? 1 : 0);
+    {
+        QSqlQuery insertServersQuery(db);
+        insertServersQuery.prepare(queryString("insert_server"));
+        foreach (Network::Server server, info.serverList) {
+            insertServersQuery.bindValue(":userid", user.toInt());
+            insertServersQuery.bindValue(":networkid", info.networkId.toInt());
+            bindServerInfo(insertServersQuery, server);
+            safeExec(insertServersQuery);
+            if (!watchQuery(insertServersQuery)) {
+                error = true;
+                db.rollback();
+                break;
+            }
+        }
+    }
 
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
     db.commit();
-  }
-  unlock();
+    unlock();
+    return !error;
 }
 
-QHash<QString, QString> SqliteStorage::persistentChannels(UserId user, const NetworkId &networkId) {
-  QHash<QString, QString> persistentChans;
-
-  QSqlDatabase db = logDb();
-  db.transaction();
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_persistent_channels"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
+bool SqliteStorage::removeNetwork(UserId user, const NetworkId& networkId)
+{
+    QSqlDatabase db = logDb();
+    bool error = false;
+    db.transaction();
+
+    {
+        QSqlQuery deleteNetworkQuery(db);
+        deleteNetworkQuery.prepare(queryString("delete_network"));
+        deleteNetworkQuery.bindValue(":networkid", networkId.toInt());
+        deleteNetworkQuery.bindValue(":userid", user.toInt());
+        lockForWrite();
+        safeExec(deleteNetworkQuery);
+        if (!watchQuery(deleteNetworkQuery) || deleteNetworkQuery.numRowsAffected() != 1) {
+            error = true;
+            db.rollback();
+        }
+    }
+    if (error) {
+        unlock();
+        return false;
+    }
 
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-    while(query.next()) {
-      persistentChans[query.value(0).toString()] = query.value(1).toString();
+    {
+        QSqlQuery deleteBacklogQuery(db);
+        deleteBacklogQuery.prepare(queryString("delete_backlog_for_network"));
+        deleteBacklogQuery.bindValue(":networkid", networkId.toInt());
+        safeExec(deleteBacklogQuery);
+        if (!watchQuery(deleteBacklogQuery)) {
+            db.rollback();
+            error = true;
+        }
+    }
+    if (error) {
+        unlock();
+        return false;
     }
-  }
-  unlock();
-  return persistentChans;
-}
 
-void SqliteStorage::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+    {
+        QSqlQuery deleteBuffersQuery(db);
+        deleteBuffersQuery.prepare(queryString("delete_buffers_for_network"));
+        deleteBuffersQuery.bindValue(":networkid", networkId.toInt());
+        safeExec(deleteBuffersQuery);
+        if (!watchQuery(deleteBuffersQuery)) {
+            db.rollback();
+            error = true;
+        }
+    }
+    if (error) {
+        unlock();
+        return false;
+    }
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_buffer_persistent_channel"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkId", networkId.toInt());
-    query.bindValue(":buffercname", channel.toLower());
-    query.bindValue(":joined", isJoined ? 1 : 0);
+    {
+        QSqlQuery deleteServersQuery(db);
+        deleteServersQuery.prepare(queryString("delete_ircservers_for_network"));
+        deleteServersQuery.bindValue(":networkid", networkId.toInt());
+        safeExec(deleteServersQuery);
+        if (!watchQuery(deleteServersQuery)) {
+            db.rollback();
+            error = true;
+        }
+    }
+    if (error) {
+        unlock();
+        return false;
+    }
 
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
     db.commit();
-  }
-  unlock();
+    unlock();
+    return true;
 }
 
-void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_buffer_set_channel_key"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkId", networkId.toInt());
-    query.bindValue(":buffercname", channel.toLower());
-    query.bindValue(":key", key);
-
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
+QList<NetworkInfo> SqliteStorage::networks(UserId user)
+{
+    QList<NetworkInfo> nets;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery networksQuery(db);
+        networksQuery.prepare(queryString("select_networks_for_user"));
+        networksQuery.bindValue(":userid", user.toInt());
+
+        QSqlQuery serversQuery(db);
+        serversQuery.prepare(queryString("select_servers_for_network"));
+
+        lockForRead();
+        safeExec(networksQuery);
+        if (watchQuery(networksQuery)) {
+            while (networksQuery.next()) {
+                NetworkInfo net;
+                net.networkId = networksQuery.value(0).toInt();
+                net.networkName = networksQuery.value(1).toString();
+                net.identity = networksQuery.value(2).toInt();
+                net.codecForServer = networksQuery.value(3).toString().toLatin1();
+                net.codecForEncoding = networksQuery.value(4).toString().toLatin1();
+                net.codecForDecoding = networksQuery.value(5).toString().toLatin1();
+                net.useRandomServer = networksQuery.value(6).toInt() == 1 ? true : false;
+                net.perform = networksQuery.value(7).toString().split("\n");
+                net.useAutoIdentify = networksQuery.value(8).toInt() == 1 ? true : false;
+                net.autoIdentifyService = networksQuery.value(9).toString();
+                net.autoIdentifyPassword = networksQuery.value(10).toString();
+                net.useAutoReconnect = networksQuery.value(11).toInt() == 1 ? true : false;
+                net.autoReconnectInterval = networksQuery.value(12).toUInt();
+                net.autoReconnectRetries = networksQuery.value(13).toInt();
+                net.unlimitedReconnectRetries = networksQuery.value(14).toInt() == 1 ? true : false;
+                net.rejoinChannels = networksQuery.value(15).toInt() == 1 ? true : false;
+                net.useSasl = networksQuery.value(16).toInt() == 1 ? true : false;
+                net.saslAccount = networksQuery.value(17).toString();
+                net.saslPassword = networksQuery.value(18).toString();
+                // Custom rate limiting
+                net.useCustomMessageRate = networksQuery.value(19).toInt() == 1 ? true : false;
+                net.messageRateBurstSize = networksQuery.value(20).toUInt();
+                net.messageRateDelay = networksQuery.value(21).toUInt();
+                net.unlimitedMessageRate = networksQuery.value(22).toInt() == 1 ? true : false;
+
+                serversQuery.bindValue(":networkid", net.networkId.toInt());
+                safeExec(serversQuery);
+                if (!watchQuery(serversQuery)) {
+                    nets.clear();
+                    break;
+                }
+                else {
+                    Network::ServerList servers;
+                    while (serversQuery.next()) {
+                        Network::Server server;
+                        server.host = serversQuery.value(0).toString();
+                        server.port = serversQuery.value(1).toUInt();
+                        server.password = serversQuery.value(2).toString();
+                        server.useSsl = serversQuery.value(3).toInt() == 1 ? true : false;
+                        server.sslVersion = serversQuery.value(4).toInt();
+                        server.useProxy = serversQuery.value(5).toInt() == 1 ? true : false;
+                        server.proxyType = serversQuery.value(6).toInt();
+                        server.proxyHost = serversQuery.value(7).toString();
+                        server.proxyPort = serversQuery.value(8).toUInt();
+                        server.proxyUser = serversQuery.value(9).toString();
+                        server.proxyPass = serversQuery.value(10).toString();
+                        server.sslVerify = serversQuery.value(11).toInt() == 1 ? true : false;
+                        servers << server;
+                    }
+                    net.serverList = servers;
+                    nets << net;
+                }
+            }
+        }
+    }
     db.commit();
-  }
-  unlock();
+    unlock();
+    return nets;
 }
 
-QString SqliteStorage::awayMessage(UserId user, NetworkId networkId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+QList<NetworkId> SqliteStorage::connectedNetworks(UserId user)
+{
+    QList<NetworkId> connectedNets;
 
-  QString awayMsg;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_network_awaymsg"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
+    QSqlDatabase db = logDb();
+    db.transaction();
 
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-    if(query.first())
-      awayMsg = query.value(0).toString();
-    db.commit();
-  }
-  unlock();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_connected_networks"));
+        query.bindValue(":userid", user.toInt());
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
 
-  return awayMsg;
+        while (query.next()) {
+            connectedNets << query.value(0).toInt();
+        }
+        db.commit();
+    }
+    unlock();
+    return connectedNets;
 }
 
-void SqliteStorage::setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_network_set_awaymsg"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
-    query.bindValue(":awaymsg", awayMsg);
-
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
-    db.commit();
-  }
-  unlock();
+void SqliteStorage::setNetworkConnected(UserId user, const NetworkId& networkId, bool isConnected)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_network_connected"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":connected", isConnected ? 1 : 0);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
 }
 
-QString SqliteStorage::userModes(UserId user, NetworkId networkId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  QString modes;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_network_usermode"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
-
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-    if(query.first())
-      modes = query.value(0).toString();
-    db.commit();
-  }
-  unlock();
+QHash<QString, QString> SqliteStorage::persistentChannels(UserId user, const NetworkId& networkId)
+{
+    QHash<QString, QString> persistentChans;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_persistent_channels"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        while (query.next()) {
+            persistentChans[query.value(0).toString()] = query.value(1).toString();
+        }
+    }
+    unlock();
+    return persistentChans;
+}
 
-  return modes;
+void SqliteStorage::setChannelPersistent(UserId user, const NetworkId& networkId, const QString& channel, bool isJoined)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_persistent_channel"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":buffercname", channel.toLower());
+        query.bindValue(":joined", isJoined ? 1 : 0);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
 }
 
-void SqliteStorage::setUserModes(UserId user, NetworkId networkId, const QString &userModes) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId& networkId, const QString& channel, const QString& key)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_set_channel_key"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":buffercname", channel.toLower());
+        query.bindValue(":key", key);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
+}
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_network_set_usermode"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":networkid", networkId.toInt());
-    query.bindValue(":usermode", userModes);
+QString SqliteStorage::awayMessage(UserId user, NetworkId networkId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    QString awayMsg;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_network_awaymsg"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        if (query.first())
+            awayMsg = query.value(0).toString();
+        db.commit();
+    }
+    unlock();
 
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
-    db.commit();
-  }
-  unlock();
+    return awayMsg;
 }
 
-BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer, bool create) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  BufferInfo bufferInfo;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_bufferByName"));
-    query.bindValue(":networkid", networkId.toInt());
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":buffercname", buffer.toLower());
+void SqliteStorage::setAwayMessage(UserId user, NetworkId networkId, const QString& awayMsg)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_network_set_awaymsg"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":awaymsg", awayMsg);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
+}
 
-    lockForRead();
-    safeExec(query);
+QString SqliteStorage::userModes(UserId user, NetworkId networkId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    QString modes;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_network_usermode"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        if (query.first())
+            modes = query.value(0).toString();
+        db.commit();
+    }
+    unlock();
 
-    if(query.first()) {
-      bufferInfo = BufferInfo(query.value(0).toInt(), networkId, (BufferInfo::Type)query.value(1).toInt(), 0, buffer);
-      if(query.next()) {
-        qCritical() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
-        qCritical() << "         Query:" << query.lastQuery();
-        qCritical() << "  bound Values:";
-        QList<QVariant> list = query.boundValues().values();
-        for (int i = 0; i < list.size(); ++i)
-          qCritical() << i << ":" << list.at(i).toString().toAscii().data();
-        Q_ASSERT(false);
-      }
-    } else if(create) {
-      // let's create the buffer
-      QSqlQuery createQuery(db);
-      createQuery.prepare(queryString("insert_buffer"));
-      createQuery.bindValue(":userid", user.toInt());
-      createQuery.bindValue(":networkid", networkId.toInt());
-      createQuery.bindValue(":buffertype", (int)type);
-      createQuery.bindValue(":buffername", buffer);
-      createQuery.bindValue(":buffercname", buffer.toLower());
-
-      unlock();
-      lockForWrite();
-      safeExec(createQuery);
-      watchQuery(createQuery);
-      bufferInfo = BufferInfo(createQuery.lastInsertId().toInt(), networkId, type, 0, buffer);
-    }
-  }
-  db.commit();
-  unlock();
-  return bufferInfo;
-}
-
-BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId &bufferId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  BufferInfo bufferInfo;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_buffer_by_id"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":bufferid", bufferId.toInt());
+    return modes;
+}
 
-    lockForRead();
-    safeExec(query);
+void SqliteStorage::setUserModes(UserId user, NetworkId networkId, const QString& userModes)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_network_set_usermode"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":usermode", userModes);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
+}
 
-    if(watchQuery(query) && query.first()) {
-      bufferInfo = BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), 0, query.value(4).toString());
-      Q_ASSERT(!query.next());
+BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId& networkId, BufferInfo::Type type, const QString& buffer, bool create)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    BufferInfo bufferInfo;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_bufferByName"));
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":buffercname", buffer.toLower());
+
+        lockForRead();
+        safeExec(query);
+
+        if (query.first()) {
+            bufferInfo = BufferInfo(query.value(0).toInt(), networkId, (BufferInfo::Type)query.value(1).toInt(), 0, buffer);
+            if (query.next()) {
+                qCritical() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
+                qCritical() << "         Query:" << query.lastQuery();
+                qCritical() << "  bound Values:";
+                QList<QVariant> list = query.boundValues().values();
+                for (int i = 0; i < list.size(); ++i)
+                    qCritical() << i << ":" << list.at(i).toString().toLatin1().data();
+                Q_ASSERT(false);
+            }
+        }
+        else if (create) {
+            // let's create the buffer
+            QSqlQuery createQuery(db);
+            createQuery.prepare(queryString("insert_buffer"));
+            createQuery.bindValue(":userid", user.toInt());
+            createQuery.bindValue(":networkid", networkId.toInt());
+            createQuery.bindValue(":buffertype", (int)type);
+            createQuery.bindValue(":buffername", buffer);
+            createQuery.bindValue(":buffercname", buffer.toLower());
+            createQuery.bindValue(":joined", type & BufferInfo::ChannelBuffer ? 1 : 0);
+
+            unlock();
+            lockForWrite();
+            safeExec(createQuery);
+            watchQuery(createQuery);
+            bufferInfo = BufferInfo(createQuery.lastInsertId().toInt(), networkId, type, 0, buffer);
+        }
     }
     db.commit();
-  }
-  unlock();
-  return bufferInfo;
+    unlock();
+    return bufferInfo;
 }
 
-QList<BufferInfo> SqliteStorage::requestBuffers(UserId user) {
-  QList<BufferInfo> bufferlist;
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId& bufferId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    BufferInfo bufferInfo;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_by_id"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":bufferid", bufferId.toInt());
+
+        lockForRead();
+        safeExec(query);
+
+        if (watchQuery(query) && query.first()) {
+            bufferInfo = BufferInfo(query.value(0).toInt(),
+                                    query.value(1).toInt(),
+                                    (BufferInfo::Type)query.value(2).toInt(),
+                                    0,
+                                    query.value(4).toString());
+            Q_ASSERT(!query.next());
+        }
+        db.commit();
+    }
+    unlock();
+    return bufferInfo;
+}
 
-  QSqlDatabase db = logDb();
-  db.transaction();
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user)
+{
+    QList<BufferInfo> bufferlist;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffers"));
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        while (query.next()) {
+            bufferlist << BufferInfo(query.value(0).toInt(),
+                                     query.value(1).toInt(),
+                                     (BufferInfo::Type)query.value(2).toInt(),
+                                     query.value(3).toInt(),
+                                     query.value(4).toString());
+        }
+        db.commit();
+    }
+    unlock();
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_buffers"));
-    query.bindValue(":userid", user.toInt());
+    return bufferlist;
+}
 
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-    while(query.next()) {
-      bufferlist << BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), query.value(3).toInt(), query.value(4).toString());
+QList<BufferId> SqliteStorage::requestBufferIdsForNetwork(UserId user, NetworkId networkId)
+{
+    QList<BufferId> bufferList;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffers_for_network"));
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        while (query.next()) {
+            bufferList << BufferId(query.value(0).toInt());
+        }
+        db.commit();
     }
-    db.commit();
-  }
-  unlock();
+    unlock();
 
-  return bufferlist;
+    return bufferList;
 }
 
-QList<BufferId> SqliteStorage::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
-  QList<BufferId> bufferList;
+bool SqliteStorage::removeBuffer(const UserId& user, const BufferId& bufferId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
 
-  QSqlDatabase db = logDb();
-  db.transaction();
+    bool error = false;
+    {
+        QSqlQuery delBufferQuery(db);
+        delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+        delBufferQuery.bindValue(":bufferid", bufferId.toInt());
+        delBufferQuery.bindValue(":userid", user.toInt());
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_buffers_for_network"));
-    query.bindValue(":networkid", networkId.toInt());
-    query.bindValue(":userid", user.toInt());
+        lockForWrite();
+        safeExec(delBufferQuery);
 
-    lockForRead();
-    safeExec(query);
-    watchQuery(query);
-    while(query.next()) {
-      bufferList << BufferId(query.value(0).toInt());
+        error = (!watchQuery(delBufferQuery) || delBufferQuery.numRowsAffected() != 1);
     }
-    db.commit();
-  }
-  unlock();
 
-  return bufferList;
+    if (error) {
+        db.rollback();
+        unlock();
+        return false;
+    }
+
+    {
+        QSqlQuery delBacklogQuery(db);
+        delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
+        delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
+
+        safeExec(delBacklogQuery);
+        error = !watchQuery(delBacklogQuery);
+    }
+
+    if (error) {
+        db.rollback();
+    }
+    else {
+        db.commit();
+    }
+    unlock();
+    return !error;
 }
 
-bool SqliteStorage::removeBuffer(const UserId &user, const BufferId &bufferId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+bool SqliteStorage::renameBuffer(const UserId& user, const BufferId& bufferId, const QString& newName)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_name"));
+        query.bindValue(":buffername", newName);
+        query.bindValue(":buffercname", newName.toLower());
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":userid", user.toInt());
+
+        lockForWrite();
+        safeExec(query);
+
+        error = query.lastError().isValid();
+        // unexepcted error occured (19 == constraint violation)
+        if (error && query.lastError().nativeErrorCode() != QLatin1String{"19"}) {
+            watchQuery(query);
+        }
+        else {
+            error |= (query.numRowsAffected() != 1);
+        }
+    }
+    if (error) {
+        db.rollback();
+    }
+    else {
+        db.commit();
+    }
+    unlock();
+    return !error;
+}
 
-  bool error = false;
-  {
-    QSqlQuery delBufferQuery(db);
-    delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
-    delBufferQuery.bindValue(":bufferid", bufferId.toInt());
-    delBufferQuery.bindValue(":userid", user.toInt());
+bool SqliteStorage::mergeBuffersPermanently(const UserId& user, const BufferId& bufferId1, const BufferId& bufferId2)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery checkQuery(db);
+        checkQuery.prepare(queryString("select_buffers_for_merge"));
+        checkQuery.bindValue(":oldbufferid", bufferId2.toInt());
+        checkQuery.bindValue(":newbufferid", bufferId1.toInt());
+        checkQuery.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(checkQuery);
+        error = (!checkQuery.first() || checkQuery.value(0).toInt() != 2);
+    }
+    if (error) {
+        db.rollback();
+        unlock();
+        return false;
+    }
 
-    lockForWrite();
-    safeExec(delBufferQuery);
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_backlog_bufferid"));
+        query.bindValue(":oldbufferid", bufferId2.toInt());
+        query.bindValue(":newbufferid", bufferId1.toInt());
+        safeExec(query);
+        error = !watchQuery(query);
+    }
+    if (error) {
+        db.rollback();
+        unlock();
+        return false;
+    }
 
-    error = (!watchQuery(delBufferQuery) || delBufferQuery.numRowsAffected() != 1);
-  }
+    {
+        QSqlQuery delBufferQuery(db);
+        delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
+        delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
+        delBufferQuery.bindValue(":userid", user.toInt());
+        safeExec(delBufferQuery);
+        error = !watchQuery(delBufferQuery);
+    }
 
-  if(error) {
-    db.rollback();
+    if (error) {
+        db.rollback();
+    }
+    else {
+        db.commit();
+    }
     unlock();
-    return false;
-  }
+    return !error;
+}
 
-  {
-    QSqlQuery delBacklogQuery(db);
-    delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
-    delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
+void SqliteStorage::setBufferLastSeenMsg(UserId user, const BufferId& bufferId, const MsgId& msgId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_lastseen"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":lastseenmsgid", msgId.toQint64());
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+    }
+    db.commit();
+    unlock();
+}
 
-    safeExec(delBacklogQuery);
-    error = !watchQuery(delBacklogQuery);
-  }
+QHash<BufferId, MsgId> SqliteStorage::bufferLastSeenMsgIds(UserId user)
+{
+    QHash<BufferId, MsgId> lastSeenHash;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_lastseen_messages"));
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        error = !watchQuery(query);
+        if (!error) {
+            while (query.next()) {
+                lastSeenHash[query.value(0).toInt()] = query.value(1).toLongLong();
+            }
+        }
+    }
 
-  if(error) {
-    db.rollback();
-  } else {
     db.commit();
-  }
-  unlock();
-  return !error;
+    unlock();
+    return lastSeenHash;
 }
 
-bool SqliteStorage::renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  bool error = false;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_buffer_name"));
-    query.bindValue(":buffername", newName);
-    query.bindValue(":buffercname", newName.toLower());
-    query.bindValue(":bufferid", bufferId.toInt());
-    query.bindValue(":userid", user.toInt());
+void SqliteStorage::setBufferMarkerLineMsg(UserId user, const BufferId& bufferId, const MsgId& msgId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_markerlinemsgid"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":markerlinemsgid", msgId.toQint64());
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+    }
+    db.commit();
+    unlock();
+}
 
-    lockForWrite();
-    safeExec(query);
+QHash<BufferId, MsgId> SqliteStorage::bufferMarkerLineMsgIds(UserId user)
+{
+    QHash<BufferId, MsgId> markerLineHash;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_markerlinemsgids"));
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        error = !watchQuery(query);
+        if (!error) {
+            while (query.next()) {
+                markerLineHash[query.value(0).toInt()] = query.value(1).toLongLong();
+            }
+        }
+    }
 
-    error = query.lastError().isValid();
-    // unexepcted error occured (19 == constraint violation)
-    if(error && query.lastError().number() != 19) {
-      watchQuery(query);
-    } else {
-      error |= (query.numRowsAffected() != 1);
-    }
-  }
-  if(error) {
-    db.rollback();
-  } else {
     db.commit();
-  }
-  unlock();
-  return !error;
-}
-
-bool SqliteStorage::mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) {
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  bool error = false;
-  {
-    QSqlQuery checkQuery(db);
-    checkQuery.prepare(queryString("select_buffers_for_merge"));
-    checkQuery.bindValue(":oldbufferid", bufferId2.toInt());
-    checkQuery.bindValue(":newbufferid", bufferId1.toInt());
-    checkQuery.bindValue(":userid", user.toInt());
-
-    lockForRead();
-    safeExec(checkQuery);
-    error = (!checkQuery.first() || checkQuery.value(0).toInt() != 2);
-  }
-  if(error) {
-    db.rollback();
     unlock();
-    return false;
-  }
+    return markerLineHash;
+}
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_backlog_bufferid"));
-    query.bindValue(":oldbufferid", bufferId2.toInt());
-    query.bindValue(":newbufferid", bufferId1.toInt());
-    safeExec(query);
-    error = !watchQuery(query);
-  }
-  if(error) {
-    db.rollback();
+void SqliteStorage::setBufferActivity(UserId user, BufferId bufferId, Message::Types bufferActivity)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_bufferactivity"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":bufferactivity", (int)bufferActivity);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+    }
+    db.commit();
     unlock();
-    return false;
-  }
-
-  {
-    QSqlQuery delBufferQuery(db);
-    delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
-    delBufferQuery.bindValue(":bufferid", bufferId2.toInt());
-    delBufferQuery.bindValue(":userid", user.toInt());
-    safeExec(delBufferQuery);
-    error = !watchQuery(delBufferQuery);
-  }
-
-  if(error) {
-    db.rollback();
-  } else {
+}
+
+QHash<BufferId, Message::Types> SqliteStorage::bufferActivities(UserId user)
+{
+    QHash<BufferId, Message::Types> bufferActivityHash;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_bufferactivities"));
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        error = !watchQuery(query);
+        if (!error) {
+            while (query.next()) {
+                bufferActivityHash[query.value(0).toInt()] = Message::Types(query.value(1).toInt());
+            }
+        }
+    }
+
     db.commit();
-  }
-  unlock();
-  return !error;
+    unlock();
+    return bufferActivityHash;
 }
 
-void SqliteStorage::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+Message::Types SqliteStorage::bufferActivity(BufferId bufferId, MsgId lastSeenMsgId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    Message::Types result = Message::Types(nullptr);
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_bufferactivity"));
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
+
+        lockForRead();
+        safeExec(query);
+        if (query.first())
+            result = Message::Types(query.value(0).toInt());
+    }
 
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("update_buffer_lastseen"));
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":bufferid", bufferId.toInt());
-    query.bindValue(":lastseenmsgid", msgId.toInt());
+    db.commit();
+    unlock();
+    return result;
+}
 
-    lockForWrite();
-    safeExec(query);
-    watchQuery(query);
-  }
-  db.commit();
-  unlock();
+QHash<QString, QByteArray> SqliteStorage::bufferCiphers(UserId user, const NetworkId& networkId)
+{
+    QHash<QString, QByteArray> bufferCiphers;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_ciphers"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        while (query.next()) {
+            bufferCiphers[query.value(0).toString()] = QByteArray::fromHex(query.value(1).toString().toUtf8());
+        }
+    }
+    unlock();
+    return bufferCiphers;
 }
 
-QHash<BufferId, MsgId> SqliteStorage::bufferLastSeenMsgIds(UserId user) {
-  QHash<BufferId, MsgId> lastSeenHash;
+void SqliteStorage::setBufferCipher(UserId user, const NetworkId& networkId, const QString& bufferName, const QByteArray& cipher)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_cipher"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":networkid", networkId.toInt());
+        query.bindValue(":buffercname", bufferName.toLower());
+        query.bindValue(":cipher", QString(cipher.toHex()));
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+        db.commit();
+    }
+    unlock();
+}
 
-  QSqlDatabase db = logDb();
-  db.transaction();
+void SqliteStorage::setHighlightCount(UserId user, BufferId bufferId, int count)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("update_buffer_highlightcount"));
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":highlightcount", count);
+
+        lockForWrite();
+        safeExec(query);
+        watchQuery(query);
+    }
+    db.commit();
+    unlock();
+}
 
-  bool error = false;
-  {
-    QSqlQuery query(db);
-    query.prepare(queryString("select_buffer_lastseen_messages"));
-    query.bindValue(":userid", user.toInt());
+QHash<BufferId, int> SqliteStorage::highlightCounts(UserId user)
+{
+    QHash<BufferId, int> highlightCountHash;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_highlightcounts"));
+        query.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(query);
+        error = !watchQuery(query);
+        if (!error) {
+            while (query.next()) {
+                highlightCountHash[query.value(0).toInt()] = query.value(1).toInt();
+            }
+        }
+    }
 
-    lockForRead();
-    safeExec(query);
-    error = !watchQuery(query);
-    if(!error) {
-      while(query.next()) {
-        lastSeenHash[query.value(0).toInt()] = query.value(1).toInt();
-      }
+    db.commit();
+    unlock();
+    return highlightCountHash;
+}
+
+int SqliteStorage::highlightCount(BufferId bufferId, MsgId lastSeenMsgId)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    int result = 0;
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_buffer_highlightcount"));
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":lastseenmsgid", lastSeenMsgId.toQint64());
+
+        lockForRead();
+        safeExec(query);
+        if (query.first())
+            result = query.value(0).toInt();
     }
-  }
 
-  db.commit();
-  unlock();
-  return lastSeenHash;
+    db.commit();
+    unlock();
+    return result;
 }
 
-bool SqliteStorage::logMessage(Message &msg) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+bool SqliteStorage::logMessage(Message& msg)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    {
+        QSqlQuery logMessageQuery(db);
+        logMessageQuery.prepare(queryString("insert_message"));
+        // As of SQLite schema version 31, timestamps are stored in milliseconds instead of
+        // seconds.  This nets us more precision as well as simplifying 64-bit time.
+        logMessageQuery.bindValue(":time", msg.timestamp().toMSecsSinceEpoch());
+        logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
+        logMessageQuery.bindValue(":type", msg.type());
+        logMessageQuery.bindValue(":flags", (int)msg.flags());
+        logMessageQuery.bindValue(":sender", msg.sender());
+        logMessageQuery.bindValue(":realname", msg.realName());
+        logMessageQuery.bindValue(":avatarurl", msg.avatarUrl());
+        logMessageQuery.bindValue(":senderprefixes", msg.senderPrefixes());
+        logMessageQuery.bindValue(":message", msg.contents());
+
+        lockForWrite();
+        safeExec(logMessageQuery);
 
-  bool error = false;
-  {
-    QSqlQuery logMessageQuery(db);
-    logMessageQuery.prepare(queryString("insert_message"));
+        if (logMessageQuery.lastError().isValid()) {
+            // constraint violation - must be NOT NULL constraint - probably the sender is missing...
+            if (logMessageQuery.lastError().nativeErrorCode() == QLatin1String{"19"}) {
+                QSqlQuery addSenderQuery(db);
+                addSenderQuery.prepare(queryString("insert_sender"));
+                addSenderQuery.bindValue(":sender", msg.sender());
+                addSenderQuery.bindValue(":realname", msg.realName());
+                addSenderQuery.bindValue(":avatarurl", msg.avatarUrl());
+                safeExec(addSenderQuery);
+                safeExec(logMessageQuery);
+                error = !watchQuery(logMessageQuery);
+            }
+            else {
+                watchQuery(logMessageQuery);
+            }
+        }
+        if (!error) {
+            MsgId msgId = logMessageQuery.lastInsertId().toLongLong();
+            if (msgId.isValid()) {
+                msg.setMsgId(msgId);
+            }
+            else {
+                error = true;
+            }
+        }
+    }
+
+    if (error) {
+        db.rollback();
+    }
+    else {
+        db.commit();
+    }
 
-    logMessageQuery.bindValue(":time", msg.timestamp().toTime_t());
-    logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
-    logMessageQuery.bindValue(":type", msg.type());
-    logMessageQuery.bindValue(":flags", (int)msg.flags());
-    logMessageQuery.bindValue(":sender", msg.sender());
-    logMessageQuery.bindValue(":message", msg.contents());
+    unlock();
+    return !error;
+}
 
-    lockForWrite();
-    safeExec(logMessageQuery);
+bool SqliteStorage::logMessages(MessageList& msgs)
+{
+    QSqlDatabase db = logDb();
+    db.transaction();
 
-    if(logMessageQuery.lastError().isValid()) {
-      // constraint violation - must be NOT NULL constraint - probably the sender is missing...
-      if(logMessageQuery.lastError().number() == 19) {
+    {
+        QSet<SenderData> senders;
         QSqlQuery addSenderQuery(db);
         addSenderQuery.prepare(queryString("insert_sender"));
-        addSenderQuery.bindValue(":sender", msg.sender());
-        safeExec(addSenderQuery);
-        safeExec(logMessageQuery);
-        error = !watchQuery(logMessageQuery);
-      } else {
-        watchQuery(logMessageQuery);
-      }
-    }
-    if(!error) {
-      MsgId msgId = logMessageQuery.lastInsertId().toInt();
-      if(msgId.isValid()) {
-        msg.setMsgId(msgId);
-      } else {
-        error = true;
-      }
-    }
-  }
-
-  if(error) {
-    db.rollback();
-  } else {
-    db.commit();
-  }
+        lockForWrite();
+        for (int i = 0; i < msgs.count(); i++) {
+            auto& msg = msgs.at(i);
+            SenderData sender = {msg.sender(), msg.realName(), msg.avatarUrl()};
+            if (senders.contains(sender))
+                continue;
+            senders << sender;
+
+            addSenderQuery.bindValue(":sender", sender.sender);
+            addSenderQuery.bindValue(":realname", sender.realname);
+            addSenderQuery.bindValue(":avatarurl", sender.avatarurl);
+            safeExec(addSenderQuery);
+        }
+    }
 
-  unlock();
-  return !error;
-}
+    bool error = false;
+    {
+        QSqlQuery logMessageQuery(db);
+        logMessageQuery.prepare(queryString("insert_message"));
+        for (int i = 0; i < msgs.count(); i++) {
+            Message& msg = msgs[i];
+            // As of SQLite schema version 31, timestamps are stored in milliseconds instead of
+            // seconds.  This nets us more precision as well as simplifying 64-bit time.
+            logMessageQuery.bindValue(":time", msg.timestamp().toMSecsSinceEpoch());
+            logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
+            logMessageQuery.bindValue(":type", msg.type());
+            logMessageQuery.bindValue(":flags", (int)msg.flags());
+            logMessageQuery.bindValue(":sender", msg.sender());
+            logMessageQuery.bindValue(":realname", msg.realName());
+            logMessageQuery.bindValue(":avatarurl", msg.avatarUrl());
+            logMessageQuery.bindValue(":senderprefixes", msg.senderPrefixes());
+            logMessageQuery.bindValue(":message", msg.contents());
+
+            safeExec(logMessageQuery);
+            if (!watchQuery(logMessageQuery)) {
+                error = true;
+                break;
+            }
+            else {
+                msg.setMsgId(logMessageQuery.lastInsertId().toLongLong());
+            }
+        }
+    }
 
-bool SqliteStorage::logMessages(MessageList &msgs) {
-  QSqlDatabase db = logDb();
-  db.transaction();
+    if (error) {
+        db.rollback();
+        unlock();
+        // we had a rollback in the db so we need to reset all msgIds
+        for (int i = 0; i < msgs.count(); i++) {
+            msgs[i].setMsgId(MsgId());
+        }
+    }
+    else {
+        db.commit();
+        unlock();
+    }
+    return !error;
+}
 
-  {
-    QSet<QString> senders;
-    QSqlQuery addSenderQuery(db);
-    addSenderQuery.prepare(queryString("insert_sender"));
-    lockForWrite();
-    for(int i = 0; i < msgs.count(); i++) {
-      const QString &sender = msgs.at(i).sender();
-      if(senders.contains(sender))
-        continue;
-      senders << sender;
-
-      addSenderQuery.bindValue(":sender", sender);
-      safeExec(addSenderQuery);
-    }
-  }
-
-  bool error = false;
-  {
-    QSqlQuery logMessageQuery(db);
-    logMessageQuery.prepare(queryString("insert_message"));
-    for(int i = 0; i < msgs.count(); i++) {
-      Message &msg = msgs[i];
-
-      logMessageQuery.bindValue(":time", msg.timestamp().toTime_t());
-      logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
-      logMessageQuery.bindValue(":type", msg.type());
-      logMessageQuery.bindValue(":flags", (int)msg.flags());
-      logMessageQuery.bindValue(":sender", msg.sender());
-      logMessageQuery.bindValue(":message", msg.contents());
-
-      safeExec(logMessageQuery);
-      if(!watchQuery(logMessageQuery)) {
-        error = true;
-        break;
-      } else {
-        msg.setMsgId(logMessageQuery.lastInsertId().toInt());
-      }
+QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId first, MsgId last, int limit)
+{
+    QList<Message> messagelist;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    BufferInfo bufferInfo;
+    {
+        // code duplication from getBufferInfo:
+        // this is due to the impossibility of nesting transactions and recursive locking
+        QSqlQuery bufferInfoQuery(db);
+        bufferInfoQuery.prepare(queryString("select_buffer_by_id"));
+        bufferInfoQuery.bindValue(":userid", user.toInt());
+        bufferInfoQuery.bindValue(":bufferid", bufferId.toInt());
+
+        lockForRead();
+        safeExec(bufferInfoQuery);
+        error = !watchQuery(bufferInfoQuery) || !bufferInfoQuery.first();
+        if (!error) {
+            bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(),
+                                    bufferInfoQuery.value(1).toInt(),
+                                    (BufferInfo::Type)bufferInfoQuery.value(2).toInt(),
+                                    0,
+                                    bufferInfoQuery.value(4).toString());
+            error = !bufferInfo.isValid();
+        }
+    }
+    if (error) {
+        db.rollback();
+        unlock();
+        return messagelist;
     }
-  }
 
-  if(error) {
-    db.rollback();
+    {
+        QSqlQuery query(db);
+        if (last == -1 && first == -1) {
+            query.prepare(queryString("select_messagesNewestK"));
+        }
+        else if (last == -1) {
+            query.prepare(queryString("select_messagesNewerThan"));
+            query.bindValue(":firstmsg", first.toQint64());
+        }
+        else {
+            query.prepare(queryString("select_messagesRange"));
+            query.bindValue(":lastmsg", last.toQint64());
+            query.bindValue(":firstmsg", first.toQint64());
+        }
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":limit", limit);
+
+        safeExec(query);
+        watchQuery(query);
+
+        while (query.next()) {
+            Message msg(
+                // As of SQLite schema version 31, timestamps are stored in milliseconds instead of
+                // seconds.  This nets us more precision as well as simplifying 64-bit time.
+                QDateTime::fromMSecsSinceEpoch(query.value(1).toLongLong()),
+                bufferInfo,
+                (Message::Type)query.value(2).toInt(),
+                query.value(8).toString(),
+                query.value(4).toString(),
+                query.value(5).toString(),
+                query.value(6).toString(),
+                query.value(7).toString(),
+                (Message::Flags)query.value(3).toInt());
+            msg.setMsgId(query.value(0).toLongLong());
+            messagelist << msg;
+        }
+    }
+    db.commit();
     unlock();
-    // we had a rollback in the db so we need to reset all msgIds
-    for(int i = 0; i < msgs.count(); i++) {
-      msgs[i].setMsgId(MsgId());
+
+    return messagelist;
+}
+
+QList<Message> SqliteStorage::requestMsgsFiltered(
+    UserId user, BufferId bufferId, MsgId first, MsgId last, int limit, Message::Types type, Message::Flags flags)
+{
+    QList<Message> messagelist;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    bool error = false;
+    BufferInfo bufferInfo;
+    {
+        // code dupication from getBufferInfo:
+        // this is due to the impossibility of nesting transactions and recursive locking
+        QSqlQuery bufferInfoQuery(db);
+        bufferInfoQuery.prepare(queryString("select_buffer_by_id"));
+        bufferInfoQuery.bindValue(":userid", user.toInt());
+        bufferInfoQuery.bindValue(":bufferid", bufferId.toInt());
+
+        lockForRead();
+        safeExec(bufferInfoQuery);
+        error = !watchQuery(bufferInfoQuery) || !bufferInfoQuery.first();
+        if (!error) {
+            bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(),
+                                    bufferInfoQuery.value(1).toInt(),
+                                    (BufferInfo::Type)bufferInfoQuery.value(2).toInt(),
+                                    0,
+                                    bufferInfoQuery.value(4).toString());
+            error = !bufferInfo.isValid();
+        }
+    }
+    if (error) {
+        db.rollback();
+        unlock();
+        return messagelist;
+    }
+
+    {
+        QSqlQuery query(db);
+        if (last == -1 && first == -1) {
+            query.prepare(queryString("select_messagesNewestK_filtered"));
+        }
+        else if (last == -1) {
+            query.prepare(queryString("select_messagesNewerThan_filtered"));
+            query.bindValue(":firstmsg", first.toQint64());
+        }
+        else {
+            query.prepare(queryString("select_messagesRange_filtered"));
+            query.bindValue(":lastmsg", last.toQint64());
+            query.bindValue(":firstmsg", first.toQint64());
+        }
+        query.bindValue(":bufferid", bufferId.toInt());
+        query.bindValue(":limit", limit);
+        int typeRaw = type;
+        query.bindValue(":type", typeRaw);
+        int flagsRaw = flags;
+        query.bindValue(":flags", flagsRaw);
+
+        safeExec(query);
+        watchQuery(query);
+
+        while (query.next()) {
+            Message msg(
+                // As of SQLite schema version 31, timestamps are stored in milliseconds
+                // instead of seconds.  This nets us more precision as well as simplifying
+                // 64-bit time.
+                QDateTime::fromMSecsSinceEpoch(query.value(1).toLongLong()),
+                bufferInfo,
+                (Message::Type)query.value(2).toInt(),
+                query.value(8).toString(),
+                query.value(4).toString(),
+                query.value(5).toString(),
+                query.value(6).toString(),
+                query.value(7).toString(),
+                Message::Flags{query.value(3).toInt()});
+            msg.setMsgId(query.value(0).toLongLong());
+            messagelist << msg;
+        }
     }
-  } else {
     db.commit();
     unlock();
-  }
-  return !error;
-}
-
-QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, MsgId first, MsgId last, int limit) {
-  QList<Message> messagelist;
-
-  QSqlDatabase db = logDb();
-  db.transaction();
-
-  bool error = false;
-  BufferInfo bufferInfo;
-  {
-    // code dupication from getBufferInfo:
-    // this is due to the impossibility of nesting transactions and recursive locking
-    QSqlQuery bufferInfoQuery(db);
-    bufferInfoQuery.prepare(queryString("select_buffer_by_id"));
-    bufferInfoQuery.bindValue(":userid", user.toInt());
-    bufferInfoQuery.bindValue(":bufferid", bufferId.toInt());
-
-    lockForRead();
-    safeExec(bufferInfoQuery);
-    error = !watchQuery(bufferInfoQuery) || !bufferInfoQuery.first();
-    if(!error) {
-      bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(), bufferInfoQuery.value(1).toInt(), (BufferInfo::Type)bufferInfoQuery.value(2).toInt(), 0, bufferInfoQuery.value(4).toString());
-      error = !bufferInfo.isValid();
-    }
-  }
-  if(error) {
-    db.rollback();
+
+    return messagelist;
+}
+
+QList<Message> SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId last, int limit)
+{
+    QList<Message> messagelist;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    QHash<BufferId, BufferInfo> bufferInfoHash;
+    {
+        QSqlQuery bufferInfoQuery(db);
+        bufferInfoQuery.prepare(queryString("select_buffers"));
+        bufferInfoQuery.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(bufferInfoQuery);
+        watchQuery(bufferInfoQuery);
+        while (bufferInfoQuery.next()) {
+            BufferInfo bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(),
+                                               bufferInfoQuery.value(1).toInt(),
+                                               (BufferInfo::Type)bufferInfoQuery.value(2).toInt(),
+                                               bufferInfoQuery.value(3).toInt(),
+                                               bufferInfoQuery.value(4).toString());
+            bufferInfoHash[bufferInfo.bufferId()] = bufferInfo;
+        }
+
+        QSqlQuery query(db);
+        if (last == -1) {
+            query.prepare(queryString("select_messagesAllNew"));
+        }
+        else {
+            query.prepare(queryString("select_messagesAll"));
+            query.bindValue(":lastmsg", last.toQint64());
+        }
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":firstmsg", first.toQint64());
+        query.bindValue(":limit", limit);
+        safeExec(query);
+
+        watchQuery(query);
+
+        while (query.next()) {
+            Message msg(
+                // As of SQLite schema version 31, timestamps are stored in milliseconds instead of
+                // seconds.  This nets us more precision as well as simplifying 64-bit time.
+                QDateTime::fromMSecsSinceEpoch(query.value(2).toLongLong()),
+                bufferInfoHash[query.value(1).toInt()],
+                (Message::Type)query.value(3).toInt(),
+                query.value(9).toString(),
+                query.value(5).toString(),
+                query.value(6).toString(),
+                query.value(7).toString(),
+                query.value(8).toString(),
+                (Message::Flags)query.value(4).toInt());
+            msg.setMsgId(query.value(0).toLongLong());
+            messagelist << msg;
+        }
+    }
+    db.commit();
     unlock();
     return messagelist;
-  }
+}
 
-  {
-    QSqlQuery query(db);
-    if(last == -1 && first == -1) {
-      query.prepare(queryString("select_messagesNewestK"));
-    } else if(last == -1) {
-      query.prepare(queryString("select_messagesNewerThan"));
-      query.bindValue(":firstmsg", first.toInt());
-    } else {
-      query.prepare(queryString("select_messages"));
-      query.bindValue(":lastmsg", last.toInt());
-      query.bindValue(":firstmsg", first.toInt());
-    }
-    query.bindValue(":bufferid", bufferId.toInt());
-    query.bindValue(":limit", limit);
+QList<Message> SqliteStorage::requestAllMsgsFiltered(UserId user, MsgId first, MsgId last, int limit, Message::Types type, Message::Flags flags)
+{
+    QList<Message> messagelist;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+
+    QHash<BufferId, BufferInfo> bufferInfoHash;
+    {
+        QSqlQuery bufferInfoQuery(db);
+        bufferInfoQuery.prepare(queryString("select_buffers"));
+        bufferInfoQuery.bindValue(":userid", user.toInt());
+
+        lockForRead();
+        safeExec(bufferInfoQuery);
+        watchQuery(bufferInfoQuery);
+        while (bufferInfoQuery.next()) {
+            BufferInfo bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(),
+                                               bufferInfoQuery.value(1).toInt(),
+                                               (BufferInfo::Type)bufferInfoQuery.value(2).toInt(),
+                                               bufferInfoQuery.value(3).toInt(),
+                                               bufferInfoQuery.value(4).toString());
+            bufferInfoHash[bufferInfo.bufferId()] = bufferInfo;
+        }
 
-    safeExec(query);
-    watchQuery(query);
+        QSqlQuery query(db);
+        if (last == -1) {
+            query.prepare(queryString("select_messagesAllNew_filtered"));
+        }
+        else {
+            query.prepare(queryString("select_messagesAll_filtered"));
+            query.bindValue(":lastmsg", last.toQint64());
+        }
+        query.bindValue(":userid", user.toInt());
+        query.bindValue(":firstmsg", first.toQint64());
+        query.bindValue(":limit", limit);
+        int typeRaw = type;
+        query.bindValue(":type", typeRaw);
+        int flagsRaw = flags;
+        query.bindValue(":flags", flagsRaw);
+        safeExec(query);
+
+        watchQuery(query);
+
+        while (query.next()) {
+            Message msg(
+                // As of SQLite schema version 31, timestamps are stored in milliseconds
+                // instead of seconds.  This nets us more precision as well as simplifying
+                // 64-bit time.
+                QDateTime::fromMSecsSinceEpoch(query.value(2).toLongLong()),
+                bufferInfoHash[query.value(1).toInt()],
+                (Message::Type)query.value(3).toInt(),
+                query.value(9).toString(),
+                query.value(5).toString(),
+                query.value(6).toString(),
+                query.value(7).toString(),
+                query.value(8).toString(),
+                Message::Flags{query.value(4).toInt()});
+            msg.setMsgId(query.value(0).toLongLong());
+            messagelist << msg;
+        }
+    }
+    db.commit();
+    unlock();
+    return messagelist;
+}
 
-    while(query.next()) {
-      Message msg(QDateTime::fromTime_t(query.value(1).toInt()),
-                  bufferInfo,
-                  (Message::Type)query.value(2).toUInt(),
-                  query.value(5).toString(),
-                  query.value(4).toString(),
-                  (Message::Flags)query.value(3).toUInt());
-      msg.setMsgId(query.value(0).toInt());
-      messagelist << msg;
+QMap<UserId, QString> SqliteStorage::getAllAuthUserNames()
+{
+    QMap<UserId, QString> authusernames;
+
+    QSqlDatabase db = logDb();
+    db.transaction();
+    {
+        QSqlQuery query(db);
+        query.prepare(queryString("select_all_authusernames"));
+
+        lockForRead();
+        safeExec(query);
+        watchQuery(query);
+        while (query.next()) {
+            authusernames[query.value(0).toInt()] = query.value(1).toString();
+        }
     }
-  }
-  db.commit();
-  unlock();
+    db.commit();
+    unlock();
+    return authusernames;
+}
 
-  return messagelist;
+QString SqliteStorage::backlogFile()
+{
+    return Quassel::configDirPath() + "quassel-storage.sqlite";
 }
 
-QList<Message> SqliteStorage::requestAllMsgs(UserId user, MsgId first, MsgId last, int limit) {
-  QList<Message> messagelist;
+bool SqliteStorage::safeExec(QSqlQuery& query, int retryCount)
+{
+    query.exec();
 
-  QSqlDatabase db = logDb();
-  db.transaction();
+    if (!query.lastError().isValid())
+        return true;
 
-  QHash<BufferId, BufferInfo> bufferInfoHash;
-  {
-    QSqlQuery bufferInfoQuery(db);
-    bufferInfoQuery.prepare(queryString("select_buffers"));
-    bufferInfoQuery.bindValue(":userid", user.toInt());
+    QString nativeErrorCode = query.lastError().nativeErrorCode();
 
-    lockForRead();
-    safeExec(bufferInfoQuery);
-    watchQuery(bufferInfoQuery);
-    while(bufferInfoQuery.next()) {
-      BufferInfo bufferInfo = BufferInfo(bufferInfoQuery.value(0).toInt(), bufferInfoQuery.value(1).toInt(), (BufferInfo::Type)bufferInfoQuery.value(2).toInt(), bufferInfoQuery.value(3).toInt(), bufferInfoQuery.value(4).toString());
-      bufferInfoHash[bufferInfo.bufferId()] = bufferInfo;
+    // SQLITE_BUSY         5   /* The database file is locked */
+    // SQLITE_LOCKED       6   /* A table in the database is locked */
+    if (nativeErrorCode == QLatin1String{"5"} || nativeErrorCode == QLatin1String{"6"}) {
+        if (retryCount < _maxRetryCount)
+            return safeExec(query, retryCount + 1);
     }
+    return false;
+}
 
-    QSqlQuery query(db);
-    if(last == -1) {
-      query.prepare(queryString("select_messagesAllNew"));
-    } else {
-      query.prepare(queryString("select_messagesAll"));
-      query.bindValue(":lastmsg", last.toInt());
-    }
-    query.bindValue(":userid", user.toInt());
-    query.bindValue(":firstmsg", first.toInt());
-    query.bindValue(":limit", limit);
-    safeExec(query);
+// ========================================
+//  SqliteMigration
+// ========================================
+SqliteMigrationReader::SqliteMigrationReader()
+    : SqliteStorage()
+{}
 
-    watchQuery(query);
+void SqliteMigrationReader::setMaxId(MigrationObject mo)
+{
+    QString queryString;
+    switch (mo) {
+    case Sender:
+        queryString = "SELECT max(senderid) FROM sender";
+        break;
+    case Backlog:
+        queryString = "SELECT max(messageid) FROM backlog";
+        break;
+    default:
+        _maxId = 0;
+        return;
+    }
+    QSqlQuery query = logDb().exec(queryString);
+    query.first();
+    _maxId = query.value(0).toLongLong();
+}
 
-    while(query.next()) {
-      Message msg(QDateTime::fromTime_t(query.value(2).toInt()),
-                  bufferInfoHash[query.value(1).toInt()],
-                  (Message::Type)query.value(3).toUInt(),
-                  query.value(6).toString(),
-                  query.value(5).toString(),
-                  (Message::Flags)query.value(4).toUInt());
-      msg.setMsgId(query.value(0).toInt());
-      messagelist << msg;
+bool SqliteMigrationReader::prepareQuery(MigrationObject mo)
+{
+    setMaxId(mo);
+
+    switch (mo) {
+    case QuasselUser:
+        newQuery(queryString("migrate_read_quasseluser"), logDb());
+        break;
+    case Identity:
+        newQuery(queryString("migrate_read_identity"), logDb());
+        break;
+    case IdentityNick:
+        newQuery(queryString("migrate_read_identity_nick"), logDb());
+        break;
+    case Network:
+        newQuery(queryString("migrate_read_network"), logDb());
+        break;
+    case Buffer:
+        newQuery(queryString("migrate_read_buffer"), logDb());
+        break;
+    case Sender:
+        newQuery(queryString("migrate_read_sender"), logDb());
+        bindValue(0, 0);
+        bindValue(1, stepSize());
+        break;
+    case Backlog:
+        newQuery(queryString("migrate_read_backlog"), logDb());
+        bindValue(0, 0);
+        bindValue(1, stepSize());
+        break;
+    case IrcServer:
+        newQuery(queryString("migrate_read_ircserver"), logDb());
+        break;
+    case UserSetting:
+        newQuery(queryString("migrate_read_usersetting"), logDb());
+        break;
+    case CoreState:
+        newQuery(queryString("migrate_read_corestate"), logDb());
+        break;
     }
-  }
-  db.commit();
-  unlock();
-  return messagelist;
+    return exec();
+}
+
+bool SqliteMigrationReader::readMo(QuasselUserMO& user)
+{
+    if (!next())
+        return false;
+
+    user.id = value(0).toInt();
+    user.username = value(1).toString();
+    user.password = value(2).toString();
+    user.hashversion = value(3).toInt();
+    user.authenticator = value(4).toString();
+    return true;
 }
 
-QString SqliteStorage::backlogFile() {
-  return Quassel::configDirPath() + "quassel-storage.sqlite";
+bool SqliteMigrationReader::readMo(IdentityMO& identity)
+{
+    if (!next())
+        return false;
+
+    identity.id = value(0).toInt();
+    identity.userid = value(1).toInt();
+    identity.identityname = value(2).toString();
+    identity.realname = value(3).toString();
+    identity.awayNick = value(4).toString();
+    identity.awayNickEnabled = value(5).toInt() == 1 ? true : false;
+    identity.awayReason = value(6).toString();
+    identity.awayReasonEnabled = value(7).toInt() == 1 ? true : false;
+    identity.autoAwayEnabled = value(8).toInt() == 1 ? true : false;
+    identity.autoAwayTime = value(9).toInt();
+    identity.autoAwayReason = value(10).toString();
+    identity.autoAwayReasonEnabled = value(11).toInt() == 1 ? true : false;
+    identity.detachAwayEnabled = value(12).toInt() == 1 ? true : false;
+    identity.detachAwayReason = value(13).toString();
+    identity.detachAwayReasonEnabled = value(14).toInt() == 1 ? true : false;
+    identity.ident = value(15).toString();
+    identity.kickReason = value(16).toString();
+    identity.partReason = value(17).toString();
+    identity.quitReason = value(18).toString();
+    identity.sslCert = value(19).toByteArray();
+    identity.sslKey = value(20).toByteArray();
+    return true;
 }
 
-bool SqliteStorage::safeExec(QSqlQuery &query, int retryCount) {
-  query.exec();
+bool SqliteMigrationReader::readMo(IdentityNickMO& identityNick)
+{
+    if (!next())
+        return false;
 
-  if(!query.lastError().isValid())
+    identityNick.nickid = value(0).toInt();
+    identityNick.identityId = value(1).toInt();
+    identityNick.nick = value(2).toString();
     return true;
+}
 
-  switch(query.lastError().number()) {
-  case 5: // SQLITE_BUSY         5   /* The database file is locked */
-  case 6: // SQLITE_LOCKED       6   /* A table in the database is locked */
-    if(retryCount < _maxRetryCount)
-      return safeExec(query, retryCount + 1);
-  default:
-    return false;
-  }
+bool SqliteMigrationReader::readMo(NetworkMO& network)
+{
+    if (!next())
+        return false;
+
+    network.networkid = value(0).toInt();
+    network.userid = value(1).toInt();
+    network.networkname = value(2).toString();
+    network.identityid = value(3).toInt();
+    network.encodingcodec = value(4).toString();
+    network.decodingcodec = value(5).toString();
+    network.servercodec = value(6).toString();
+    network.userandomserver = value(7).toInt() == 1 ? true : false;
+    network.perform = value(8).toString();
+    network.useautoidentify = value(9).toInt() == 1 ? true : false;
+    network.autoidentifyservice = value(10).toString();
+    network.autoidentifypassword = value(11).toString();
+    network.useautoreconnect = value(12).toInt() == 1 ? true : false;
+    network.autoreconnectinterval = value(13).toInt();
+    network.autoreconnectretries = value(14).toInt();
+    network.unlimitedconnectretries = value(15).toInt() == 1 ? true : false;
+    network.rejoinchannels = value(16).toInt() == 1 ? true : false;
+    network.connected = value(17).toInt() == 1 ? true : false;
+    network.usermode = value(18).toString();
+    network.awaymessage = value(19).toString();
+    network.attachperform = value(20).toString();
+    network.detachperform = value(21).toString();
+    network.usesasl = value(22).toInt() == 1 ? true : false;
+    network.saslaccount = value(23).toString();
+    network.saslpassword = value(24).toString();
+    // Custom rate limiting
+    network.usecustommessagerate = value(25).toInt() == 1 ? true : false;
+    network.messagerateburstsize = value(26).toInt();
+    network.messageratedelay = value(27).toUInt();
+    network.unlimitedmessagerate = value(28).toInt() == 1 ? true : false;
+    return true;
 }
 
+bool SqliteMigrationReader::readMo(BufferMO& buffer)
+{
+    if (!next())
+        return false;
+
+    buffer.bufferid = value(0).toInt();
+    buffer.userid = value(1).toInt();
+    buffer.groupid = value(2).toInt();
+    buffer.networkid = value(3).toInt();
+    buffer.buffername = value(4).toString();
+    buffer.buffercname = value(5).toString();
+    buffer.buffertype = value(6).toInt();
+    buffer.lastmsgid = value(7).toLongLong();
+    buffer.lastseenmsgid = value(8).toLongLong();
+    buffer.markerlinemsgid = value(9).toLongLong();
+    buffer.bufferactivity = value(10).toInt();
+    buffer.highlightcount = value(11).toInt();
+    buffer.key = value(12).toString();
+    buffer.joined = value(13).toInt() == 1 ? true : false;
+    buffer.cipher = value(14).toString();
+    return true;
+}
 
-// ========================================
-//  SqliteMigration
-// ========================================
-SqliteMigrationReader::SqliteMigrationReader()
-  : SqliteStorage(),
-    _maxId(0)
-{
-}
-
-void SqliteMigrationReader::setMaxId(MigrationObject mo) {
-  QString queryString;
-  switch(mo) {
-  case Sender:
-    queryString = "SELECT max(senderid) FROM sender";
-    break;
-  case Backlog:
-    queryString = "SELECT max(messageid) FROM backlog";
-    break;
-  default:
-    _maxId = 0;
-    return;
-  }
-  QSqlQuery query = logDb().exec(queryString);
-  query.first();
-  _maxId = query.value(0).toInt();
-}
-
-bool SqliteMigrationReader::prepareQuery(MigrationObject mo) {
-  setMaxId(mo);
-
-  switch(mo) {
-  case QuasselUser:
-    newQuery(queryString("migrate_read_quasseluser"), logDb());
-    break;
-  case Identity:
-    newQuery(queryString("migrate_read_identity"), logDb());
-    break;
-  case IdentityNick:
-    newQuery(queryString("migrate_read_identity_nick"), logDb());
-    break;
-  case Network:
-    newQuery(queryString("migrate_read_network"), logDb());
-    break;
-  case Buffer:
-    newQuery(queryString("migrate_read_buffer"), logDb());
-    break;
-  case Sender:
-    newQuery(queryString("migrate_read_sender"), logDb());
-    bindValue(0, 0);
-    bindValue(1, stepSize());
-    break;
-  case Backlog:
-    newQuery(queryString("migrate_read_backlog"), logDb());
-    bindValue(0, 0);
-    bindValue(1, stepSize());
-    break;
-  case IrcServer:
-    newQuery(queryString("migrate_read_ircserver"), logDb());
-    break;
-  case UserSetting:
-    newQuery(queryString("migrate_read_usersetting"), logDb());
-    break;
-  }
-  return exec();
-}
-
-bool SqliteMigrationReader::readMo(QuasselUserMO &user) {
-  if(!next())
-    return false;
+bool SqliteMigrationReader::readMo(SenderMO& sender)
+{
+    int skipSteps = 0;
+    while (!next()) {
+        if (sender.senderId < _maxId) {
+            bindValue(0, sender.senderId + (skipSteps * stepSize()));
+            bindValue(1, sender.senderId + ((skipSteps + 1) * stepSize()));
+            skipSteps++;
+            if (!exec())
+                return false;
+        }
+        else {
+            return false;
+        }
+    }
 
-  user.id = value(0).toInt();
-  user.username = value(1).toString();
-  user.password = value(2).toString();
-  return true;
+    sender.senderId = value(0).toLongLong();
+    sender.sender = value(1).toString();
+    sender.realname = value(2).toString();
+    sender.avatarurl = value(3).toString();
+    return true;
 }
 
-bool SqliteMigrationReader::readMo(IdentityMO &identity) {
-  if(!next())
-    return false;
+bool SqliteMigrationReader::readMo(BacklogMO& backlog)
+{
+    qint64 skipSteps = 0;
+    while (!next()) {
+        if (backlog.messageid < _maxId) {
+            bindValue(0, backlog.messageid.toQint64() + (skipSteps * stepSize()));
+            bindValue(1, backlog.messageid.toQint64() + ((skipSteps + 1) * stepSize()));
+            skipSteps++;
+            if (!exec())
+                return false;
+        }
+        else {
+            return false;
+        }
+    }
 
-  identity.id = value(0).toInt();
-  identity.userid = value(1).toInt();
-  identity.identityname = value(2).toString();
-  identity.realname = value(3).toString();
-  identity.awayNick = value(4).toString();
-  identity.awayNickEnabled = value(5).toInt() == 1 ? true : false;
-  identity.awayReason = value(6).toString();
-  identity.awayReasonEnabled = value(7).toInt() == 1 ? true : false;
-  identity.autoAwayEnabled = value(8).toInt() == 1 ? true : false;
-  identity.autoAwayTime = value(9).toInt();
-  identity.autoAwayReason = value(10).toString();
-  identity.autoAwayReasonEnabled = value(11).toInt() == 1 ? true : false;
-  identity.detachAwayEnabled = value(12).toInt() == 1 ? true : false;
-  identity.detachAwayReason = value(13).toString();
-  identity.detchAwayReasonEnabled = value(14).toInt() == 1 ? true : false;
-  identity.ident = value(15).toString();
-  identity.kickReason = value(16).toString();
-  identity.partReason = value(17).toString();
-  identity.quitReason = value(18).toString();
-  identity.sslCert = value(19).toByteArray();
-  identity.sslKey = value(20).toByteArray();
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(IdentityNickMO &identityNick) {
-  if(!next())
-    return false;
+    backlog.messageid = value(0).toLongLong();
+    // As of SQLite schema version 31, timestamps are stored in milliseconds instead of
+    // seconds.  This nets us more precision as well as simplifying 64-bit time.
+    backlog.time = QDateTime::fromMSecsSinceEpoch(value(1).toLongLong()).toUTC();
+    backlog.bufferid = value(2).toInt();
+    backlog.type = value(3).toInt();
+    backlog.flags = value(4).toInt();
+    backlog.senderid = value(5).toLongLong();
+    backlog.senderprefixes = value(6).toString();
+    backlog.message = value(7).toString();
+    return true;
+}
 
-  identityNick.nickid = value(0).toInt();
-  identityNick.identityId = value(1).toInt();
-  identityNick.nick = value(2).toString();
-  return true;
+bool SqliteMigrationReader::readMo(IrcServerMO& ircserver)
+{
+    if (!next())
+        return false;
+
+    ircserver.serverid = value(0).toInt();
+    ircserver.userid = value(1).toInt();
+    ircserver.networkid = value(2).toInt();
+    ircserver.hostname = value(3).toString();
+    ircserver.port = value(4).toInt();
+    ircserver.password = value(5).toString();
+    ircserver.ssl = value(6).toInt() == 1 ? true : false;
+    ircserver.sslversion = value(7).toInt();
+    ircserver.useproxy = value(8).toInt() == 1 ? true : false;
+    ircserver.proxytype = value(9).toInt();
+    ircserver.proxyhost = value(10).toString();
+    ircserver.proxyport = value(11).toInt();
+    ircserver.proxyuser = value(12).toString();
+    ircserver.proxypass = value(13).toString();
+    ircserver.sslverify = value(14).toInt() == 1 ? true : false;
+    return true;
 }
 
-bool SqliteMigrationReader::readMo(NetworkMO &network) {
-  if(!next())
-    return false;
+bool SqliteMigrationReader::readMo(UserSettingMO& userSetting)
+{
+    if (!next())
+        return false;
 
-  network.networkid = value(0).toInt();
-  network.userid = value(1).toInt();
-  network.networkname = value(2).toString();
-  network.identityid = value(3).toInt();
-  network.encodingcodec = value(4).toString();
-  network.decodingcodec = value(5).toString();
-  network.servercodec = value(6).toString();
-  network.userandomserver = value(7).toInt() == 1 ? true : false;
-  network.perform = value(8).toString();
-  network.useautoidentify = value(9).toInt() == 1 ? true : false;
-  network.autoidentifyservice = value(10).toString();
-  network.autoidentifypassword = value(11).toString();
-  network.useautoreconnect = value(12).toInt() == 1 ? true : false;
-  network.autoreconnectinterval = value(13).toInt();
-  network.autoreconnectretries = value(14).toInt();
-  network.unlimitedconnectretries = value(15).toInt() == 1 ? true : false;
-  network.rejoinchannels = value(16).toInt() == 1 ? true : false;
-  network.connected = value(17).toInt() == 1 ? true : false;
-  network.usermode = value(18).toString();
-  network.awaymessage = value(19).toString();
-  network.attachperform = value(20).toString();
-  network.detachperform = value(21).toString();
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(BufferMO &buffer) {
-  if(!next())
-    return false;
+    userSetting.userid = value(0).toInt();
+    userSetting.settingname = value(1).toString();
+    userSetting.settingvalue = value(2).toByteArray();
 
-  buffer.bufferid = value(0).toInt();
-  buffer.userid = value(1).toInt();
-  buffer.groupid = value(2).toInt();
-  buffer.networkid = value(3).toInt();
-  buffer.buffername = value(4).toString();
-  buffer.buffercname = value(5).toString();
-  buffer.buffertype = value(6).toInt();
-  buffer.lastseenmsgid = value(7).toInt();
-  buffer.key = value(8).toString();
-  buffer.joined = value(9).toInt() == 1 ? true : false;
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(SenderMO &sender) {
-  int skipSteps = 0;
-  while(!next()) {
-    if(sender.senderId < _maxId) {
-      bindValue(0, sender.senderId + (skipSteps * stepSize()));
-      bindValue(1, sender.senderId + ((skipSteps + 1) * stepSize()));
-      skipSteps++;
-      if(!exec())
-       return false;
-    } else {
-      return false;
-    }
-  }
-
-  sender.senderId = value(0).toInt();
-  sender.sender = value(1).toString();
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(BacklogMO &backlog) {
-  int skipSteps = 0;
-  while(!next()) {
-    if(backlog.messageid < _maxId) {
-      bindValue(0, backlog.messageid.toInt() + (skipSteps * stepSize()));
-      bindValue(1, backlog.messageid.toInt() + ((skipSteps + 1) * stepSize()));
-      skipSteps++;
-      if(!exec())
-       return false;
-    } else {
-      return false;
-    }
-  }
-
-  backlog.messageid = value(0).toInt();
-  backlog.time = QDateTime::fromTime_t(value(1).toInt()).toUTC();
-  backlog.bufferid = value(2).toInt();
-  backlog.type = value(3).toInt();
-  backlog.flags = value(4).toInt();
-  backlog.senderid = value(5).toInt();
-  backlog.message = value(6).toString();
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(IrcServerMO &ircserver) {
-  if(!next())
-    return false;
+    return true;
+}
 
-  ircserver.serverid = value(0).toInt();
-  ircserver.userid = value(1).toInt();
-  ircserver.networkid = value(2).toInt();
-  ircserver.hostname = value(3).toString();
-  ircserver.port = value(4).toInt();
-  ircserver.password = value(5).toString();
-  ircserver.ssl = value(6).toInt() == 1 ? true : false;
-  ircserver.sslversion = value(7).toInt();
-  ircserver.useproxy = value(8).toInt() == 1 ? true : false;
-  ircserver.proxytype = value(9).toInt();
-  ircserver.proxyhost = value(10).toString();
-  ircserver.proxyport = value(11).toInt();
-  ircserver.proxyuser = value(12).toString();
-  ircserver.proxypass = value(13).toString();
-  return true;
-}
-
-bool SqliteMigrationReader::readMo(UserSettingMO &userSetting) {
-  if(!next())
-    return false;
+bool SqliteMigrationReader::readMo(CoreStateMO& coreState)
+{
+    if (!next())
+        return false;
 
-  userSetting.userid = value(0).toInt();
-  userSetting.settingname = value(1).toString();
-  userSetting.settingvalue = value(2).toByteArray();
+    coreState.key = value(0).toString();
+    coreState.value = value(1).toByteArray();
 
-  return true;
+    return true;
 }