Making phone numbers as consistent as possible so user started conversations don...

[theonering] / src / channel / text.py

diff --git a/src/channel/text.py b/src/channel/text.py
index dfc1a49..b1a7aa9 100644 (file)
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -4,6 +4,7 @@ import logging
 
 import telepathy
 
+import tp
 import util.coroutines as coroutines
 import gtk_toolbox
 
@@ -11,7 +12,7 @@ import gtk_toolbox
 _moduleLogger = logging.getLogger("channel.text")
 
 
-class TextChannel(telepathy.server.ChannelTypeText):
+class TextChannel(tp.ChannelTypeText):
        """
        Look into implementing ChannelInterfaceMessages for rich text formatting
        """
@@ -20,17 +21,7 @@ class TextChannel(telepathy.server.ChannelTypeText):
                self.__manager = manager
                self.__props = props
 
-               try:
-                       # HACK Older python-telepathy way
-                       telepathy.server.ChannelTypeText.__init__(self, connection, contactHandle)
-                       self._requested = props[telepathy.interfaces.CHANNEL_INTERFACE + '.Requested']
-                       self._implement_property_get(
-                               telepathy.interfaces.CHANNEL_INTERFACE,
-                               {"Requested": lambda: self._requested}
-                       )
-               except TypeError:
-                       # HACK Newer python-telepathy way
-                       telepathy.server.ChannelTypeText.__init__(self, connection, manager, props)
+               tp.ChannelTypeText.__init__(self, connection, manager, props)
                self.__nextRecievedId = 0
                self.__lastMessageTimestamp = datetime.datetime(1, 1, 1)
 
@@ -53,37 +44,22 @@ class TextChannel(telepathy.server.ChannelTypeText):
                try:
                        mergedConversations = self._conn.session.voicemails.get_conversation(self._contactKey)
                except KeyError:
-                       _moduleLogger.debug("Nothing in the conversation yet for %r" % (self._contactKey, ))
+                       _moduleLogger.debug("No voicemails in the conversation yet for %r" % (self._contactKey, ))
                else:
                        self._report_conversation(mergedConversations)
                try:
                        mergedConversations = self._conn.session.texts.get_conversation(self._contactKey)
                except KeyError:
-                       _moduleLogger.debug("Nothing in the conversation yet for %r" % (self._contactKey, ))
+                       _moduleLogger.debug("No texts conversation yet for %r" % (self._contactKey, ))
                else:
                        self._report_conversation(mergedConversations)
 
-       def get_props(self):
-               # HACK Older python-telepathy doesn't provide this
-               _immutable_properties = {
-                       'ChannelType': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetHandle': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'Interfaces': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetHandleType': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'TargetID': telepathy.server.interfaces.CHANNEL_INTERFACE,
-                       'Requested': telepathy.server.interfaces.CHANNEL_INTERFACE
-               }
-               props = dict()
-               for prop, iface in _immutable_properties.items():
-                       props[iface + '.' + prop] = \
-                               self._prop_getters[iface][prop]()
-               return props
-
        @gtk_toolbox.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.backend.send_sms(self.__otherHandle.phoneNumber, text)
                self._conn.session.textsStateMachine.reset_timers()
 
@@ -102,10 +78,7 @@ class TextChannel(telepathy.server.ChannelTypeText):
                )
                self.__callback = None
 
-               telepathy.server.ChannelTypeText.Close(self)
-               if self.__manager.channel_exists(self.__props):
-                       # HACK Older python-telepathy requires doing this manually
-                       self.__manager.remove_channel(self)
+               tp.ChannelTypeText.Close(self)
                self.remove_from_connection()
 
        @property
@@ -122,7 +95,15 @@ class TextChannel(telepathy.server.ChannelTypeText):
                self._report_conversation(mergedConversations)
 
        def _report_conversation(self, mergedConversations):
+               # 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
                newConversations = mergedConversations.conversations
+               if not newConversations:
+                       _moduleLogger.debug(
+                               "No messages ended up existing for %r" % (self._contactKey, )
+                       )
+                       return
                newConversations = self._filter_out_reported(newConversations)
                newConversations = self._filter_out_read(newConversations)
                newConversations = list(newConversations)