X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=1a239a8b24e32d694b19b0f6f9e87207d191e3b8;hb=4dfe52421b1b6a71b3c0bda2452edf3605f59528;hp=f3896e58d0ccefde356a7159d26a94e09974b9c1;hpb=54ead1bace1c9306ccfd5ebd7fb7bbd0c9843db7;p=quassel.git

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index f3896e58..1a239a8b 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -293,7 +293,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
@@ -307,7 +312,8 @@ void BufferItem::clearActivityLevel()
 
 void BufferItem::updateActivityLevel(const Message &msg)
 {
-    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+    // If the core handles activity, and this message is not a highlight, ignore this
+    if (Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync) && !msg.flags().testFlag(Message::Highlight)) {
         return;
     }
 
@@ -331,7 +337,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();
     }
 }
@@ -339,7 +353,7 @@ void BufferItem::updateActivityLevel(const Message &msg)
 void BufferItem::setActivity(Message::Types type, bool highlight) {
     BufferInfo::ActivityLevel oldLevel = activityLevel();
 
-    _activity = BufferInfo::Activity();
+    _activity &= BufferInfo::Highlight;
     addActivity(type, highlight);
 
     if (_activity != oldLevel) {
@@ -350,7 +364,7 @@ void BufferItem::setActivity(Message::Types type, bool highlight) {
 bool BufferItem::addActivity(Message::Types type, bool highlight) {
     auto oldActivity = activityLevel();
 
-    if (type != 0)
+    if (type != Message::Types())
         _activity |= BufferInfo::OtherActivity;
 
     if (type.testFlag(Message::Plain) || type.testFlag(Message::Notice) || type.testFlag(Message::Action))
@@ -1728,13 +1742,13 @@ void NetworkModel::messageRedirectionSettingsChanged()
 }
 
 void NetworkModel::bufferActivityChanged(BufferId bufferId, const Message::Types activity) {
-    auto bufferItem = findBufferItem(bufferId);
-    if (!bufferItem) {
-        qDebug() << "NetworkModel::clearBufferActivity(): buffer is unknown:" << bufferId;
+    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);
 }