X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=7297f4b21f43f1ce70bdb41ea22ee6f0a52a2ac9;hp=edc1117989350cc9cb2d3a0204ce670ded1a8ad1;hb=722de35940fadb7be9cde29e103d251742ffb3ec;hpb=0a3fcc38ea09618d41280e2fcb20e73fb10b8ceb

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index edc11179..7297f4b2 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -99,29 +99,39 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
 }
 
 void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
-  // the msglist can be assumed to be non empty
-  int idx = indexForId(msglist.first().msgId());
-  int start = idx;
-  int end = idx + msglist.count() - 1;
+  Q_ASSERT(!msglist.isEmpty()); // the msglist can be assumed to be non empty
+  int start = indexForId(msglist.first().msgId());
+  int end = start + msglist.count() - 1;
   MessageModelItem *dayChangeItem = 0;
 
-  if(idx > 0) {
-    int prevIdx = idx - 1;
-    if(_messageList[prevIdx]->msgType() == Message::DayChange
-       && _messageList[prevIdx]->timeStamp() > msglist.value(0).timestamp()) {
+  if(start > 0) {
+    // check if the preceeding msg is a daychange message and if so if
+    // we have to drop or relocate it at the end of this chunk
+    int prevIdx = start - 1;
+    if(_messageList.at(prevIdx)->msgType() == Message::DayChange
+       && _messageList.at(prevIdx)->timeStamp() > msglist.at(0).timestamp()) {
       beginRemoveRows(QModelIndex(), prevIdx, prevIdx);
       MessageModelItem *oldItem = _messageList.takeAt(prevIdx);
-      if(msglist.last().timestamp() < oldItem->timeStamp())
-	dayChangeItem = oldItem;
-      else
-	delete oldItem;
+      if(msglist.last().timestamp() < oldItem->timeStamp()) {
+	// we have to reinsert it (with changed msgId -> thus we need to recreate it)
+	Message dayChangeMsg = Message::ChangeOfDay(oldItem->timeStamp());
+	dayChangeMsg.setMsgId(msglist.last().msgId());
+	dayChangeItem = createMessageModelItem(dayChangeMsg);
+      }
+      delete oldItem;
       endRemoveRows();
-      idx--;
+      start--;
+      end--;
     }
   }
 
-  if(!dayChangeItem && idx < _messageList.count() && _messageList[idx]->msgType() != Message::DayChange) {
-    QDateTime nextTs = _messageList[idx]->timeStamp();
+  if(!dayChangeItem && start < _messageList.count()) {
+    // check if we need to insert a daychange message at the end of the this group
+
+    // if this assert triggers then indexForId() would have found a spot right before a DayChangeMsg
+    // this should never happen as daychange messages share the msgId with the preceeding message
+    Q_ASSERT(_messageList[start]->msgType() != Message::DayChange);
+    QDateTime nextTs = _messageList[start]->timeStamp();
     QDateTime prevTs = msglist.last().timestamp();
     nextTs.setTimeSpec(Qt::UTC);
     prevTs.setTimeSpec(Qt::UTC);
@@ -139,15 +149,22 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
   if(dayChangeItem)
     end++;
 
+  Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < msglist.first().msgId());
+  Q_ASSERT(start == _messageList.count() || _messageList[start]->msgId() > msglist.last().msgId());
   beginInsertRows(QModelIndex(), start, end);
+  int pos = start;
   foreach(Message msg, msglist) {
-    _messageList.insert(idx, createMessageModelItem(msg));
-    idx++;
+    _messageList.insert(pos, createMessageModelItem(msg));
+    pos++;
   }
   if(dayChangeItem) {
-    _messageList.insert(idx, dayChangeItem);
+    _messageList.insert(pos, dayChangeItem);
+    pos++; // needed for the following assert
   }
   endInsertRows();
+  Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < _messageList[start]->msgId());
+  Q_ASSERT(end + 1 == _messageList.count() || _messageList[end]->msgId() < _messageList[end + 1]->msgId());
+  Q_ASSERT(pos - 1 == end);
 }
 
 int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
@@ -299,7 +316,6 @@ int MessageModel::indexForId(MsgId id) {
 
 void MessageModel::changeOfDay() {
   _dayChangeTimer.setInterval(86400000);
-  qDebug() << _nextDayChange;
   if(!_messageList.isEmpty()) {
     int idx = _messageList.count();
     while(idx > 0 && _messageList[idx - 1]->timeStamp() > _nextDayChange) {