diff --git a/src/headerdef.rs b/src/headerdef.rs index bf4f15b04..df75adec7 100644 --- a/src/headerdef.rs +++ b/src/headerdef.rs @@ -26,7 +26,6 @@ pub enum HeaderDef { ChatGroupName, ChatGroupNameChanged, ChatVerified, - ChatGroupImage, // deprecated ChatGroupAvatar, ChatUserAvatar, ChatVoiceMessage, diff --git a/src/mimefactory.rs b/src/mimefactory.rs index d48854030..2c6a56842 100644 --- a/src/mimefactory.rs +++ b/src/mimefactory.rs @@ -638,7 +638,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> { let command = self.msg.param.get_cmd(); let mut placeholdertext = None; let mut meta_part = None; - let mut add_compatibility_header = false; if chat.typ == Chattype::VerifiedGroup { protected_headers.push(Header::new("Chat-Verified".to_string(), "1".to_string())); @@ -681,7 +680,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> { "vg-member-added".to_string(), )); } - add_compatibility_header = true; } SystemMessage::GroupNameChanged => { let value_to_add = self.msg.param.get(Param::Arg).unwrap_or_default(); @@ -702,7 +700,6 @@ impl<'a, 'b> MimeFactory<'a, 'b> { "0".to_string(), )); } - add_compatibility_header = true; } _ => {} } @@ -770,18 +767,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> { let (mail, filename_as_sent) = build_body_file(context, &meta, "group-image")?; meta_part = Some(mail); - protected_headers.push(Header::new( - "Chat-Group-Avatar".into(), - filename_as_sent.clone(), - )); - - // add the old group-image headers for versions <=0.973 resp. <=beta.15 (december 2019) - // image deletion is not supported in the compatibility layer. - // this can be removed some time after releasing 1.0, - // grep for #DeprecatedAvatar to get the place where compatibility parsing takes place. - if add_compatibility_header { - protected_headers.push(Header::new("Chat-Group-Image".into(), filename_as_sent)); - } + protected_headers.push(Header::new("Chat-Group-Avatar".into(), filename_as_sent)); } if self.msg.viewtype == Viewtype::Sticker { diff --git a/src/mimeparser.rs b/src/mimeparser.rs index 3c059b4fb..817360879 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -200,10 +200,6 @@ impl MimeMessage { fn parse_avatar_headers(&mut self) { if let Some(header_value) = self.get(HeaderDef::ChatGroupAvatar).cloned() { self.group_avatar = self.avatar_action_from_header(header_value); - } else if let Some(header_value) = self.get(HeaderDef::ChatGroupImage).cloned() { - // parse the old group-image headers for versions <=0.973 resp. <=beta.15 (december 2019) - // grep for #DeprecatedAvatar to get the place where a compatibility header is generated. - self.group_avatar = self.avatar_action_from_header(header_value); } if let Some(header_value) = self.get(HeaderDef::ChatUserAvatar).cloned() {