From 8aec15cecfe783d4da45acf3014946e72ffdd696 Mon Sep 17 00:00:00 2001 From: souliane Date: Wed, 16 Dec 2015 13:29:24 +0100 Subject: [PATCH] primitivus (chat): duplicate message check is actually not needed when retrieving local MUC history is disabled --- frontends/src/primitivus/chat.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py index 4e7f1631..ff1c8575 100644 --- a/frontends/src/primitivus/chat.py +++ b/frontends/src/primitivus/chat.py @@ -306,24 +306,7 @@ class Chat(PrimitivusWidget, QuickChat): @param extra (dict): extra data """ new_text = ChatText(self, timestamp, nick, my_message, message) - if timestamp and self.content: - for idx in range(len(self.content) - 1, -1, -1): - current_text = self.content[idx] - older = new_text.timestamp < current_text.timestamp - if older and idx > 0: - continue # the new message is older, we need to insert it upper - - # we discard double messages, to avoid backlog / history conflict - # FIXME: messages that have been sent several times will be displayed only once - if ((idx and self.content[idx - 1].message == message) or - (self.content[idx].message == message) or - (idx < len(self.content) - 2 and self.content[idx + 1].message)): - return - - self.content.insert(0 if older else idx + 1, new_text) - break - else: - self.content.append(new_text) + self.content.append(new_text) if not timestamp: # XXX: do not send notifications for each line of the history being displayed # FIXME: this must be changed in the future if the timestamp is passed with