X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=14de0d41c8545ec8708ff90c14a6ae42a740f2b4;hp=54bd81a1c02b06def25a1a8033e0dad492c35c78;hb=c965fbf780369b93b3ae7ab33a1a881a5c6e9c0b;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 54bd81a1..14de0d41 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -54,6 +54,10 @@ 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()) {
+    return;
+  }
   updateActivityLevel(msg);
   layoutQueue.append(msg);
 }
@@ -74,22 +78,32 @@ void Buffer::setVisible(bool visible) {
   setLastSeen(layoutedMsgs.last()->timestamp());
 }
 
-void Buffer::setLastSeen(const QDateTime &seen) {
-  if(seen.isValid() && seen > lastSeen()) { //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
+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);
+    Client::setBufferLastSeen(bufferInfo().bufferId(), seen);
+    //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
     setActivityLevel(NoActivity);
   }
 }
 
 void Buffer::setActivityLevel(ActivityLevel level) {
   _activityLevel = level;
-  if(bufferInfo().bufferId() > 0) Client::networkModel()->setBufferActivity(bufferInfo(), 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;
+  if(isVisible())
+    return;
+
+  if(msg.flags() & Message::Self)	// don't update activity for our own messages
+    return;
+
+  if(lastSeen().isValid() && lastSeen() >= msg.timestamp())
+    return;
 
   ActivityLevel level = activityLevel() | OtherActivity;
   if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;