diff --git a/src/lib.rs b/src/lib.rs index 356be25..0f88885 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -256,15 +256,6 @@ async fn handle_http_request( }); Ok(response) } else { - // check for Accept header of application/nostr+json - if let Some(accept) = request.headers().get("Accept") { - if let Ok(s) = accept.to_str() { - if s == "application/nostr+json" { - return web::nip11::serve_nip11(peer).await; - } - } - } - web::serve_http(peer, request).await } } diff --git a/src/web/mod.rs b/src/web/mod.rs index 9f61aee..cd088b2 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -1,10 +1,19 @@ -pub mod nip11; +mod nip11; use crate::error::Error; use crate::ip::HashedPeer; use hyper::{Body, Request, Response, StatusCode}; pub async fn serve_http(peer: HashedPeer, request: Request) -> Result, Error> { + // check for Accept header of application/nostr+json + if let Some(accept) = request.headers().get("Accept") { + if let Ok(s) = accept.to_str() { + if s == "application/nostr+json" { + return nip11::serve_nip11(peer).await; + } + } + } + log::debug!(target: "Client", "{}: HTTP request for {}", peer, request.uri()); let response = Response::builder() .header("Access-Control-Allow-Origin", "*") @@ -14,4 +23,3 @@ pub async fn serve_http(peer: HashedPeer, request: Request) -> Result