X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=1c432a487d06aa43df081e76caef5084f62a3196;hp=32f579ea07107fbe41bc48e1d4b57d45fc884ae0;hb=HEAD;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp
index 32f579ea..b95e868b 100644
--- a/src/common/buffersyncer.cpp
+++ b/src/common/buffersyncer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,18 +26,25 @@ BufferSyncer::BufferSyncer(QObject* parent)
     : SyncableObject(parent)
 {}
 
-BufferSyncer::BufferSyncer(QHash<BufferId, MsgId> lastSeenMsg,
+BufferSyncer::BufferSyncer(QHash<BufferId, MsgId> lastMsg,
+                           QHash<BufferId, MsgId> lastSeenMsg,
                            QHash<BufferId, MsgId> markerLines,
                            QHash<BufferId, Message::Types> activities,
                            QHash<BufferId, int> highlightCounts,
                            QObject* parent)
     : SyncableObject(parent)
+    , _lastMsg(std::move(lastMsg))
     , _lastSeenMsg(std::move(lastSeenMsg))
     , _markerLines(std::move(markerLines))
     , _bufferActivities(std::move(activities))
     , _highlightCounts(std::move(highlightCounts))
 {}
 
+MsgId BufferSyncer::lastMsg(BufferId buffer) const
+{
+    return _lastMsg.value(buffer, MsgId());
+}
+
 MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const
 {
     return _lastSeenMsg.value(buffer, MsgId());
@@ -77,12 +84,32 @@ bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId& msgId)
     return true;
 }
 
+QVariantList BufferSyncer::initLastMsg() const
+{
+    QVariantList list;
+    QHash<BufferId, MsgId>::const_iterator iter = _lastMsg.constBegin();
+    while (iter != _lastMsg.constEnd()) {
+        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<MsgId>(iter.value());
+        ++iter;
+    }
+    return list;
+}
+
+void BufferSyncer::initSetLastMsg(const QVariantList& list)
+{
+    _lastMsg.clear();
+    Q_ASSERT(list.count() % 2 == 0);
+    for (int i = 0; i < list.count(); i += 2) {
+        setLastMsg(list.at(i).value<BufferId>(), list.at(i + 1).value<MsgId>());
+    }
+}
+
 QVariantList BufferSyncer::initLastSeenMsg() const
 {
     QVariantList list;
     QHash<BufferId, MsgId>::const_iterator iter = _lastSeenMsg.constBegin();
     while (iter != _lastSeenMsg.constEnd()) {
-        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<MsgId>(iter.value());
+        list << QVariant::fromValue(iter.key()) << QVariant::fromValue(iter.value());
         ++iter;
     }
     return list;
@@ -102,7 +129,7 @@ QVariantList BufferSyncer::initMarkerLines() const
     QVariantList list;
     QHash<BufferId, MsgId>::const_iterator iter = _markerLines.constBegin();
     while (iter != _markerLines.constEnd()) {
-        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<MsgId>(iter.value());
+        list << QVariant::fromValue(iter.key()) << QVariant::fromValue(iter.value());
         ++iter;
     }
     return list;
@@ -122,7 +149,7 @@ QVariantList BufferSyncer::initActivities() const
     QVariantList list;
     auto iter = _bufferActivities.constBegin();
     while (iter != _bufferActivities.constEnd()) {
-        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<int>((int)iter.value());
+        list << QVariant::fromValue(iter.key()) << QVariant::fromValue((int)iter.value());
         ++iter;
     }
     return list;
@@ -144,6 +171,8 @@ Message::Types BufferSyncer::activity(BufferId buffer) const
 
 void BufferSyncer::removeBuffer(BufferId buffer)
 {
+    if (_lastMsg.contains(buffer))
+        _lastMsg.remove(buffer);
     if (_lastSeenMsg.contains(buffer))
         _lastSeenMsg.remove(buffer);
     if (_markerLines.contains(buffer))
@@ -158,6 +187,12 @@ void BufferSyncer::removeBuffer(BufferId buffer)
 
 void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2)
 {
+    setLastMsg(buffer1, std::max(_lastMsg[buffer1], _lastMsg[buffer2]));
+    setBufferActivity(buffer1, _bufferActivities[buffer1] | _bufferActivities[buffer2]);
+    setHighlightCount(buffer1, _highlightCounts[buffer1] + _highlightCounts[buffer2]);
+
+    if (_lastMsg.contains(buffer2))
+        _lastMsg.remove(buffer2);
     if (_lastSeenMsg.contains(buffer2))
         _lastSeenMsg.remove(buffer2);
     if (_markerLines.contains(buffer2))
@@ -180,7 +215,7 @@ QVariantList BufferSyncer::initHighlightCounts() const
     QVariantList list;
     auto iter = _highlightCounts.constBegin();
     while (iter != _highlightCounts.constEnd()) {
-        list << QVariant::fromValue<BufferId>(iter.key()) << QVariant::fromValue<int>((int)iter.value());
+        list << QVariant::fromValue(iter.key()) << QVariant::fromValue((int)iter.value());
         ++iter;
     }
     return list;