Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make ephemeral timer changes not ephemeral

Browse Source
This commit is contained in:
Alexander Krotov
2020-07-08 00:43:49 +03:00
committed by link2xt
parent 43c4816739
commit 7f8f871813
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/tests/test_account.py
View File

@@ -1562,7 +1562,9 @@ class TestOnlineAccount:
system_message1 = ac2._evtracker.wait_next_incoming_message()
assert chat2.get_ephemeral_timer() == 60
assert system_message1.is_system_message()
assert "Ephemeral timer: 60\n" in system_message1.get_message_info()
# Disabled until markers are implemented
# assert "Ephemeral timer: 60\n" in system_message1.get_message_info()
lp.sec("ac2: send message to ac1")
sent_message = chat2.send_text("message")

6
src/chat.rs
View File

@@ -959,7 +959,11 @@ impl Chat {
.await?;
}
let ephemeral_timer = self.id.get_ephemeral_timer(context).await?;
let ephemeral_timer = if msg.param.get_cmd() == SystemMessage::EphemeralTimerChanged {
EphemeralTimer::Disabled
} else {
self.id.get_ephemeral_timer(context).await?
};
let ephemeral_timestamp = match ephemeral_timer {
EphemeralTimer::Disabled => 0,
EphemeralTimer::Enabled { duration } => timestamp + i64::from(duration),

10
src/dc_receive_imf.rs
View File

@@ -622,7 +622,7 @@ async fn add_parts(
}
// Extract ephemeral timer from the message.
let timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
let mut timer = if let Some(value) = mime_parser.get(HeaderDef::EphemeralTimer) {
match value.parse::<EphemeralTimer>() {
Ok(timer) => timer,
Err(err) => {
@@ -658,6 +658,14 @@ async fn add_parts(
mime_parser,
stock_ephemeral_timer_changed(context, timer, from_id).await,
);
// Do not delete the system message itself.
//
// This prevents confusion when timer is changed
// to 1 week, and then changed to 1 hour: after 1
// hour, only the message about the change to 1
// week is left.
timer = EphemeralTimer::Disabled;
} else {
chat::add_info_msg(
context,