X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=147605c7d31fe52d78d1289d9fb3365f2fcb6585;hp=0558a7e968ef5c9101c97f2ef017a56694063c79;hb=78decd5f8d1a149fc0e62e01bd6b2886e0feadfe;hpb=d8472f2ce2883b57af1771efbc21972e3cabc928

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 0558a7e9..147605c7 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -34,6 +34,7 @@
 #include "ircchannel.h"
 #include "network.h"
 #include "signalproxy.h"
+#include "buffersyncer.h"
 
 /*****************************************
 *  Network Items
@@ -145,6 +146,10 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo)
         break;
     }
 
+    BufferSyncer *bufferSyncer = Client::bufferSyncer();
+    if (bufferSyncer)
+        bufferItem->addActivity(bufferSyncer->activity(bufferItem->bufferId()), false);
+
     return bufferItem;
 }
 
@@ -293,7 +298,12 @@ void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level)
 
 void BufferItem::clearActivityLevel()
 {
-    _activity = BufferInfo::NoActivity;
+    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        // If the core handles activity sync, clear only the highlight flag
+        _activity &= ~BufferInfo::Highlight;
+    } else {
+        _activity = BufferInfo::NoActivity;
+    }
     _firstUnreadMsgId = MsgId();
 
     // FIXME remove with core proto v11
@@ -332,7 +342,15 @@ void BufferItem::updateActivityLevel(const Message &msg)
         _firstUnreadMsgId = msg.msgId();
     }
 
-    if (addActivity(Message::Types(msg.type()), msg.flags().testFlag(Message::Highlight)) || stateChanged) {
+    Message::Types type;
+    // If the core handles activities, ignore types
+    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+        type = Message::Types();
+    } else {
+        type = msg.type();
+    }
+
+    if (addActivity(type, msg.flags().testFlag(Message::Highlight)) || stateChanged) {
         emit dataChanged();
     }
 }
@@ -351,14 +369,11 @@ void BufferItem::setActivity(Message::Types type, bool highlight) {
 bool BufferItem::addActivity(Message::Types type, bool highlight) {
     auto oldActivity = activityLevel();
 
-    // If the core handles activities, only handle highlights
-    if (!Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
-        if (type != 0)
-            _activity |= BufferInfo::OtherActivity;
+    if (type != Message::Types())
+        _activity |= BufferInfo::OtherActivity;
 
-        if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))
-            _activity |= BufferInfo::NewMessage;
-    }
+    if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))
+        _activity |= BufferInfo::NewMessage;
 
     if (highlight)
         _activity |= BufferInfo::Highlight;
@@ -1732,13 +1747,13 @@ void NetworkModel::messageRedirectionSettingsChanged()
 }
 
 void NetworkModel::bufferActivityChanged(BufferId bufferId, const Message::Types activity) {
-    auto bufferItem = findBufferItem(bufferId);
-    if (!bufferItem) {
+    auto _bufferItem = findBufferItem(bufferId);
+    if (!_bufferItem) {
         qDebug() << "NetworkModel::bufferActivityChanged(): buffer is unknown:" << bufferId;
         return;
     }
     auto hiddenTypes = BufferSettings(bufferId).messageFilter();
     auto visibleTypes = ~hiddenTypes;
     auto activityVisibleTypesIntersection = activity & visibleTypes;
-    bufferItem->setActivity(activityVisibleTypesIntersection, false);
+    _bufferItem->setActivity(activityVisibleTypesIntersection, false);
 }