From 4da888b240b89308b91b2f087ba2b8f56bf72c81 Mon Sep 17 00:00:00 2001
From: Bill Thiede <git@xinu.tv>
Date: Sun, 20 Apr 2025 10:47:40 -0700
Subject: [PATCH] Move id format check from server into notmuch

---
 notmuch/src/lib.rs                 | 5 +++++
 server/src/bin/letterbox-server.rs | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/notmuch/src/lib.rs b/notmuch/src/lib.rs
index 350aad0..24266c6 100644
--- a/notmuch/src/lib.rs
+++ b/notmuch/src/lib.rs
@@ -598,6 +598,11 @@ impl Notmuch {
 
     #[instrument(skip_all, fields(id=id,part=part))]
     pub fn show_original_part(&self, id: &MessageId, part: usize) -> Result<Vec<u8>, NotmuchError> {
+        let id = if id.starts_with("id:") {
+            id
+        } else {
+            &format!("id:{id}")
+        };
         let res = self.run_notmuch(["show", "--part", &part.to_string(), id])?;
         Ok(res)
     }
diff --git a/server/src/bin/letterbox-server.rs b/server/src/bin/letterbox-server.rs
index cfab81f..7541a89 100644
--- a/server/src/bin/letterbox-server.rs
+++ b/server/src/bin/letterbox-server.rs
@@ -29,7 +29,7 @@ use serde::Deserialize;
 use sqlx::postgres::PgPool;
 use tokio::{net::TcpListener, sync::Mutex};
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
-use tracing::{info, warn};
+use tracing::info;
 
 // Make our own error that wraps `anyhow::Error`.
 struct AppError(letterbox_server::ServerError);
@@ -148,12 +148,7 @@ async fn view_original(
     extract::Path(id): extract::Path<String>,
 ) -> Result<impl IntoResponse, AppError> {
     info!("view_original {id}");
-    let mid = if id.starts_with("id:") {
-        id
-    } else {
-        format!("id:{id}")
-    };
-    let bytes = nm.show_original(&mid)?;
+    let bytes = nm.show_original(&id)?;
     let s = String::from_utf8_lossy(&bytes).to_string();
     Ok(s.into_response())
 }