1 files changed, 14 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 3e58e40..b6ca984 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -513,60 +513,74 @@ void ChatController::handlePresenceChange(std::shared_ptr<Presence> newPresence)
     }
 
     if (!relevantPresence) {
         return;
     }
 
     if (!newPresence) {
         newPresence = std::make_shared<Presence>();
         newPresence->setType(Presence::Unavailable);
     }
     lastShownStatus_ = newPresence->getShow();
 
     chatStateTracker_->handlePresenceChange(newPresence);
     chatStateNotifier_->setContactIsOnline(newPresence->getType() == Presence::Available);
     std::string newStatusChangeString = getStatusChangeString(newPresence);
     if (newStatusChangeString != lastStatusChangeString_) {
         if (lastWasPresence_) {
             chatWindow_->replaceLastMessage(chatMessageParser_->parseMessageBody(newStatusChangeString), ChatWindow::UpdateTimestamp);
         } else {
             chatWindow_->addPresenceMessage(chatMessageParser_->parseMessageBody(newStatusChangeString), ChatWindow::DefaultDirection);
         }
         lastStatusChangeString_ = newStatusChangeString;
         lastWasPresence_ = true;
     }
 }
 
 boost::optional<boost::posix_time::ptime> ChatController::getMessageTimestamp(std::shared_ptr<Message> message) const {
     return message->getTimestamp();
 }
 
+void ChatController::addMessageHandleIncomingMessage(const JID& from, const ChatWindow::ChatMessage& message, const std::string& messageID, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const boost::posix_time::ptime& timeStamp) {
+    lastMessagesIDs_[from.toBare()] = {messageID, addMessage(message, senderDisplayNameFromMessage(from), senderIsSelf, label, avatarManager_->getAvatarPath(from), timeStamp)};
+}
+
+void ChatController::handleIncomingReplaceMessage(const JID& from, const ChatWindow::ChatMessage& message, const std::string& messageID, const std::string& idToReplace, bool senderIsSelf, std::shared_ptr<SecurityLabel> label, const boost::posix_time::ptime& timeStamp) {
+    auto lastMessage = lastMessagesIDs_.find(from.toBare());
+    if ((lastMessage != lastMessagesIDs_.end()) && (lastMessage->second.idInStream == idToReplace)) {
+        replaceMessage(message, lastMessage->second.idInWindow, timeStamp);
+    }
+    else {
+        addMessageHandleIncomingMessage(from, message, messageID, senderIsSelf, label, timeStamp);
+    }
+}
+
 void ChatController::logMessage(const std::string& message, const JID& fromJID, const JID& toJID, const boost::posix_time::ptime& timeStamp, bool /* isIncoming */) {
     HistoryMessage::Type type;
     if (mucRegistry_->isMUC(fromJID.toBare()) || mucRegistry_->isMUC(toJID.toBare())) {
         type = HistoryMessage::PrivateMessage;
     }
     else {
         type = HistoryMessage::Chat;
     }
 
     if (historyController_) {
         historyController_->addMessage(message, fromJID, toJID, type, timeStamp);
     }
 }
 
 bool ChatController::shouldIgnoreMessage(std::shared_ptr<Message> message) {
     if (!message->getID().empty()) {
         if (message->getID() == lastHandledMessageID_) {
             return true;
         }
         else {
             lastHandledMessageID_ = message->getID();
         }
     }
     return false;
 }
     
 JID ChatController::messageCorrectionJID(const JID& fromJID) {
     return fromJID.toBare();
 }