From 0eeaa7cbe999474a579f4888e34155efeecd949b Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Mon, 12 Jun 2023 12:02:09 +0200 Subject: [PATCH] Fixes and improvements to alias handling * Return the correct alias from a node announcement, stripping '\0' bytes. * Accept `AliasStore` types as references and as owned. * Store a `null` in the database if the alias received is empty. --- radicle-httpd/src/api/v1/projects.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radicle-httpd/src/api/v1/projects.rs b/radicle-httpd/src/api/v1/projects.rs index 3a4e32e2b..556c37b5a 100644 --- a/radicle-httpd/src/api/v1/projects.rs +++ b/radicle-httpd/src/api/v1/projects.rs @@ -457,7 +457,7 @@ async fn issues_handler( let aliases = &ctx.profile.aliases()?; let issues = issues .into_iter() - .map(|(id, issue, _)| api::json::issue(id, issue, &aliases)) + .map(|(id, issue, _)| api::json::issue(id, issue, aliases)) .skip(page * per_page) .take(per_page) .collect::>(); @@ -568,7 +568,7 @@ async fn issue_handler( let issue = issue::Issues::open(&repo)? .get(&issue_id.into())? .ok_or(Error::NotFound)?; - let aliases = &ctx.profile.aliases()?; + let aliases = ctx.profile.aliases()?; Ok::<_, Error>(Json(api::json::issue(issue_id.into(), issue, &aliases))) } @@ -720,7 +720,7 @@ async fn patches_handler( }) .collect::>(); patches.sort_by(|(_, a, _), (_, b, _)| b.timestamp().cmp(&a.timestamp())); - let aliases = &ctx.profile.aliases()?; + let aliases = ctx.profile.aliases()?; let patches = patches .into_iter() .map(|(id, patch, _)| api::json::patch(id, patch, &repo, &aliases)) @@ -742,7 +742,7 @@ async fn patch_handler( let patch = patch::Patches::open(&repo)? .get(&patch_id.into())? .ok_or(Error::NotFound)?; - let aliases = &ctx.profile.aliases()?; + let aliases = ctx.profile.aliases()?; Ok::<_, Error>(Json(api::json::patch( patch_id.into(),