From 9a825e706635ba4ce5bb4ded2172f370d5cf7210 Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Tue, 26 Jun 2018 17:32:35 +0200
Subject: [PATCH] Change the signature of ap_url to be backward-compatible

---
 plume-models/src/lib.rs  | 2 +-
 src/routes/well_known.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plume-models/src/lib.rs b/plume-models/src/lib.rs
index 31239377..5df9c8af 100644
--- a/plume-models/src/lib.rs
+++ b/plume-models/src/lib.rs
@@ -92,7 +92,7 @@ lazy_static! {
     pub static ref USE_HTTPS: bool = env::var("USE_HTTPS").map(|val| val == "1").unwrap_or(true);
 }
 
-pub fn ap_url(url: &str) -> String {
+pub fn ap_url(url: String) -> String {
     let scheme = if *USE_HTTPS {
         "https"
     } else {
diff --git a/src/routes/well_known.rs b/src/routes/well_known.rs
index 789c3211..662fa469 100644
--- a/src/routes/well_known.rs
+++ b/src/routes/well_known.rs
@@ -3,8 +3,7 @@ use rocket::response::Content;
 use serde_json;
 use webfinger::*;
 
-use plume_common::activity_pub::ap_url;
-use plume_models::{BASE_URL, db_conn::DbConn, blogs::Blog, users::User};
+use plume_models::{BASE_URL, ap_url, db_conn::DbConn, blogs::Blog, users::User};
 
 #[get("/.well-known/nodeinfo")]
 fn nodeinfo() -> Content<String> {