}
if(!success) {
- qDebug() << "didn't find User:" << ircUser << (quint64)ircUser;
+ qDebug() << "didn't find User:" << ircUser << qHash(ircUser);
qDebug() << "==== Childlist for Item:" << this << id() << bufferName() << "====";
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
- if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
+ if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById(qHash(ircUser)))
return; // already in the right category;
removeUserFromCategory(ircUser);
}
bool UserCategoryItem::removeUser(IrcUser *ircUser) {
- return removeChildById((quint64)ircUser);
+ return removeChildById(qHash(ircUser));
}
int UserCategoryItem::categoryFromModes(const QString &modes) {
if(msg.type() == Message::Plain || msg.type() == Message::Notice)
level |= BufferItem::NewMessage;
+
const Network *net = Client::network(msg.bufferInfo().networkId());
- if(net && (msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && msg.text().contains(net->myNick()))
- level |= BufferItem::Highlight;
+ if(net) {
+ QRegExp nickRegExp("^(.*\\W)?"+net->myNick()+"(\\W.*)?$");
+ if((msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text()))
+ level |= BufferItem::Highlight;
+ }
bufferItem(msg.bufferInfo())->updateActivity(level);
}