Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-13 11:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove indexing in chatlist.get_summary()

Browse Source
This commit is contained in:
Alexander Krotov
2020-03-28 03:29:36 +03:00
committed by Alexander Krotov
parent cb92579461
commit 9fcb30ac33
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/chatlist.rs
View File

@@ -312,25 +312,27 @@ impl Chatlist {
// Also, sth. as "No messages" would not work if the summary comes from a message. // Also, sth. as "No messages" would not work if the summary comes from a message.
let mut ret = Lot::new(); let mut ret = Lot::new();
if index >= self.ids.len() { let (chat_id, lastmsg_id) = match self.ids.get(index) {
ret.text2 = Some("ErrBadChatlistIndex".to_string()); Some(ids) => ids,
return ret; None => {
} ret.text2 = Some("ErrBadChatlistIndex".to_string());
return ret;
}
};
let chat_loaded: Chat; let chat_loaded: Chat;
let chat = if let Some(chat) = chat { let chat = if let Some(chat) = chat {
chat chat
} else if let Ok(chat) = Chat::load_from_db(context, self.ids[index].0) { } else if let Ok(chat) = Chat::load_from_db(context, *chat_id) {
chat_loaded = chat; chat_loaded = chat;
&chat_loaded &chat_loaded
} else { } else {
return ret; return ret;
}; };
let lastmsg_id = self.ids[index].1;
let mut lastcontact = None; let mut lastcontact = None;
let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, lastmsg_id) { let lastmsg = if let Ok(lastmsg) = Message::load_from_db(context, *lastmsg_id) {
if lastmsg.from_id != DC_CONTACT_ID_SELF if lastmsg.from_id != DC_CONTACT_ID_SELF
&& (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup) && (chat.typ == Chattype::Group || chat.typ == Chattype::VerifiedGroup)
{ {