From 6fb84dd99b035f91c3a7558dcafb95ea3cf88fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= <danigm@wadobo.com>
Date: Tue, 24 Oct 2017 10:09:19 +0200
Subject: [PATCH] Parametrized timeout

---
 src/backend.rs |  2 +-
 src/util.rs    | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/backend.rs b/src/backend.rs
index 229f8653..c4a6bb35 100644
--- a/src/backend.rs
+++ b/src/backend.rs
@@ -920,7 +920,7 @@ impl Backend {
                     Ok(js) => {
                         let uri = js["content_uri"].as_str().unwrap_or("");
                         let attrs = json!({ "url": uri });
-                        match json_q("put", &roomurl, &attrs, 10) {
+                        match json_q("put", &roomurl, &attrs, 0) {
                             Ok(_) => {
                                 tx.send(BKResponse::SetRoomAvatar).unwrap();
                             },
diff --git a/src/util.rs b/src/util.rs
index cbc6fc42..f5e535a8 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -36,6 +36,14 @@ use self::reqwest::header::ContentType;
 use self::mime::Mime;
 
 
+#[macro_export]
+macro_rules! timeout {
+    () => (
+        10
+    );
+}
+
+
 // from https://stackoverflow.com/a/43992218/1592377
 #[macro_export]
 macro_rules! clone {
@@ -120,7 +128,7 @@ macro_rules! post {
 macro_rules! query {
     ($method: expr, $url: expr, $attrs: expr, $okcb: expr, $errcb: expr) => {
         thread::spawn(move || {
-            let js = json_q($method, $url, $attrs, 10);
+            let js = json_q($method, $url, $attrs, timeout!());
 
             match js {
                 Ok(r) => {
@@ -369,7 +377,7 @@ pub fn get_user_avatar(baseu: &Url, userid: &str) -> Result<(String, String), Er
     let url = client_url!(baseu, &format!("profile/{}", userid), vec![])?;
     let attrs = json!(null);
 
-    match json_q("get", &url, &attrs, 10) {
+    match json_q("get", &url, &attrs, timeout!()) {
         Ok(js) => {
             let name = String::from(js["displayname"].as_str().unwrap_or("@"));
             match js["avatar_url"].as_str() {
@@ -385,7 +393,7 @@ pub fn get_room_st(base: &Url, tk: &str, roomid: &str) -> Result<JsonValue, Erro
     let url = client_url!(base, &format!("rooms/{}/state", roomid), vec![("access_token", strn!(tk))])?;
 
     let attrs = json!(null);
-    let st = json_q("get", &url, &attrs, 10)?;
+    let st = json_q("get", &url, &attrs, timeout!())?;
     Ok(st)
 }
 
@@ -602,7 +610,7 @@ pub fn get_initial_room_messages(baseu: &Url,
     let path = format!("rooms/{}/messages", roomid);
     let url = client_url!(baseu, &path, params)?;
 
-    let r = json_q("get", &url, &json!(null), 10)?;
+    let r = json_q("get", &url, &json!(null), timeout!())?;
     nend = String::from(r["end"].as_str().unwrap_or(""));
     nstart = String::from(r["start"].as_str().unwrap_or(""));