X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fchannel%2Ftext.py;h=206299c02adb9f57b504ebd96585e8de64951c8f;hp=94ae255d50d14d7bd80968f49c7e561763fbf301;hb=da66a4ebd1deb3939a5bcf4abcd0d6d9708b59d8;hpb=bf4f61d07bfec7ef0b78940384d05ba42a92b06b

diff --git a/src/channel/text.py b/src/channel/text.py
index 94ae255..206299c 100644
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -1,4 +1,5 @@
 import time
+import datetime
 import logging
 
 import telepathy
@@ -15,6 +16,8 @@ _moduleLogger = logging.getLogger(__name__)
 
 class TextChannel(tp.ChannelTypeText):
 
+	OLDEST_MESSAGE_WINDOW = datetime.timedelta(days=1)
+
 	def __init__(self, connection, manager, props, contactHandle):
 		self.__manager = manager
 		self.__props = props
@@ -36,8 +39,6 @@ class TextChannel(tp.ChannelTypeText):
 			self.__callback
 		)
 
-		self._filter_out_reported = gvoice.conversations.FilterOutReported()
-
 		# The only reason there should be anything in the conversation is if
 		# its new, so report it all
 		try:
@@ -71,7 +72,7 @@ class TextChannel(tp.ChannelTypeText):
 				{},
 			)
 		except Exception:
-			_moduleLogger.exception(result)
+			_moduleLogger.exception("Oh no, what happened?")
 			return
 
 		self._conn.session.textsStateMachine.reset_timers()
@@ -123,10 +124,23 @@ class TextChannel(tp.ChannelTypeText):
 		# 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 = self._filter_out_reported(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, )
@@ -134,7 +148,7 @@ class TextChannel(tp.ChannelTypeText):
 			return
 
 		messages = [
-			(newMessage, newConversation.time)
+			(newMessage, newConversation)
 			for newConversation in newConversations
 			for newMessage in newConversation.messages
 			if not gvoice.conversations.is_message_from_self(newMessage)
@@ -144,9 +158,14 @@ class TextChannel(tp.ChannelTypeText):
 				"How did this happen for %r?" % (self._contactKey, )
 			)
 			return
-		for newMessage, convTime in messages:
+
+		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, convTime)
+			self._report_new_message(formattedMessage, conv.time)
 
 		for conv in mergedConversations.conversations:
 			conv.isRead = True