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 (msg.flags().testFlag(Message::Highlight)) {
- if (addActivity(Message::Types(msg.type()), msg.flags().testFlag(Message::Highlight))) {
- emit dataChanged();
- }
- }
+ // 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;
}
bool BufferItem::addActivity(Message::Types type, bool highlight) {
auto oldActivity = activityLevel();
- if (type != 0)
- _activity |= BufferInfo::OtherActivity;
+ // If the core handles activities, only handle highlights
+ if (!Client::coreFeatures().testFlag(Quassel::Feature::BufferActivitySync)) {
+ if (type != 0)
+ _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;
void NetworkModel::bufferActivityChanged(BufferId bufferId, const Message::Types activity) {
auto bufferItem = findBufferItem(bufferId);
if (!bufferItem) {
- qDebug() << "NetworkModel::clearBufferActivity(): buffer is unknown:" << bufferId;
+ qDebug() << "NetworkModel::bufferActivityChanged(): buffer is unknown:" << bufferId;
return;
}
auto hiddenTypes = BufferSettings(bufferId).messageFilter();