fixing a bug in the messagemodel

[quassel.git] / src / client / messagemodel.cpp

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 7633f82..07d0cca 100644 (file)
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -37,7 +37,6 @@ MessageModel::MessageModel(QObject *parent)
   _nextDayChange.setTimeSpec(Qt::UTC);
   _nextDayChange.setTime_t(((now.toTime_t() / 86400) + 1) * 86400);
   _nextDayChange.setTimeSpec(Qt::LocalTime);
-  qDebug() << _nextDayChange;
   _dayChangeTimer.setInterval(QDateTime::currentDateTime().secsTo(_nextDayChange) * 1000);
   _dayChangeTimer.start();
   connect(&_dayChangeTimer, SIGNAL(timeout()), this, SLOT(changeOfDay()));
@@ -77,10 +76,7 @@ bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) {
       return false;
   }
 
-  MessageModelItem *item = createMessageModelItem(msg);
-  beginInsertRows(QModelIndex(), idx, idx);
-  _messageList.insert(idx, item);
-  endInsertRows();
+  insertMessageGroup(QList<Message>() << msg);
   return true;
 }
 
@@ -103,22 +99,38 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
 }
 
 void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
-  int idx = indexForId(msglist.first().msgId());
-  if(idx > 0) {
-    int prevIdx = idx - 1;
-    if(_messageList[prevIdx]->msgType() == Message::DayChange
-       && _messageList[prevIdx]->timeStamp() > msglist.value(0).timestamp()) {
+  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(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()) {
+       // 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--;
     }
   }
-  Message dayChangeMsg;
-  bool needsDayChangeMsg = false;
-  if(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);
@@ -127,22 +139,26 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
     if(nextDay != prevDay) {
       nextTs.setTime_t(nextDay * 86400);
       nextTs.setTimeSpec(Qt::LocalTime);
-      dayChangeMsg = Message::ChangeOfDay(nextTs);
+      Message dayChangeMsg = Message::ChangeOfDay(nextTs);
       dayChangeMsg.setMsgId(msglist.last().msgId());
-      needsDayChangeMsg = true;
+      dayChangeItem = createMessageModelItem(dayChangeMsg);
     }
   }
-  int start = idx;
-  int end = idx + msglist.count() - 1;
+
+  if(dayChangeItem)
+    end++;
+
   beginInsertRows(QModelIndex(), start, end);
   foreach(Message msg, msglist) {
-    _messageList.insert(idx, createMessageModelItem(msg));
-    idx++;
+    _messageList.insert(start, createMessageModelItem(msg));
+    start++;
   }
-  if(needsDayChangeMsg) {
-    _messageList.insert(idx, createMessageModelItem(dayChangeMsg));
+  if(dayChangeItem) {
+    _messageList.insert(start, dayChangeItem);
+    start++; // needed for the following assert
   }
   endInsertRows();
+  Q_ASSERT(start - 1 == end);
 }
 
 int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {