@@ -55,15 +55,15 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
5555 }
5656 MediaKind :: Video ( video) => {
5757 let file_id = video. video . file . id ;
58- let file_name = format ! (
58+ let file_name = video . video . file_name . unwrap_or ( format ! (
5959 "{}.{}" ,
60- video . video . file_name . unwrap_or ( file_id. clone( ) ) ,
60+ file_id. clone( ) ,
6161 video
6262 . video
6363 . mime_type
6464 . and_then( |m| m. suffix( ) . map( |n| n. as_str( ) . to_owned( ) ) )
6565 . unwrap_or( "mp4" . to_string( ) )
66- ) ;
66+ ) ) ;
6767 if video. media_group_id . is_some ( ) {
6868 // break up the group
6969 let old = msg_id;
@@ -79,18 +79,15 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
7979 }
8080 MediaKind :: Audio ( audio) => {
8181 let file_id = audio. audio . file . id ;
82- let file_name = format ! (
82+ let file_name = audio . audio . file_name . unwrap_or ( format ! (
8383 "{}.{}" ,
84- audio
85- . audio
86- . title
87- . unwrap_or( audio. audio. file_name. unwrap_or( file_id. clone( ) ) ) ,
84+ file_id. clone( ) ,
8885 audio
8986 . audio
9087 . mime_type
9188 . and_then( |m| m. suffix( ) . map( |n| n. as_str( ) . to_owned( ) ) )
9289 . unwrap_or( "mp3" . to_string( ) )
93- ) ;
90+ ) ) ;
9491 if audio. media_group_id . is_some ( ) {
9592 // break up the group
9693 let old = msg_id;
@@ -105,13 +102,8 @@ async fn handle(bot: Bot, dialogue: MyDialogue, msg: Message, storage: MyStorage
105102 Some ( ( file_id, file_name) )
106103 }
107104 MediaKind :: Photo ( photo) => {
108- let file_id = photo
109- . photo
110- . into_iter ( )
111- . max_by_key ( |p| p. height )
112- . unwrap ( )
113- . file
114- . id ;
105+ let file = photo. photo . into_iter ( ) . max_by_key ( |p| p. height ) . unwrap ( ) ;
106+ let file_id = file. file . id ;
115107 let file_name = format ! ( "{}.jpg" , file_id) ;
116108 if photo. media_group_id . is_some ( ) {
117109 // break up the group
0 commit comments