emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fixes - history

Browse source
This commit is contained in:
ingvar1995 2018-05-19 21:25:57 +03:00
parent 206c5c4905
commit 77bdabb993
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
toxygen/contacts/contact.py
View file

@ -74,7 +74,7 @@ class Contact(basecontact.BaseContact):
Get data to save in db Get data to save in db
:return: list of unsaved messages or [] :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 [] return messages[-self._unsaved_messages:] if self._unsaved_messages else []
def get_corr(self): def get_corr(self):
@ -125,8 +125,8 @@ class Contact(basecontact.BaseContact):
""" """
:return list of unsent messages for saving :return list of unsent messages for saving
""" """
messages = filter(lambda x: x.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION']) messages = filter(lambda m: m.type in (MESSAGE_TYPE['TEXT'], MESSAGE_TYPE['ACTION'])
and x.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr) and m.author.type == MESSAGE_AUTHOR['NOT_SENT'], self._corr)
return list(messages) return list(messages)
def mark_as_sent(self, tox_message_id): def mark_as_sent(self, tox_message_id):
@ -142,9 +142,9 @@ class Contact(basecontact.BaseContact):
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
def delete_message(self, message_id): 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] 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: if elem in tmp[-self._unsaved_messages:] and self._unsaved_messages:
self._unsaved_messages -= 1 self._unsaved_messages -= 1
self._corr.remove(elem) self._corr.remove(elem)
@ -155,10 +155,10 @@ class Contact(basecontact.BaseContact):
""" """
Delete old messages (reduces RAM usage if messages saving is not enabled) Delete old messages (reduces RAM usage if messages saving is not enabled)
""" """
def save_message(x): def save_message(m):
if x.type == MESSAGE_TYPE['FILE_TRANSFER'] and (x.state not in ACTIVE_FILE_TRANSFERS): if m.type == MESSAGE_TYPE['FILE_TRANSFER'] and (m.state not in ACTIVE_FILE_TRANSFERS):
return True 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]) old = filter(save_message, self._corr[:-SAVE_MESSAGES])
self._corr = list(old) + 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: if not self._search_index:
return None return None
for i in range(self._search_index + 1, 0): 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 continue
message = self._corr[i].text message = self._corr[i].text
if re.search(self._search_string, message, re.IGNORECASE) is not None: if re.search(self._search_string, message, re.IGNORECASE) is not None:
@ -294,7 +294,7 @@ class Contact(basecontact.BaseContact):
messages = property(get_messages) 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): def get_number(self):

6
toxygen/contacts/friend.py
View file

@ -23,7 +23,7 @@ class Friend(contact.Contact):
Update status of active transfer and load inline if needed Update status of active transfer and load inline if needed
""" """
try: 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) i = self._corr.index(tr)
if inline: # inline was loaded if inline: # inline was loaded
self._corr.insert(i, inline) self._corr.insert(i, inline)
@ -32,11 +32,11 @@ class Friend(contact.Contact):
pass pass
def get_unsent_files(self): 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) return list(messages)
def clear_unsent_files(self): 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 remove_invalid_unsent_files(self):
def is_valid(message): def is_valid(message):