1 files changed, 12 insertions, 0 deletions
diff --git a/Swift/Controllers/Chat/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index 36e12e3..3bc9d20 100644
--- a/Swift/Controllers/Chat/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -527,37 +527,49 @@ void ChatController::handlePresenceChange(std::shared_ptr<Presence> newPresence)
     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::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;
+}
+
 ChatWindow* ChatController::detachChatWindow() {
     chatWindow_->onUserTyping.disconnect(boost::bind(&ChatStateNotifier::setUserIsTyping, chatStateNotifier_));
     chatWindow_->onUserCancelsTyping.disconnect(boost::bind(&ChatStateNotifier::userCancelledNewMessage, chatStateNotifier_));
     return ChatControllerBase::detachChatWindow();
 }
 
 }