X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fchannel%2Ftext.py;h=5212cd74d7e260ee1410d3f5ad4b54c32d0bb98d;hp=1f15dbfe006b1b56cf415ae1e5291b9564a1b100;hb=17ed78514215ad8e1358e329fb2e77ad749fe777;hpb=76976d317ab6b805f99b100975c23df5d3454635

diff --git a/src/channel/text.py b/src/channel/text.py
index 1f15dbf..5212cd7 100644
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -1,4 +1,5 @@
 import time
+import datetime
 import logging
 
 import telepathy
@@ -6,6 +7,7 @@ import telepathy
 import tp
 import util.coroutines as coroutines
 import util.misc as misc_utils
+import util.go_utils as gobject_utils
 import gvoice
 
 
@@ -14,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
@@ -35,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:
@@ -54,27 +56,28 @@ class TextChannel(tp.ChannelTypeText):
 
 	@misc_utils.log_exception(_moduleLogger)
 	def Send(self, messageType, text):
+		le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._send)
+		le.start(messageType, text)
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _send(self, messageType, text):
 		if messageType != telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
 			raise telepathy.errors.NotImplemented("Unhandled message type: %r" % messageType)
 
 		_moduleLogger.info("Sending message to %r" % (self.__otherHandle, ))
-		self._conn.session.pool.add_task(
-			self._conn.session.backend.send_sms,
-			([self.__otherHandle.phoneNumber], text),
-			{},
-			self._on_send_sms(messageType, text),
-			self._on_send_sms_failed,
-		)
-
-	def _on_send_sms(self, messageType, text):
-
-		@misc_utils.log_exception(_moduleLogger)
-		def _actual_on_send_sms(self, *args):
-			self._conn.session.textsStateMachine.reset_timers()
+		try:
+			result = yield (
+				self._conn.session.backend.send_sms,
+				([self.__otherHandle.phoneNumber], text),
+				{},
+			)
+		except Exception:
+			_moduleLogger.exception("Oh no, what happened?")
+			return
 
-			self.Sent(int(time.time()), messageType, text)
+		self._conn.session.textsStateMachine.reset_timers()
 
-		return _actual_on_send_sms
+		self.Sent(int(time.time()), messageType, text)
 
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_send_sms_failed(self, error):
@@ -121,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:
+			_moduleLogger.info("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:
+			_moduleLogger.info("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, )
@@ -132,7 +148,7 @@ class TextChannel(tp.ChannelTypeText):
 			return
 
 		messages = [
-			newMessage
+			(newMessage, newConversation)
 			for newConversation in newConversations
 			for newMessage in newConversation.messages
 			if not gvoice.conversations.is_message_from_self(newMessage)
@@ -142,19 +158,24 @@ class TextChannel(tp.ChannelTypeText):
 				"How did this happen for %r?" % (self._contactKey, )
 			)
 			return
-		for newMessage 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)
+			self._report_new_message(formattedMessage, conv.time)
 
-		for conv in newConversations:
+		for conv in mergedConversations.conversations:
 			conv.isRead = True
 
 	def _format_message(self, message):
 		return " ".join(part.text.strip() for part in message.body)
 
-	def _report_new_message(self, message):
+	def _report_new_message(self, message, convTime):
 		currentReceivedId = self.__nextRecievedId
-		timestamp = int(time.time())
+		timestamp = time.mktime(convTime.timetuple())
 		type = telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL
 
 		_moduleLogger.info("Received message from User %r" % self.__otherHandle)