X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=54ee5702f95c97e88429ee9e6294bb420b3c1101;hp=e110d61ea18ed01d7a409d8075109ad63d4b1863;hb=9950dd55446bedbccba1e7a27c4d042fb896d3c6;hpb=c7c0c7673942be376bbcab06dcc62b7f15e406a2

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index e110d61e..54ee5702 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -21,7 +21,10 @@
 #include "qtuimessageprocessor.h"
 
 #include "client.h"
+#include "clientsettings.h"
+#include "identity.h"
 #include "messagemodel.h"
+#include "network.h"
 
 QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {
 
@@ -29,13 +32,57 @@ QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessagePro
 }
 
 void QtUiMessageProcessor::processMessage(Message &msg) {
-  Client::checkForHighlight(msg);
+  checkForHighlight(msg);
   Client::messageModel()->insertMessage(msg);
 }
 
 void QtUiMessageProcessor::processMessages(QList<Message> &msgs) {
   foreach(Message msg, msgs) {
-    Client::checkForHighlight(msg);
+    checkForHighlight(msg);
     Client::messageModel()->insertMessage(msg);
   }
 }
+
+// TODO optimize checkForHighlight
+void QtUiMessageProcessor::checkForHighlight(Message &msg) {
+  if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self)))
+    return;
+
+  NotificationSettings notificationSettings;
+  const Network *net = Client::network(msg.bufferInfo().networkId());
+  if(net && !net->myNick().isEmpty()) {
+    QStringList nickList;
+    if(notificationSettings.highlightNick() == NotificationSettings::CurrentNick) {
+      nickList << net->myNick();
+    } else if(notificationSettings.highlightNick() == NotificationSettings::AllNicks) {
+      const Identity *myIdentity = Client::identity(net->identity());
+      if(myIdentity)
+        nickList = myIdentity->nicks();
+    }
+    foreach(QString nickname, nickList) {
+      QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
+      if(nickRegExp.exactMatch(msg.contents())) {
+        msg.setFlags(msg.flags() | Message::Highlight);
+        return;
+      }
+    }
+
+    foreach(QVariant highlight, notificationSettings.highlightList()) {
+      QVariantMap highlightRule = highlight.toMap();
+      if(!highlightRule["enable"].toBool())
+        continue;
+      Qt::CaseSensitivity caseSensitivity = highlightRule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive;
+      QString name = highlightRule["name"].toString();
+      QRegExp userRegExp;
+      if(highlightRule["regex"].toBool()) {
+        userRegExp = QRegExp(name, caseSensitivity);
+      } else {
+        userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity);
+      }
+      if(userRegExp.exactMatch(msg.contents())) {
+        msg.setFlags(msg.flags() | Message::Highlight);
+        return;
+      }
+    }
+  }
+}