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
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;
}
_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();
}
}
void BufferItem::setActivity(Message::Types type, bool highlight) {
BufferInfo::ActivityLevel oldLevel = activityLevel();
- _activity = BufferInfo::Activity();
+ _activity &= BufferInfo::Highlight;
addActivity(type, highlight);
if (_activity != oldLevel) {
}
void NetworkModel::bufferActivityChanged(BufferId bufferId, const Message::Types activity) {
- auto bufferItem = findBufferItem(bufferId);
- if (!bufferItem) {
- qDebug() << "NetworkModel::clearBufferActivity(): buffer is unknown:" << bufferId;
+ qWarning() << "bufferActivityChanged(" << bufferId << ", " << activity << ")";
+ 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);
}