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

Set timer to 0 if no Autodelete-Timer header is present

Browse Source
This commit is contained in:
Alexander Krotov
2020-01-06 00:26:35 +01:00
parent 67b486bfbd
commit 997c5ad68a
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/tests/test_account.py
View File

@@ -1494,6 +1494,12 @@ class TestOnlineAccount:
ac1._evtracker.consume_events() ac1._evtracker.consume_events()
ac2._evtracker.consume_events() ac2._evtracker.consume_events()
# Reset the timer back to 0
chat2.set_autodelete_timer(0)
ac1._evtracker.get_matching("DC_EVENT_CHAT_AUTODELETE_TIMER_MODIFIED")
ac1._evtracker.get_matching("DC_EVENT_INCOMING_MSG")
assert chat1.get_autodelete_timer() == 0
class TestGroupStressTests: class TestGroupStressTests:
def test_group_many_members_add_leave_remove(self, acfactory, lp): def test_group_many_members_add_leave_remove(self, acfactory, lp):

10
src/dc_receive_imf.rs
View File

@@ -201,8 +201,8 @@ pub fn dc_receive_imf(
}; };
} }
if let Some(value) = mime_parser.get(HeaderDef::AutodeleteTimer) { let timer = if let Some(value) = mime_parser.get(HeaderDef::AutodeleteTimer) {
let timer = match value.parse::<u32>() { match value.parse::<u32>() {
Ok(timer) => timer, Ok(timer) => timer,
Err(err) => { Err(err) => {
warn!( warn!(
@@ -211,8 +211,12 @@ pub fn dc_receive_imf(
); );
0 0
} }
}; }
} else {
0
};
if chat::get_autodelete_timer(context, chat_id) != timer {
match chat::set_autodelete_timer(context, chat_id, timer) { match chat::set_autodelete_timer(context, chat_id, timer) {
Ok(()) => { Ok(()) => {
context.call_cb(Event::ChatAutodeleteTimerModified { chat_id, timer }); context.call_cb(Event::ChatAutodeleteTimerModified { chat_id, timer });