another attempt to fix status-im#1088

yalu · May 8, 2017 · 34b7702 · 34b7702
1 parent 07c247b
commit 34b7702
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/bots/browse/bot.js b/bots/browse/bot.js
@@ -1,11 +1,17 @@
 function browse(params, context) {
     var url;
 
+    if (params.metadata && params.metadata.url
+        && params.metadata.url !== "undefined" && params.metadata.url != "") {
+        url = params.metadata.url;
+    }
+
     if (params.url && params.url !== "undefined" && params.url != "") {
         url = params.url;
-        if (!/^[a-zA-Z-_]+:/.test(url)) {
-            url = 'http://' + url;
-        }
+    }
+
+    if (url && !/^[a-zA-Z-_]+:/.test(url)) {
+        url = 'http://' + url;
     }
 
     return {

diff --git a/src/status_im/chat/handlers/input.cljs b/src/status_im/chat/handlers/input.cljs
@@ -164,7 +164,8 @@
         ;:check-and-load-commands!
         (let [params
               {:command command
-               :chat-id jail-id}
+               :chat-id chat-id
+               :jail-id jail-id}
 
               on-send-params
               (merge params
@@ -230,7 +231,7 @@
   (handlers/side-effect!
     (fn [{:keys [contacts] :as db}
          [_ {{:keys [command metadata args] :as c} :command
-             :keys                                 [message-id chat-id data-type after]}]]
+             :keys                                 [message-id chat-id jail-id data-type after]}]]
       (let [{:keys [dapp? dapp-url name]} (get contacts chat-id)
             message-id      (random/id)
             metadata        (merge metadata
@@ -244,9 +245,10 @@
                              :created-at (time/now-ms)
                              :id         message-id
                              :chat-id    chat-id
-                             :jail-id    (or (:bot command) chat-id)}
+                             :jail-id    jail-id}
             request-data    {:message-id   message-id
                              :chat-id      chat-id
+                             :jail-id      jail-id
                              :content      {:command (:name command)
                                             :params  (assoc params :metadata metadata)
                                             :type    (:type command)}

diff --git a/src/status_im/commands/handlers/loading.cljs b/src/status_im/commands/handlers/loading.cljs
@@ -199,7 +199,6 @@
 (reg-handler ::add-commands
   [(after save-commands-js!)
    (after save-commands!)
-   (after #(dispatch [:check-and-open-dapp!]))
    (after #(dispatch [:update-suggestions]))
    (after (fn [_ [id]]
             (dispatch [:invoke-commands-loading-callbacks id])