Fixing non-ascii support

[theonering] / src / channel / text.py

diff --git a/src/channel/text.py b/src/channel/text.py
index 9aff9f2..206299c 100644 (file)
--- a/src/channel/text.py
+++ b/src/channel/text.py
@@ -39,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:
@@ -74,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()
@@ -126,24 +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 = 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 = self._filter_out_reported(newConversations)
-               newConversations = list(newConversations)
-               if not newConversations:
-                       _moduleLogger.debug(
-                               "New messages for %r have already been reported" % (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, )