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

make clippy happy

Browse Source
This commit is contained in:
B. Petersen
2021-01-13 16:44:15 +01:00
committed by link2xt
parent 662735c233
commit e077ee9238
2 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/dc_receive_imf.rs
View File

@@ -1185,41 +1185,38 @@ async fn create_or_lookup_group(
) )
.await; .await;
X_MrAddToGrp = Some(optional_field); X_MrAddToGrp = Some(optional_field);
} else { } else if let Some(old_name) = mime_parser.get(HeaderDef::ChatGroupNameChanged) {
if let Some(old_name) = mime_parser.get(HeaderDef::ChatGroupNameChanged) { X_MrGrpNameChanged = true;
X_MrGrpNameChanged = true; better_msg = context
better_msg = context .stock_system_msg(
.stock_system_msg( StockMessage::MsgGrpName,
StockMessage::MsgGrpName, old_name,
old_name, if let Some(ref name) = grpname {
if let Some(ref name) = grpname { name
name } else {
} else { ""
"" },
}, from_id as u32,
from_id as u32, )
) .await;
.await; mime_parser.is_system_message = SystemMessage::GroupNameChanged;
} else if let Some(value) = mime_parser.get(HeaderDef::ChatContent) {
mime_parser.is_system_message = SystemMessage::GroupNameChanged; if value == "group-avatar-changed" {
} else if let Some(value) = mime_parser.get(HeaderDef::ChatContent) { if let Some(avatar_action) = &mime_parser.group_avatar {
if value == "group-avatar-changed" { // this is just an explicit message containing the group-avatar,
if let Some(avatar_action) = &mime_parser.group_avatar { // apart from that, the group-avatar is send along with various other messages
// this is just an explicit message containing the group-avatar, mime_parser.is_system_message = SystemMessage::GroupImageChanged;
// apart from that, the group-avatar is send along with various other messages better_msg = context
mime_parser.is_system_message = SystemMessage::GroupImageChanged; .stock_system_msg(
better_msg = context match avatar_action {
.stock_system_msg( AvatarAction::Delete => StockMessage::MsgGrpImgDeleted,
match avatar_action { AvatarAction::Change(_) => StockMessage::MsgGrpImgChanged,
AvatarAction::Delete => StockMessage::MsgGrpImgDeleted, },
AvatarAction::Change(_) => StockMessage::MsgGrpImgChanged, "",
}, "",
"", from_id as u32,
"", )
from_id as u32, .await
)
.await
}
} }
} }
} }

2
src/mimefactory.rs
View File

@@ -756,7 +756,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
let old_name = self.msg.param.get(Param::Arg).unwrap_or_default(); let old_name = self.msg.param.get(Param::Arg).unwrap_or_default();
protected_headers.push(Header::new( protected_headers.push(Header::new(
"Chat-Group-Name-Changed".into(), "Chat-Group-Name-Changed".into(),
maybe_encode_words(old_name.into()), maybe_encode_words(old_name),
)); ));
} }
SystemMessage::GroupImageChanged => { SystemMessage::GroupImageChanged => {