import time
+import datetime
import logging
import telepathy
class TextChannel(tp.ChannelTypeText):
+ OLDEST_MESSAGE_WINDOW = datetime.timedelta(days=1)
+
def __init__(self, connection, manager, props, contactHandle):
self.__manager = manager
self.__props = props
@misc_utils.log_exception(_moduleLogger)
def Send(self, messageType, text):
- le = gobject_utils.LinearExecution(self._send)
+ le = gobject_utils.AsyncLinearExecution(self._conn.session.pool, self._send)
le.start(messageType, text)
- def _send(self, messageType, text, on_success, on_error):
+ @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, ))
try:
- result = yield self._conn.session.pool.add_task, (
+ result = yield (
self._conn.session.backend.send_sms,
([self.__otherHandle.phoneNumber], text),
{},
- on_success,
- on_error,
- ), {}
+ )
except Exception:
_moduleLogger.exception(result)
return
return
messages = [
- newMessage
+ (newMessage, newConversation)
for newConversation in newConversations
for newMessage in newConversation.messages
if not gvoice.conversations.is_message_from_self(newMessage)
"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)