[fractal] API: remove Backend::url, client_url, scalar_url and media_url

[Daniel Garcia Moreno <danigm src gnome org>]

commit 92cc182cba3c57e1be4bced85025d054698cf7fa
Author: Alejandro Domínguez <adomu net-c com>
Date:   Tue Mar 10 04:25:20 2020 +0100

    API: remove Backend::url, client_url, scalar_url and media_url

 fractal-matrix-api/src/backend/mod.rs | 20 --------------------
 fractal-matrix-api/src/util.rs        | 16 ++--------------
 2 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/fractal-matrix-api/src/backend/mod.rs b/fractal-matrix-api/src/backend/mod.rs
index b3f8bc4f..9d55eb69 100644
--- a/fractal-matrix-api/src/backend/mod.rs
+++ b/fractal-matrix-api/src/backend/mod.rs
@@ -4,19 +4,13 @@ use std::sync::mpsc::RecvError;
 use std::sync::mpsc::{Receiver, Sender};
 use std::sync::{Arc, Condvar, Mutex};
 use std::thread;
-use url::Url;
 
-use crate::util::client_url;
 use crate::util::dw_media;
 use crate::util::ContentType;
 use crate::util::ResultExpectLog;
 
-use crate::error::Error;
-
 use crate::cache::CacheMap;
 
-use crate::r0::AccessToken;
-
 use crate::globals;
 
 mod directory;
@@ -29,10 +23,8 @@ mod user;
 
 pub use self::types::BKCommand;
 pub use self::types::BKResponse;
-
 pub use self::types::Backend;
 pub use self::types::BackendData;
-
 pub use self::types::RoomType;
 
 impl Backend {
@@ -51,18 +43,6 @@ impl Backend {
         }
     }
 
-    fn url(
-        &self,
-        base: Url,
-        tk: &AccessToken,
-        path: &str,
-        mut params: Vec<(&str, String)>,
-    ) -> Result<Url, Error> {
-        params.push(("access_token", tk.to_string()));
-
-        client_url(&base, path, &params)
-    }
-
     pub fn run(mut self) -> Sender<BKCommand> {
         let (apptx, rx): (Sender<BKCommand>, Receiver<BKCommand>) = channel();
 
diff --git a/fractal-matrix-api/src/util.rs b/fractal-matrix-api/src/util.rs
index 284a5f49..fde3d66e 100644
--- a/fractal-matrix-api/src/util.rs
+++ b/fractal-matrix-api/src/util.rs
@@ -204,7 +204,7 @@ pub fn get_prev_batch_from(
     let params = &[("access_token", tk.to_string()), ("limit", 0.to_string())];
 
     let path = format!("rooms/{}/context/{}", room_id, evid);
-    let url = client_url(baseu, &path, params)?;
+    let url = build_url(baseu, &format!("/_matrix/client/r0/{}", path), params)?;
 
     let r = json_q("get", url, &json!(null))?;
     let prev_batch = r["start"].to_string().trim_matches('"').to_string();
@@ -237,7 +237,7 @@ pub fn dw_media(
         (vec![], format!("download/{}/{}", server, media))
     };
 
-    let url = media_url(base, &path, &params)?;
+    let url = build_url(base, &format!("/_matrix/media/r0/{}", path), &params)?;
 
     let fname = match dest {
         None if media_type.is_thumbnail() => cache_dir_path(Some("thumbs"), &media)?,
@@ -361,18 +361,6 @@ pub fn build_url(base: &Url, path: &str, params: &[(&str, String)]) -> Result<Ur
     Ok(url)
 }
 
-pub fn client_url(base: &Url, path: &str, params: &[(&str, String)]) -> Result<Url, Error> {
-    build_url(base, &format!("/_matrix/client/r0/{}", path), params)
-}
-
-pub fn scalar_url(base: &Url, path: &str, params: &[(&str, String)]) -> Result<Url, Error> {
-    build_url(base, &format!("api/{}", path), params)
-}
-
-fn media_url(base: &Url, path: &str, params: &[(&str, String)]) -> Result<Url, Error> {
-    build_url(base, &format!("/_matrix/media/r0/{}", path), params)
-}
-
 pub fn cache_dir_path(dir: Option<&str>, name: &str) -> Result<String, Error> {
     let path = CACHE_PATH.join(dir.unwrap_or_default());