Simple fixes

README.md

@@ -16,7 +16,6 @@ This bot now supports different kinds of comm-links (communication channels to t
 Webhook configuration needs four things defined in `config.edn`:
 
 - `:comm :clj-slackbot.comms.slack-web-hook/start`
-- `:post-url` - The post URL to post responses to a channel.
 - `:command-token` - The token you get when you create a slash command in slack. Usually something like `/clj`.
 - `:port` - The port to run the web-server on.
 

config.example.edn

@@ -2,5 +2,4 @@
  :api-token "XXX"
  :prefix ","
  :port 3000
- :command-token "XXX"
- :post-url "XXX"}
+ :command-token "XXX"}

project.clj

@@ -16,7 +16,6 @@
   :uberjar-name "clj-slackbot.jar"
   :main clj-slackbot.core
   :profiles
-  {:dev {:repl-options {:init-ns clj-slackbot.core.handler}
-         :dependencies [[javax.servlet/servlet-api "2.5"]
-                        [ring-mock "0.1.5"]]}
+  {:dev     {:dependencies [[javax.servlet/servlet-api "2.5"]
+                            [ring-mock "0.1.5"]]}
    :uberjar {:aot :all}})

src/clj_slackbot/comms/slack_web_hook.clj

@@ -10,13 +10,13 @@
 
 (defn post-to-slack
   ([post-url s channel]
-     (let [p (if channel {:channel channel} {})]
-       (client/post post-url
-                   {:content-type :json
-                    :form-params (assoc p :text s)
-                    :query-params {"parse" "none"}})))
+   (let [p (if channel {:channel channel} {})]
+     (client/post post-url
+                  {:content-type :json
+                   :form-params  (assoc p :text s)
+                   :query-params {"parse" "none"}})))
   ([post-url s]
-     (post-to-slack post-url s nil)))
+   (post-to-slack post-url s nil)))
 
 (defn handle-clj [params command-token cin]
   (if-not (= (:token params) command-token)
@@ -27,15 +27,17 @@
                     (str "#" (:channel_name params)))]
       ;; send the form to our evaluator and get out of here
       (>!! cin {:input (:text params)
-                :meta {:channel channel}})
+                :meta  {:channel      channel
+                        :response-url (:response_url params)
+                        :user (:user_name params)}})
 
       {:status 200 :body "..." :headers {"Content-Type" "text/plain"}})))
 
 
-(defn start [{:keys [port post-url command-token] :as config}]
+(defn start [{:keys [port command-token]}]
   ;; check we have everything
-  (when (some nil? [port post-url command-token])
-    (throw (Exception. "Cannot initialize. Missing port, post-url or command-token")))
+  (when (some nil? [port command-token])
+    (throw (Exception. "Cannot initialize. Missing port or command-token")))
 
   (println ":: starting http server on port:" port)
   (let [cin (async/chan 10)
@@ -50,11 +52,11 @@
     (go-loop [res (<!! cout)]
       (if-not res
         (println "The form output channel has been closed. Leaving listen loop.")
-        (let [result (:evaluator/result res)
-              channel (get-in res [:meta :channel])]
+        (let [channel (get-in res [:meta :channel])
+              post-url (get-in res [:meta :response-url])]
           (post-to-slack
             post-url
-            (util/format-result-for-slack result)
+            (util/format-result-for-slack res)
             channel)
           (recur (<!! cout)))))