Include current nick for highlight checking if "All nicks" is chosen

[quassel.git] / src / qtui / qtuimessageprocessor.cpp

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 9bc1c8c..353928a 100644 (file)
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -31,9 +31,7 @@ const int progressUpdateDelay = 100;  // ms between progress signal updates
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent)
   : AbstractMessageProcessor(parent),
     _processing(false),
-    _processMode(TimerBased),
-    _msgsProcessed(0),
-    _msgCount(0)
+    _processMode(TimerBased)
 {
   NotificationSettings notificationSettings;
   _nicksCaseSensitive = notificationSettings.nicksCaseSensitive();
@@ -58,8 +56,8 @@ void QtUiMessageProcessor::reset() {
 
 void QtUiMessageProcessor::process(Message &msg) {
   checkForHighlight(msg);
+  preProcess(msg);
   Client::messageModel()->insertMessage(msg);
-  postProcess(msg);
 }
 
 void QtUiMessageProcessor::process(QList<Message> &msgs) {
@@ -67,7 +65,7 @@ void QtUiMessageProcessor::process(QList<Message> &msgs) {
   QList<Message>::iterator msgIterEnd = msgs.end();
   while(msgIter != msgIterEnd) {
     checkForHighlight(*msgIter);
-    postProcess(*msgIter);
+    preProcess(*msgIter);
     msgIter++;
   }
   Client::messageModel()->insertMessages(msgs);
@@ -76,20 +74,17 @@ void QtUiMessageProcessor::process(QList<Message> &msgs) {
 
   if(msgs.isEmpty()) return;
   _processQueue.append(msgs);
-  _msgCount += msgs.count();
-  if(!isProcessing()) startProcessing();
-  else updateProgress();
+  if(!isProcessing())
+    startProcessing();
 }
 
 void QtUiMessageProcessor::startProcessing() {
   if(processMode() == TimerBased) {
-    if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
+    if(_currentBatch.isEmpty() && _processQueue.isEmpty())
+      return;
     _processing = true;
-    _msgsProcessed = 0;
-    _msgCount = _currentBatch.count();
-    foreach(QList<Message> msglist, _processQueue) _msgCount += msglist.count();
-    updateProgress();
-    if(!_processTimer.isActive()) _processTimer.start();
+    if(!_processTimer.isActive())
+      _processTimer.start();
   }
 }
 
@@ -98,28 +93,12 @@ void QtUiMessageProcessor::processNextMessage() {
     if(_processQueue.isEmpty()) {
       _processTimer.stop();
       _processing = false;
-      _msgsProcessed = _msgCount = 0;
-      updateProgress();
       return;
     }
     _currentBatch = _processQueue.takeFirst();
   }
   Message msg = _currentBatch.takeFirst();
   process(msg);
-  _msgsProcessed++;
-  updateProgress();
-}
-
-void QtUiMessageProcessor::updateProgress(bool start) {
-  if(start) {
-    _progressTimer.start();
-    emit progressUpdated(_msgsProcessed, _msgCount);
-  } else {
-    if(_msgCount == 0 || _progressTimer.elapsed() >= progressUpdateDelay) {
-      _progressTimer.restart();
-      emit progressUpdated(_msgsProcessed, _msgCount);
-    }
-  }
 }
 
 void QtUiMessageProcessor::checkForHighlight(Message &msg) {
@@ -136,6 +115,8 @@ void QtUiMessageProcessor::checkForHighlight(Message &msg) {
       const Identity *myIdentity = Client::identity(net->identity());
       if(myIdentity)
         nickList = myIdentity->nicks();
+      if(!nickList.contains(net->myNick()))
+        nickList.prepend(net->myNick());
     }
     foreach(QString nickname, nickList) {
       QRegExp nickRegExp("\\b" + QRegExp::escape(nickname) + "(\\W|\\b|$)", // + "\\b", this does not seem to work for trailing ` -> upstream bug?