void QtUiMessageProcessor::process(Message &msg) {
checkForHighlight(msg);
+ preProcess(msg);
Client::messageModel()->insertMessage(msg);
- postProcess(msg);
}
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);
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?
- _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+ QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
if(nickRegExp.indexIn(msg.contents()) >= 0) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
if(!rule.isEnabled)
continue;
- bool match = false;
+ QRegExp rx;
if(rule.isRegExp) {
- QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
- match = rx.exactMatch(msg.contents());
+ rx = QRegExp(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
} else {
- QRegExp rx("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
- match = (rx.indexIn(msg.contents()) >= 0);
+ rx = QRegExp("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
}
+ bool match = (rx.indexIn(msg.contents()) >= 0);
if(match) {
msg.setFlags(msg.flags() | Message::Highlight);
return;