From 3ef581bc5d863024ecde265fd636235c73ebbb57 Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Wed, 5 Apr 2017 23:46:32 +0300
Subject: [PATCH] some messages improvements

---
 toxygen/contact.py | 16 +++++++++-------
 toxygen/profile.py |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/toxygen/contact.py b/toxygen/contact.py
index 0a9a1aa..6f28164 100644
--- a/toxygen/contact.py
+++ b/toxygen/contact.py
@@ -30,7 +30,6 @@ class Contact(basecontact.BaseContact):
         self._corr = []
         self._unsaved_messages = 0
         self._history_loaded = self._new_actions = False
-        self._receipts = 0
         self._curr_text = self._search_string = ''
         self._search_index = 0
 
@@ -140,12 +139,15 @@ class Contact(basecontact.BaseContact):
         """
         Delete old messages (reduces RAM usage if messages saving is not enabled)
         """
-        old = filter(lambda x: x.get_type() == 2 and (x.get_status() >= 2 or x.get_status() is None),
-                     self._corr[:-SAVE_MESSAGES])
-        old = list(old)
-        l = max(len(self._corr) - SAVE_MESSAGES, 0) - len(old)
-        self._unsaved_messages -= l
-        self._corr = old + self._corr[-SAVE_MESSAGES:]
+        def save_message(x):
+            if x.get_type() == 2 and (x.get_status() >= 2 or x.get_status() is None):
+                return True
+            return x.get_owner() == MESSAGE_OWNER['NOT_SENT']
+
+        old = filter(save_message, self._corr[:-SAVE_MESSAGES])
+        self._corr = list(old) + self._corr[-SAVE_MESSAGES:]
+        text_messages = filter(lambda x: x.get_type <= 1, self._corr)
+        self._unsaved_messages = min(self._unsaved_messages, len(list(text_messages)))
         self._search_index = 0
 
     def clear_corr(self, save_unsent=False):
diff --git a/toxygen/profile.py b/toxygen/profile.py
index ea77779..3f48cc9 100644
--- a/toxygen/profile.py
+++ b/toxygen/profile.py
@@ -412,8 +412,8 @@ class Profile(basecontact.BaseContact, Singleton):
             for message in messages:
                 self.split_and_send(friend_number, message.get_data()[-1], message.get_data()[0].encode('utf-8'))
                 friend.inc_receipts()
-        except:
-            pass
+        except Exception as ex:
+            log('Sending pending messages failed with ' + str(ex))
 
     def split_and_send(self, number, message_type, message):
         """