X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=c6737bc579e3524e86831310770983bc99859177;hb=1e626e57b97756088052bcd88a29305dd7412f58;hp=a6687ce84cab3f6d9f3a93411dea571decbe636d;hpb=55712d5a21e948ea8b2b9ffe935635fddad485cb;p=quassel.git

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index a6687ce8..c6737bc5 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);
 }
@@ -71,13 +75,16 @@ void Buffer::setVisible(bool visible) {
   _isVisible = visible;
   setActivityLevel(NoActivity);
   if(!layoutedMsgs.count()) return;
-  setLastSeen(layoutedMsgs.last()->timestamp());
+  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);
   }
@@ -92,13 +99,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;
 
-  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);
 }