libervia-backend: frontends/src/primitivus/chat.py comparison

primitivus: better chat text insertion in chat window

comparison

equal deleted inserted replaced

-:b7577230a7c8
+:4d7248f4c577
 assert isinstance(from_jid, JID)
 try:
 jid,nick,mymess = QuickChat.printMessage(self, from_jid, msg, profile, timestamp)
 except TypeError:
 return
-if timestamp:
-for _chat_text in self.content:
+new_text = ChatText(self, timestamp or None, nick, mymess, msg)
-if (msg == _chat_text.message and
-timestamp - time.mktime(_chat_text.timestamp) < 5):
+if timestamp and self.content:
-#we discard double messages, to avoid backlog / history conflict
+for idx in range(len(self.content)-1,-1,-1):
+current_text = self.content[idx]
+if new_text.timestamp < current_text.timestamp and idx > 0:
+continue #the new message is older, we need to insert it upper
+#we discard double messages, to avoid backlog / history conflict
+if idx and self.content[idx-1].message == msg:
 return
-self.content.append(ChatText(self, timestamp or None, nick, mymess, msg))
+if idx<len(self.content)-2 and self.content[idx+1].message == msg:
-if timestamp:
+return
-self.content.sort(key=lambda chat_text: chat_text.timestamp)
+self.content.insert(idx+1, new_text)
+break
+else:
+self.content.append(new_text)
 if self.text_list.get_focus()[1] == len(self.content)-2:
 #we don't change focus if user is not at the bottom
 #as that mean that he is probably watching discussion history
 self.text_list.set_focus(len(self.content)-1)
 self.host.redraw()

Mercurial > libervia-backend