File tree Expand file tree Collapse file tree 2 files changed +29
-29
lines changed
Expand file tree Collapse file tree 2 files changed +29
-29
lines changed Original file line number Diff line number Diff line change @@ -841,9 +841,9 @@ impl Message {
841841 . param
842842 . get ( Param :: PostMessageFileBytes )
843843 . and_then ( |s| s. parse ( ) . ok ( ) )
844- {
845- return Ok ( Some ( file_size) ) ;
846- }
844+ {
845+ return Ok ( Some ( file_size) ) ;
846+ }
847847 if let Some ( path) = self . param . get_file_path ( context) ? {
848848 Ok ( Some ( get_filebytes ( context, & path) . await . with_context (
849849 || format ! ( "failed to get {} size in bytes" , path. display( ) ) ,
@@ -862,9 +862,9 @@ impl Message {
862862 . param
863863 . get_i64 ( Param :: PostMessageViewtype )
864864 . and_then ( Viewtype :: from_i64)
865- {
866- return Some ( viewtype) ;
867- }
865+ {
866+ return Some ( viewtype) ;
867+ }
868868 None
869869 }
870870
Original file line number Diff line number Diff line change @@ -608,32 +608,32 @@ impl MimeMessage {
608608 if let ( Ok ( mail) , true ) = ( mail, is_encrypted)
609609 && let Some ( post_msg_rfc724_mid) =
610610 mail. headers . get_header_value ( HeaderDef :: ChatPostMessageId )
611+ {
612+ let post_msg_rfc724_mid = parse_message_id ( & post_msg_rfc724_mid) ?;
613+ let metadata = if let Some ( value) = mail
614+ . headers
615+ . get_header_value ( HeaderDef :: ChatPostMessageMetadata )
611616 {
612- let post_msg_rfc724_mid = parse_message_id ( & post_msg_rfc724_mid) ?;
613- let metadata = if let Some ( value) = mail
614- . headers
615- . get_header_value ( HeaderDef :: ChatPostMessageMetadata )
616- {
617- match PreMsgMetadata :: try_from_header_value ( & value) {
618- Ok ( metadata) => Some ( metadata) ,
619- Err ( error) => {
620- error ! (
621- context,
622- "failed to parse metadata header in pre-message: {error:#?}"
623- ) ;
624- None
625- }
617+ match PreMsgMetadata :: try_from_header_value ( & value) {
618+ Ok ( metadata) => Some ( metadata) ,
619+ Err ( error) => {
620+ error ! (
621+ context,
622+ "failed to parse metadata header in pre-message: {error:#?}"
623+ ) ;
624+ None
626625 }
627- } else {
628- warn ! ( context, "expected pre-message to have metadata header" ) ;
629- None
630- } ;
626+ }
627+ } else {
628+ warn ! ( context, "expected pre-message to have metadata header" ) ;
629+ None
630+ } ;
631631
632- pre_message = Some ( PreMessageMode :: PreMessage {
633- post_msg_rfc724_mid,
634- metadata,
635- } ) ;
636- }
632+ pre_message = Some ( PreMessageMode :: PreMessage {
633+ post_msg_rfc724_mid,
634+ metadata,
635+ } ) ;
636+ }
637637
638638 let mut parser = MimeMessage {
639639 parts : Vec :: new ( ) ,
You can’t perform that action at this time.
0 commit comments