Move nip11 check from lib to web

This commit is contained in:
Mike Dilger 2024-06-21 21:06:08 +12:00
parent 5b1e5e4cf1
commit 6d19109e05
2 changed files with 10 additions and 11 deletions

View File

@ -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
}
}

View File

@ -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<Body>) -> Result<Response<Body>, 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<Body>) -> Result<Resp
.body("This is a nostr relay. Please use a nostr client to connect.".into())?;
Ok(response)
}