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

Resultify set_gossiped_timestamp

Browse Source
This commit is contained in:
Alexander Krotov
2019-12-11 16:43:21 +03:00
committed by holger krekel
parent 9e309132f8
commit 789fc0a7e0
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/chat.rs
View File

@@ -1465,7 +1465,7 @@ pub(crate) fn add_contact_to_chat_ex(
let contact = Contact::get_by_id(context, contact_id)?; let contact = Contact::get_by_id(context, contact_id)?;
let mut msg = Message::default(); let mut msg = Message::default();
reset_gossiped_timestamp(context, chat_id); reset_gossiped_timestamp(context, chat_id)?;
/*this also makes sure, not contacts are added to special or normal chats*/ /*this also makes sure, not contacts are added to special or normal chats*/
let mut chat = Chat::load_from_db(context, chat_id)?; let mut chat = Chat::load_from_db(context, chat_id)?;
@@ -1563,12 +1563,15 @@ fn real_group_exists(context: &Context, chat_id: u32) -> bool {
.unwrap_or_default() .unwrap_or_default()
} }
pub fn reset_gossiped_timestamp(context: &Context, chat_id: u32) { pub fn reset_gossiped_timestamp(context: &Context, chat_id: u32) -> crate::sql::Result<()> {
set_gossiped_timestamp(context, chat_id, 0); set_gossiped_timestamp(context, chat_id, 0)
} }
// Should return Result pub fn set_gossiped_timestamp(
pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) { context: &Context,
chat_id: u32,
timestamp: i64,
) -> crate::sql::Result<()> {
if 0 != chat_id { if 0 != chat_id {
info!( info!(
context, context,
@@ -1581,7 +1584,6 @@ pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
"UPDATE chats SET gossiped_timestamp=? WHERE id=?;", "UPDATE chats SET gossiped_timestamp=? WHERE id=?;",
params![timestamp, chat_id as i32], params![timestamp, chat_id as i32],
) )
.ok();
} else { } else {
info!( info!(
context, context,
@@ -1593,7 +1595,6 @@ pub fn set_gossiped_timestamp(context: &Context, chat_id: u32, timestamp: i64) {
"UPDATE chats SET gossiped_timestamp=?;", "UPDATE chats SET gossiped_timestamp=?;",
params![timestamp], params![timestamp],
) )
.ok();
} }
} }

2
src/dc_receive_imf.rs
View File

@@ -1085,7 +1085,7 @@ fn create_or_lookup_group(
} }
} }
send_EVENT_CHAT_MODIFIED = true; send_EVENT_CHAT_MODIFIED = true;
chat::reset_gossiped_timestamp(context, chat_id); chat::reset_gossiped_timestamp(context, chat_id)?;
} }
if send_EVENT_CHAT_MODIFIED { if send_EVENT_CHAT_MODIFIED {

2
src/job.rs
View File

@@ -678,7 +678,7 @@ pub fn job_send_msg(context: &Context, msg_id: MsgId) -> Result<(), Error> {
} }
if rendered_msg.is_gossiped { if rendered_msg.is_gossiped {
chat::set_gossiped_timestamp(context, msg.chat_id, time()); chat::set_gossiped_timestamp(context, msg.chat_id, time())?;
} }
if 0 != rendered_msg.last_added_location_id { if 0 != rendered_msg.last_added_location_id {

2
src/peerstate.rs
View File

@@ -417,7 +417,7 @@ impl<'a> Peerstate<'a> {
&self.addr, &self.addr,
], ],
)?; )?;
reset_gossiped_timestamp(self.context, 0); reset_gossiped_timestamp(self.context, 0)?;
} else if self.to_save == Some(ToSave::Timestamps) { } else if self.to_save == Some(ToSave::Timestamps) {
sql::execute( sql::execute(
self.context, self.context,