X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=de3bfcf6d7bbb686a4a5ee672936a65395232575;hp=daa338abedcc872ce9efc1ff3d6e1b7f84b91159;hb=df0846fca1b6a8427498a125b32f4da6d236a7fc;hpb=f1e45389df014fb5445ee96769bf02dcf34f1e21

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index daa338ab..de3bfcf6 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -42,7 +42,7 @@ BufferInfo Buffer::bufferInfo() const {
   return _bufferInfo;
 }
 
-QList<AbstractUiMsg *> Buffer::contents() const {
+const QList<AbstractUiMsg *> &Buffer::contents() const {
   return layoutedMsgs;
 }
 
@@ -55,7 +55,7 @@ void Buffer::appendMsg(const Message &msg) {
 
 void Buffer::prependMsg(const Message &msg) {
   // check for duplicate first
-  if(contents().count() > 0 && msg.msgId() >= contents().first()->msgId()) {
+  if(!layoutedMsgs.isEmpty()  && msg.msgId() >= layoutedMsgs.first()->msgId()) {
     return;
   }
   updateActivityLevel(msg);
@@ -63,25 +63,31 @@ void Buffer::prependMsg(const Message &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::setBufferLastSeen(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);
   }
@@ -96,13 +102,22 @@ void Buffer::setActivityLevel(ActivityLevel level) {
 }
 
 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;
+
+  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);
 }