- 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):
- return (
- message
- for message in messages
- if self._lastMessageTimestamp < message[0]
- )
+ _moduleLogger.debug("Incoming messages from %r for existing conversation" % (self._contactKey, ))
+ mergedConversations = conv.get_conversation(self._contactKey)
+ self._report_conversation(mergedConversations)
+
+ def _report_conversation(self, mergedConversations):
+ newConversations = mergedConversations.conversations
+ if not newConversations:
+ _moduleLogger.info(
+ "No messages ended up existing for %r" % (self._contactKey, )
+ )
+ return
+
+ # Can't filter out messages in a texting conversation that came in
+ # before the last one sent because that creates a race condition of two
+ # people sending at about the same time, which happens quite a bit
+ postUpdateLen = len(newConversations)
+ newConversations = gvoice.conversations.filter_out_self(newConversations)
+ newConversations = list(newConversations)
+ postSelfLen = len(newConversations)
+ if postSelfLen < postUpdateLen:
+ self._conn.log_to_user(__name__, "Dropped %s messages due to being from self" % (postUpdateLen - postSelfLen))
+ if not newConversations:
+ _moduleLogger.debug(
+ "New messages for %r are from yourself" % (self._contactKey, )
+ )
+ return
+
+ newConversations = gvoice.conversations.filter_out_read(newConversations)
+ newConversations = list(newConversations)
+ postReadLen = len(newConversations)
+ if postReadLen < postSelfLen:
+ self._conn.log_to_user(__name__, "Dropped %s messages due to already being read" % (postSelfLen- postReadLen))
+ if not newConversations:
+ _moduleLogger.debug(
+ "New messages for %r have already been read externally" % (self._contactKey, )
+ )
+ return
+
+ messages = [
+ (newMessage, newConversation)
+ for newConversation in newConversations
+ for newMessage in newConversation.messages
+ if not gvoice.conversations.is_message_from_self(newMessage)
+ ]
+ if not messages:
+ _moduleLogger.debug(
+ "How did this happen for %r?" % (self._contactKey, )
+ )
+ return
+
+ now = datetime.datetime.now()
+ for newMessage, conv in messages:
+ if self.OLDEST_MESSAGE_WINDOW < (now - conv.time):
+ _moduleLogger.warning("Why are we reporting a message that is so old?")
+ _moduleLogger.warning("\t%r %r (%r) with %r messages" % (conv.number, conv.id, conv.time, len(conv.messages)))
+ formattedMessage = self._format_message(newMessage)
+ self._report_new_message(formattedMessage, conv.time)