From 77bdabb993fccdbbc337f2b5015a68e94c53f9d9 Mon Sep 17 00:00:00 2001
From: ingvar1995 <igorn1995@yandex.ru>
Date: Sat, 19 May 2018 21:25:57 +0300
Subject: [PATCH] minor fixes - history

---
 toxygen/contacts/contact.py | 20 ++++++++++----------
 toxygen/contacts/friend.py  |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/toxygen/contacts/contact.py b/toxygen/contacts/contact.py
index d3861bc..d7fe35e 100644
--- a/toxygen/contacts/contact.py
+++ b/toxygen/contacts/contact.py
@@ -74,7 +74,7 @@ class Contact(basecontact.BaseContact):
         Get data to save in db
         :return: list of unsaved messages or []
         """
-        messages = list(filter(lambda x: x.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
+        messages = list(filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
         return messages[-self._unsaved_messages:] if self._unsaved_messages else []
 
     def get_corr(self):
@@ -125,8 +125,8 @@ class Contact(basecontact.BaseContact):
         """
         :return list of unsent messages for saving
         """
-        messages = filter(lambda x: x.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
-                                    and x.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr)
+        messages = filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
+                                    and m.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr)
         return list(messages)
 
     def mark_as_sent(self, tox_message_id):
@@ -142,9 +142,9 @@ class Contact(basecontact.BaseContact):
     # -----------------------------------------------------------------------------------------------------------------
 
     def delete_message(self, message_id):
-        elem = list(filter(lambda x: type(x) in (TextMessage, GroupChatMessage) and x.message_id == message_id,
+        elem = list(filter(lambda m: type(m) in (TextMessage, GroupChatMessage) and m.message_id == message_id,
                            self._corr))[0]
-        tmp = list(filter(lambda x: x.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
+        tmp = list(filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']), self._corr))
         if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
             self._unsaved_messages -= 1
         self._corr.remove(elem)
@@ -155,10 +155,10 @@ class Contact(basecontact.BaseContact):
         """
         Delete old messages (reduces RAM usage if messages saving is not enabled)
         """
-        def save_message(x):
-            if x.type == MESSAGE_TYPE['FILE_TRANSFER'] and (x.state not in ACTIVE_FILE_TRANSFERS):
+        def save_message(m):
+            if m.type == MESSAGE_TYPE['FILE_TRANSFER'] and (m.state not in ACTIVE_FILE_TRANSFERS):
                 return True
-            return x.author.type == MESSAGE_AUTHOR['NOT_SENT']
+            return m.author is not None and m.author.type == MESSAGE_AUTHOR['NOT_SENT']
 
         old = filter(save_message, self._corr[:-SAVE_MESSAGES])
         self._corr = list(old) + self._corr[-SAVE_MESSAGES:]
@@ -213,7 +213,7 @@ class Contact(basecontact.BaseContact):
         if not self._search_index:
             return None
         for i in range(self._search_index + 1, 0):
-            if self._corr[i].get_type() > (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
+            if self._corr[i].type not in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']):
                 continue
             message = self._corr[i].text
             if re.search(self._search_string, message, re.IGNORECASE) is not None:
@@ -294,7 +294,7 @@ class Contact(basecontact.BaseContact):
     messages = property(get_messages)
 
     # -----------------------------------------------------------------------------------------------------------------
-    # Friend's number (can be used in toxcore)
+    # Friend's or group's number (can be used in toxcore)
     # -----------------------------------------------------------------------------------------------------------------
 
     def get_number(self):
diff --git a/toxygen/contacts/friend.py b/toxygen/contacts/friend.py
index 9103463..5c8eabb 100644
--- a/toxygen/contacts/friend.py
+++ b/toxygen/contacts/friend.py
@@ -23,7 +23,7 @@ class Friend(contact.Contact):
         Update status of active transfer and load inline if needed
         """
         try:
-            tr = list(filter(lambda x: x.message_id == before_message_id, self._corr))[0]
+            tr = list(filter(lambda m: m.message_id == before_message_id, self._corr))[0]
             i = self._corr.index(tr)
             if inline:  # inline was loaded
                 self._corr.insert(i, inline)
@@ -32,11 +32,11 @@ class Friend(contact.Contact):
             pass
 
     def get_unsent_files(self):
-        messages = filter(lambda x: type(x) is UnsentFileMessage, self._corr)
+        messages = filter(lambda m: type(m) is UnsentFileMessage, self._corr)
         return list(messages)
 
     def clear_unsent_files(self):
-        self._corr = list(filter(lambda x: type(x) is not UnsentFileMessage, self._corr))
+        self._corr = list(filter(lambda m: type(m) is not UnsentFileMessage, self._corr))
 
     def remove_invalid_unsent_files(self):
         def is_valid(message):