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

chatlist: remove indexing in get_{chat,msg}_id()

Browse Source
This commit is contained in:
Alexander Krotov
2020-03-28 03:13:05 +03:00
committed by Alexander Krotov
parent 324e5d0258
commit 76b7e7408a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/chatlist.rs
View File

@@ -5,7 +5,7 @@ use crate::chat::*;
use crate::constants::*; use crate::constants::*;
use crate::contact::*; use crate::contact::*;
use crate::context::*; use crate::context::*;
use crate::error::{ensure, Result}; use crate::error::{bail, ensure, Result};
use crate::lot::Lot; use crate::lot::Lot;
use crate::message::{Message, MessageState, MsgId}; use crate::message::{Message, MessageState, MsgId};
use crate::stock::StockMessage; use crate::stock::StockMessage;
@@ -275,18 +275,20 @@ impl Chatlist {
/// ///
/// To get the message object from the message ID, use dc_get_chat(). /// To get the message object from the message ID, use dc_get_chat().
pub fn get_chat_id(&self, index: usize) -> ChatId { pub fn get_chat_id(&self, index: usize) -> ChatId {
if index >= self.ids.len() { match self.ids.get(index) {
return ChatId::new(0); Some((chat_id, _msg_id)) => *chat_id,
None => ChatId::new(0),
} }
self.ids[index].0
} }
/// Get a single message ID of a chatlist. /// Get a single message ID of a chatlist.
/// ///
/// To get the message object from the message ID, use dc_get_msg(). /// To get the message object from the message ID, use dc_get_msg().
pub fn get_msg_id(&self, index: usize) -> Result<MsgId> { pub fn get_msg_id(&self, index: usize) -> Result<MsgId> {
ensure!(index < self.ids.len(), "Chatlist index out of range"); match self.ids.get(index) {
Ok(self.ids[index].1) Some((_chat_id, msg_id)) => Ok(*msg_id),
None => bail!("Chatlist index out of range"),
}
} }
/// Get a summary for a chatlist index. /// Get a summary for a chatlist index.