X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fsqlitestorage.cpp;h=6462a97e630b3b9265e25b6587f981c507d7c288;hb=49813fa53b34ffa35837d30fd022e2fc72f57eb5;hp=ad610a03907e8aecf9316d9fe2db86ba92a823cc;hpb=46da9706f425bf10d05a325b95ec7cea53443061;p=quassel.git

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index ad610a03..6462a97e 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -1037,6 +1037,7 @@ BufferInfo SqliteStorage::bufferInfo(UserId user, const NetworkId &networkId, Bu
       createQuery.bindValue(":buffertype", (int)type);
       createQuery.bindValue(":buffername", buffer);
       createQuery.bindValue(":buffercname", buffer.toLower());
+      createQuery.bindValue(":joined", type & BufferInfo::ChannelBuffer ? 1 : 0);
 
       unlock();
       lockForWrite();
@@ -1297,6 +1298,52 @@ QHash<BufferId, MsgId> SqliteStorage::bufferLastSeenMsgIds(UserId user) {
   return lastSeenHash;
 }
 
+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.toInt());
+
+    lockForWrite();
+    safeExec(query);
+    watchQuery(query);
+  }
+  db.commit();
+  unlock();
+}
+
+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).toInt();
+      }
+    }
+  }
+
+  db.commit();
+  unlock();
+  return markerLineHash;
+}
+
 bool SqliteStorage::logMessage(Message &msg) {
   QSqlDatabase db = logDb();
   db.transaction();
@@ -1698,6 +1745,7 @@ bool SqliteMigrationReader::readMo(BufferMO &buffer) {
   buffer.buffercname = value(5).toString();
   buffer.buffertype = value(6).toInt();
   buffer.lastseenmsgid = value(7).toInt();
+  buffer.markerlinemsgid = value(8).toInt();
   buffer.key = value(8).toString();
   buffer.joined = value(9).toInt() == 1 ? true : false;
   return true;