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

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index e94cf55b..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,10 +78,10 @@ void Buffer::setVisible(bool visible) {
   setLastSeen(layoutedMsgs.last()->timestamp());
 }
 
-void Buffer::setLastSeen(const QDateTime &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);
   }
@@ -92,9 +96,14 @@ 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(lastSeen().isValid() && lastSeen() >= msg.timestamp())
+    return;
 
   ActivityLevel level = activityLevel() | OtherActivity;
   if(msg.type() == Message::Plain || msg.type() == Message::Notice) level |= NewMessage;