From b7ef7b7757bc1e05a9afcb1a2602e97b47d9ad94 Mon Sep 17 00:00:00 2001 From: Baptiste Gelez Date: Tue, 12 Mar 2019 14:31:10 +0100 Subject: [PATCH 1/2] Fix wrong condition, resulting in 404 for valid NodeInfo endpoints --- src/routes/instance.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/routes/instance.rs b/src/routes/instance.rs index 8fcd26ba..3e3e65ed 100644 --- a/src/routes/instance.rs +++ b/src/routes/instance.rs @@ -218,7 +218,8 @@ pub fn shared_inbox(conn: DbConn, data: SignedJson, headers: #[get("/nodeinfo/")] pub fn nodeinfo(conn: DbConn, version: String) -> Result, ErrorPage> { - if version != "2.0" || version != "2.1" { + dbg!(&version); + if version != "2.0" && version != "2.1" { return Err(ErrorPage::from(Error::NotFound)); } -- 2.45.3 From 3877ff1ee8699375f64bfd375d54bc007ee036a4 Mon Sep 17 00:00:00 2001 From: Baptiste Gelez Date: Tue, 12 Mar 2019 14:32:38 +0100 Subject: [PATCH 2/2] Forgot to remove that dbg! --- src/routes/instance.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/instance.rs b/src/routes/instance.rs index 3e3e65ed..bdf605ad 100644 --- a/src/routes/instance.rs +++ b/src/routes/instance.rs @@ -218,7 +218,6 @@ pub fn shared_inbox(conn: DbConn, data: SignedJson, headers: #[get("/nodeinfo/")] pub fn nodeinfo(conn: DbConn, version: String) -> Result, ErrorPage> { - dbg!(&version); if version != "2.0" && version != "2.1" { return Err(ErrorPage::from(Error::NotFound)); } -- 2.45.3