mirror of
https://github.com/chatmail/core.git
synced 2026-04-17 21:46:35 +03:00
Remove deprecated attach_selfavatar config
According to the comment it was added in Dec 2019 with an intention to remove it "after some time".
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
|
|
||||||
### API-Changes
|
### API-Changes
|
||||||
- jsonrpc: add verified-by information to `Contact`-Object
|
- jsonrpc: add verified-by information to `Contact`-Object
|
||||||
|
- Remove `attach_selfavatar` config #3951
|
||||||
|
|
||||||
|
|
||||||
## 1.106.0
|
## 1.106.0
|
||||||
|
|||||||
17
src/chat.rs
17
src/chat.rs
@@ -2902,14 +2902,12 @@ pub(crate) async fn add_contact_to_chat_ex(
|
|||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns true if an avatar should be attached in the given chat.
|
||||||
|
///
|
||||||
|
/// This function does not check if the avatar is set.
|
||||||
|
/// If avatar is not set and this function returns `true`,
|
||||||
|
/// a `Chat-User-Avatar: 0` header should be sent to reset the avatar.
|
||||||
pub(crate) async fn shall_attach_selfavatar(context: &Context, chat_id: ChatId) -> Result<bool> {
|
pub(crate) async fn shall_attach_selfavatar(context: &Context, chat_id: ChatId) -> Result<bool> {
|
||||||
// versions before 12/2019 already allowed to set selfavatar, however, it was never sent to others.
|
|
||||||
// to avoid sending out previously set selfavatars unexpectedly we added this additional check.
|
|
||||||
// it can be removed after some time.
|
|
||||||
if !context.sql.get_raw_config_bool("attach_selfavatar").await? {
|
|
||||||
return Ok(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
let timestamp_some_days_ago = time() - DC_RESEND_USER_AVATAR_DAYS * 24 * 60 * 60;
|
let timestamp_some_days_ago = time() - DC_RESEND_USER_AVATAR_DAYS * 24 * 60 * 60;
|
||||||
let needs_attach = context
|
let needs_attach = context
|
||||||
.sql
|
.sql
|
||||||
@@ -4700,12 +4698,13 @@ mod tests {
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
add_contact_to_chat(&t, chat_id, contact_id).await?;
|
add_contact_to_chat(&t, chat_id, contact_id).await?;
|
||||||
assert!(!shall_attach_selfavatar(&t, chat_id).await?);
|
|
||||||
t.set_config(Config::Selfavatar, None).await?; // setting to None also forces re-sending
|
|
||||||
assert!(shall_attach_selfavatar(&t, chat_id).await?);
|
assert!(shall_attach_selfavatar(&t, chat_id).await?);
|
||||||
|
|
||||||
chat_id.set_selfavatar_timestamp(&t, time()).await?;
|
chat_id.set_selfavatar_timestamp(&t, time()).await?;
|
||||||
assert!(!shall_attach_selfavatar(&t, chat_id).await?);
|
assert!(!shall_attach_selfavatar(&t, chat_id).await?);
|
||||||
|
|
||||||
|
t.set_config(Config::Selfavatar, None).await?; // setting to None also forces re-sending
|
||||||
|
assert!(shall_attach_selfavatar(&t, chat_id).await?);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -292,9 +292,6 @@ impl Context {
|
|||||||
self.sql
|
self.sql
|
||||||
.execute("UPDATE contacts SET selfavatar_sent=0;", paramsv![])
|
.execute("UPDATE contacts SET selfavatar_sent=0;", paramsv![])
|
||||||
.await?;
|
.await?;
|
||||||
self.sql
|
|
||||||
.set_raw_config_bool("attach_selfavatar", true)
|
|
||||||
.await?;
|
|
||||||
match value {
|
match value {
|
||||||
Some(value) => {
|
Some(value) => {
|
||||||
let mut blob = BlobObject::new_from_path(self, value.as_ref()).await?;
|
let mut blob = BlobObject::new_from_path(self, value.as_ref()).await?;
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ pub struct MimeFactory<'a> {
|
|||||||
/// and must be deleted if the message is actually queued for sending.
|
/// and must be deleted if the message is actually queued for sending.
|
||||||
sync_ids_to_delete: Option<String>,
|
sync_ids_to_delete: Option<String>,
|
||||||
|
|
||||||
|
/// True if the avatar should be attached.
|
||||||
attach_selfavatar: bool,
|
attach_selfavatar: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user