X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=df7863967efcb3f8c06ca234928c14afc1af0eb4;hp=1fc9846f9f0dad56df1816a2ece05c1ce5755408;hb=a1d785ae12b3ec04b43e243f3397bb6f8ecf60d5;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 1fc9846f..df786396 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -42,50 +42,17 @@ BufferInfo Buffer::bufferInfo() const {
   return _bufferInfo;
 }
 
-QList<AbstractUiMsg *> Buffer::contents() const {
-  return layoutedMsgs;
-}
-
-void Buffer::appendMsg(const Message &msg) {
-  updateActivityLevel(msg);
-  AbstractUiMsg *m = Client::layoutMsg(msg);
-  layoutedMsgs.append(m);
-  emit msgAppended(m);
-}
-
-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);
-}
-
-bool Buffer::layoutMsg() {
-  if(layoutQueue.count()) {
-    AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
-    layoutedMsgs.prepend(m);
-    emit msgPrepended(m);
-  }
-  return layoutQueue.count();
-}
-
 void Buffer::setVisible(bool visible) {
   _isVisible = visible;
   setActivityLevel(NoActivity);
-  if(!layoutedMsgs.count()) return;
-  setLastSeenMsg(layoutedMsgs.last()->msgId());
+  if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId());
 }
 
 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;
+  if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
     _lastSeenMsg = msgId;
     Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);
-    //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
     setActivityLevel(NoActivity);
   }
 }
@@ -94,11 +61,14 @@ void Buffer::setActivityLevel(ActivityLevel level) {
   _activityLevel = level;
   if(bufferInfo().bufferId() > 0) {
     Client::networkModel()->setBufferActivity(bufferInfo(), level);
-    //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
   }
 }
 
 void Buffer::updateActivityLevel(const Message &msg) {
+  // FIXME dirty hack to allow the lastSeen stuff to continue to work
+  //       will be made much nicer once Buffer dies, I hope...
+  if(msg.msgId() > _lastRcvdMsg.msgId()) _lastRcvdMsg = msg;
+
   if(isVisible())
     return;
 
@@ -109,8 +79,12 @@ void Buffer::updateActivityLevel(const Message &msg) {
     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);
 }