- conversation = self._conn.session.conversations.get_conversation(self._contactKey)
- self._report_conversation(conversation)
-
- def _report_conversation(self, conversation):
- # @bug? Check if messages sent need to be filtered out
- completeMessageHistory = conversation["messageParts"]
- messages = self._filter_seen_messages(completeMessageHistory)
- self._lastMessageTimestamp = messages[-1][0]
- formattedMessage = self._format_messages(messages)
- self._report_new_message(formattedMessage)
-
- def _filter_seen_messages(self, messages):
+ mergedConversations = self._conn.session.conversations.get_conversation(self._contactKey)
+ self._report_conversation(mergedConversations)
+
+ def _report_conversation(self, mergedConversations):
+ newConversations = mergedConversations.conversations
+ newConversations = self._filter_out_reported(newConversations)
+ newConversations = self._filter_out_read(newConversations)
+ newConversations = list(newConversations)
+ if not newConversations:
+ _moduleLogger.info(
+ "New messages for %r have already been read externally" % (self._contactKey, )
+ )
+ return
+ self._lastMessageTimestamp = newConversations[-1].time
+
+ messages = [
+ newMessage
+ for newConversation in newConversations
+ for newMessage in newConversation.messages
+ if newMessage.whoFrom != "Me:"
+ ]
+ if not newConversations:
+ _moduleLogger.info(
+ "All incoming messages were really outbound messages for %r" % (self._contactKey, )
+ )
+ return
+
+ for newMessage in messages:
+ formattedMessage = self._format_message(newMessage)
+ self._report_new_message(formattedMessage)
+
+ def _filter_out_reported(self, conversations):
+ return (
+ conversation
+ for conversation in conversations
+ if self._lastMessageTimestamp < conversation.time
+ )
+
+ def _filter_out_read(self, conversations):