From c703be2ca5ca4923a0a0395e5377940ce6b0ad1a Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Sun, 20 Apr 2025 10:01:22 -0700 Subject: [PATCH] server: more robust view original serving --- server/src/bin/letterbox-server.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/src/bin/letterbox-server.rs b/server/src/bin/letterbox-server.rs index def4e6b..cfab81f 100644 --- a/server/src/bin/letterbox-server.rs +++ b/server/src/bin/letterbox-server.rs @@ -149,17 +149,13 @@ async fn view_original( ) -> Result { info!("view_original {id}"); let mid = if id.starts_with("id:") { - id.to_string() + id } else { - format!("id:{}", id) + format!("id:{id}") }; - let files = nm.files(&mid)?; - let Some(path) = files.first() else { - warn!("failed to find files for message {mid}"); - return Ok((StatusCode::NOT_FOUND, mid).into_response()); - }; - let str = std::fs::read_to_string(&path)?; - Ok(str.into_response()) + let bytes = nm.show_original(&mid)?; + let s = String::from_utf8_lossy(&bytes).to_string(); + Ok(s.into_response()) } async fn graphiql() -> impl IntoResponse {