return _bufferInfo;
}
-QList<AbstractUiMsg *> Buffer::contents() const {
+const QList<AbstractUiMsg *> &Buffer::contents() const {
return layoutedMsgs;
}
}
void Buffer::prependMsg(const Message &msg) {
+ // check for duplicate first
+ if(!layoutedMsgs.isEmpty() && msg.msgId() >= layoutedMsgs.first()->msgId()) {
+ return;
+ }
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();
+ if(layoutQueue.isEmpty())
+ return false;
+
+ AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
+ layoutedMsgs.prepend(m);
+ emit msgPrepended(m);
+
+ return !layoutQueue.isEmpty();
}
void Buffer::setVisible(bool visible) {
_isVisible = visible;
setActivityLevel(NoActivity);
- if(!layoutedMsgs.count()) return;
- setLastSeen(layoutedMsgs.last()->timestamp());
+ if(layoutedMsgs.isEmpty())
+ return;
+ setLastSeenMsg(layoutedMsgs.last()->msgId());
}
-void Buffer::setLastSeen(const QDateTime &seen) { // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
- if(!lastSeen().isValid() || seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
- _lastSeen = seen;
- Client::bufferSyncer()->requestSetLastSeen(bufferInfo().bufferId(), seen);
+void Buffer::setLastSeenMsg(const MsgId &msgId) {
+ // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
+ const MsgId oldLastSeen = lastSeenMsg();
+ if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
+ //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
+ _lastSeenMsg = msgId;
+ Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);
//qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
setActivityLevel(NoActivity);
}
}
void Buffer::updateActivityLevel(const Message &msg) {
- if(isVisible()) return;
- if(lastSeen().isValid() && lastSeen() >= msg.timestamp()) return;
- //qDebug() << "recv msg" << bufferInfo() << msg.timestamp();
+ if(isVisible())
+ 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.flags() & Message::Self) // don't update activity for our own messages
+ return;
- if(level != activityLevel()) setActivityLevel(level);
+ if(lastSeenMsg().isValid() && lastSeenMsg() >= msg.msgId())
+ return;
+
+ ActivityLevel level = activityLevel() | OtherActivity;
+ if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+ level |= NewMessage;
+
+ if(msg.flags() & Message::Highlight)
+ level |= Highlight;
+
+ if(level != activityLevel())
+ setActivityLevel(level);
}