From c1dd4a9ab919a214d06e62610a9816bfb5b4647f Mon Sep 17 00:00:00 2001 From: virvar Date: Fri, 8 Apr 2016 18:43:09 +0300 Subject: [PATCH] Handle command input call message --- src/syng_im/handlers.cljs | 32 ++++++++++++++------------- src/syng_im/handlers/suggestions.cljs | 5 +++++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/syng_im/handlers.cljs b/src/syng_im/handlers.cljs index 581014686b..4d9bdbac23 100644 --- a/src/syng_im/handlers.cljs +++ b/src/syng_im/handlers.cljs @@ -17,7 +17,7 @@ set-chat-command-request]] [syng-im.handlers.server :as server] [syng-im.handlers.contacts :as contacts-service] - + [syng-im.handlers.suggestions :refer [get-command]] [syng-im.handlers.sign-up :as sign-up-service] [syng-im.models.chats :refer [create-chat]] @@ -128,20 +128,22 @@ (register-handler :send-chat-msg (fn [db [action chat-id text]] (log/debug action "chat-id" chat-id "text" text) - (let [msg (if (= chat-id "console") - (sign-up-service/send-console-msg text) - (let [{msg-id :msg-id - {from :from - to :to} :msg} (api/send-user-msg {:to chat-id - :content text})] - {:msg-id msg-id - :from from - :to to - :content text - :content-type text-content-type - :outgoing true}))] - (save-message chat-id msg) - (signal-chat-updated db chat-id)))) + (if-let [command (get-command text)] + (dispatch [:set-chat-command (:command command)]) + (let [msg (if (= chat-id "console") + (sign-up-service/send-console-msg text) + (let [{msg-id :msg-id + {from :from + to :to} :msg} (api/send-user-msg {:to chat-id + :content text})] + {:msg-id msg-id + :from from + :to to + :content text + :content-type text-content-type + :outgoing true}))] + (save-message chat-id msg) + (signal-chat-updated db chat-id))))) (register-handler :send-chat-command (fn [db [action chat-id command content]] diff --git a/src/syng_im/handlers/suggestions.cljs b/src/syng_im/handlers/suggestions.cljs index 8f084c132e..352f54c803 100644 --- a/src/syng_im/handlers/suggestions.cljs +++ b/src/syng_im/handlers/suggestions.cljs @@ -11,3 +11,8 @@ ;; TODO change 'commands' to 'suggestions' (filterv #(.startsWith (:text %) text) commands) [])) + +(defn get-command [text] + (when (= (get text 0) "!") + ;; TODO change 'commands' to 'suggestions' + (first (filter #(= (:text %) text) commands))))