File tree Expand file tree Collapse file tree
bindings/matrix-sdk-ffi/src Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1817,7 +1817,7 @@ pub struct ServerVersionInfo {
18171817impl From < matrix_sdk:: ServerVersionInfo > for ServerVersionInfo {
18181818 fn from ( value : matrix_sdk:: ServerVersionInfo ) -> Self {
18191819 Self {
1820- server_name : value. server_name . to_string ( ) ,
1820+ server_name : value. server_name ,
18211821 version : value. version ,
18221822 }
18231823 }
Original file line number Diff line number Diff line change @@ -156,7 +156,7 @@ pub enum SessionChange {
156156#[ derive( Debug , Clone , PartialEq , Eq ) ]
157157pub struct ServerVersionInfo {
158158 /// The server name.
159- pub server_name : OwnedServerName ,
159+ pub server_name : String ,
160160 /// The server version.
161161 pub version : String ,
162162}
@@ -557,12 +557,7 @@ impl Client {
557557 let server_name_str = server. name . unwrap_or_else ( || "unknown" . to_string ( ) ) ;
558558 let version = server. version . unwrap_or_else ( || "unknown" . to_string ( ) ) ;
559559
560- // Try to parse the server name, fallback to a safe default if parsing fails
561- let server_name = server_name_str
562- . try_into ( )
563- . unwrap_or_else ( |_| "unknown.server" . try_into ( ) . unwrap ( ) ) ;
564-
565- Ok ( ServerVersionInfo { server_name, version } )
560+ Ok ( ServerVersionInfo { server_name : server_name_str, version } )
566561 }
567562
568563 /// Get a copy of the default request config.
Original file line number Diff line number Diff line change @@ -1514,7 +1514,7 @@ async fn test_server_version() {
15141514
15151515 let server_info = client. server_version ( ) . await . unwrap ( ) ;
15161516
1517- assert_eq ! ( server_info. server_name. as_str ( ) , "Synapse" ) ;
1517+ assert_eq ! ( server_info. server_name, "Synapse" ) ;
15181518 assert_eq ! ( server_info. version, "1.70.0" ) ;
15191519}
15201520
@@ -1537,6 +1537,6 @@ async fn test_server_version_with_missing_fields() {
15371537 let server_info = client. server_version ( ) . await . unwrap ( ) ;
15381538
15391539 // Should use defaults for missing fields
1540- assert_eq ! ( server_info. server_name. as_str ( ) , "unknown" ) ;
1540+ assert_eq ! ( server_info. server_name, "unknown" ) ;
15411541 assert_eq ! ( server_info. version, "unknown" ) ;
15421542}
You can’t perform that action at this time.
0 commit comments