return _bufferInfo;
}
-QList<AbstractUiMsg *> Buffer::contents() const {
- return layoutedMsgs;
-}
-
-void Buffer::appendMsg(const Message &msg) {
- updateActivityLevel(msg);
- AbstractUiMsg *m = Client::layoutMsg(msg);
- layoutedMsgs.append(m);
- emit msgAppended(m);
-}
-
-void Buffer::prependMsg(const Message &msg) {
- updateActivityLevel(msg);
- layoutQueue.append(msg);
-}
-
-bool Buffer::layoutMsg() {
- if(layoutQueue.count()) {
- AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
- layoutedMsgs.prepend(m);
- emit msgPrepended(m);
- }
- return layoutQueue.count();
-}
-
void Buffer::setVisible(bool visible) {
_isVisible = visible;
setActivityLevel(NoActivity);
- if(!layoutedMsgs.count()) return;
- setLastSeen(layoutedMsgs.last()->timestamp());
+ if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId());
}
-void Buffer::setLastSeen(const QDateTime &seen) {
- if(!lastSeen().isValid() || seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
- _lastSeen = seen;
- Client::bufferSyncer()->requestSetLastSeen(bufferInfo().bufferId(), seen);
- //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
+void Buffer::setLastSeenMsg(const MsgId &msgId) {
+ const MsgId oldLastSeen = lastSeenMsg();
+ if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
+ _lastSeenMsg = msgId;
+ Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);
setActivityLevel(NoActivity);
}
}
_activityLevel = level;
if(bufferInfo().bufferId() > 0) {
Client::networkModel()->setBufferActivity(bufferInfo(), level);
- //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
}
}
void Buffer::updateActivityLevel(const Message &msg) {
- if(isVisible()) return;
- if(lastSeen().isValid() && lastSeen() >= msg.timestamp()) return;
- //qDebug() << "recv msg" << bufferInfo() << msg.timestamp();
+ // FIXME dirty hack to allow the lastSeen stuff to continue to work
+ // will be made much nicer once Buffer dies, I hope...
+ if(msg.msgId() > _lastRcvdMsg.msgId()) _lastRcvdMsg = msg;
+
+ if(isVisible())
+ return;
+
+ if(msg.flags() & Message::Self) // don't update activity for our own messages
+ return;
+
+ if(lastSeenMsg().isValid() && lastSeenMsg() >= msg.msgId())
+ return;
ActivityLevel level = activityLevel() | OtherActivity;
- if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;
- if(msg.flags() & Message::Highlight) level |= Highlight;
+ if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+ level |= NewMessage;
+
+ if(msg.flags() & Message::Highlight)
+ level |= Highlight;
- if(level != activityLevel()) setActivityLevel(level);
+ if(level != activityLevel())
+ setActivityLevel(level);
}