pending/sent/failed statuses for messages

project.clj

@@ -10,7 +10,7 @@
                  [prismatic/schema "1.0.4"]
                  ^{:voom {:repo   "git@github.com:status-im/status-lib.git"
                           :branch "master"}}
-                 [status-im/protocol "0.1.1-20160630_153846-gbf92f5f"]
+                 [status-im/protocol "0.1.1-20160705_154931-g96b5c92"]
                  [natal-shell "0.1.6"]
                  [com.andrewmcveigh/cljs-time "0.4.0"]]
   :plugins [[lein-cljsbuild "1.1.1"]

src/status_im/chat/handlers.cljs

@@ -283,12 +283,10 @@
   [{:keys [new-message current-chat-id] :as db} _]
   (when (and new-message (not-console? current-chat-id))
     (let [{:keys [group-chat]} (get-in db [:chats current-chat-id])
-          content (:content new-message)]
+          message (select-keys new-message [:content :msg-id])]
       (if group-chat
-        (api/send-group-user-msg {:group-id current-chat-id
+        (api/send-group-user-msg (assoc message :group-id current-chat-id))
-                                  :content  content})
+        (api/send-user-msg (assoc message :to current-chat-id))))))
-        (api/send-user-msg {:to      current-chat-id
-                            :content content})))))
 
 (defn save-message-to-realm!
   [{:keys [new-message current-chat-id]} _]

src/status_im/chat/views/message.cljs

@@ -120,20 +120,23 @@
     [message-content-audio {:content      content
                             :content-type content-type}]]])
 
-(defn message-delivery-status [{:keys [delivery-status]}]
+(defview message-delivery-status
+  [{:keys [delivery-status msg-id to] :as m}]
+  [status [:get-in [:message-status to msg-id]]]
   [view st/delivery-view
    [image {:source (case delivery-status
-                     :delivered {:uri :icon_ok_small}
                      :seen {:uri :icon_ok_small}
                      :seen-by-everyone {:uri :icon_ok_small}
-                     :failed res/delivery-failed-icon)
+                     :failed res/delivery-failed-icon
+                     nil)
            :style  st/delivery-image}]
    [text {:style st/delivery-text}
-    (case delivery-status
+    (case (or status delivery-status)
-      :delivered "Delivered"
+      :delivered "Sent"
       :seen "Seen"
       :seen-by-everyone "Seen by everyone"
-      :failed "Failed")]])
+      :failed "Failed"
+      "Pending")]])
 
 (defn member-photo [{:keys [photo-path]}]
   [view st/photo-view
@@ -159,12 +162,11 @@
          [message-delivery-status {:delivery-status delivery-status}])]]]))
 
 (defn message-body
-  [{:keys [outgoing] :as message} content]
+  [{:keys [outgoing delivery-status] :as message} content]
-  (let [delivery-status :seen]
+  [view (st/message-body message)
-    [view (st/message-body message)
+   content
-     content
+   (when outgoing
-     (when (and outgoing delivery-status)
+     [message-delivery-status message])])
-       [message-delivery-status {:delivery-status delivery-status}])]))
 
 (defn message-container-animation-logic [{:keys [to-value val callback]}]
   (fn [_]

src/status_im/contacts/validations.cljs

@@ -3,7 +3,6 @@
             [status-im.persistence.realm :as realm]))
 
 (defn unique-identity? [identity]
-  (println identity)
   (not (realm/exists? :contacts :whisper-identity identity)))
 
 (defn valid-length? [identity]

src/status_im/protocol/handlers.cljs

@@ -4,13 +4,13 @@
   (:require [status-im.utils.handlers :as u]
             [status-im.utils.logging :as log]
             [status-im.protocol.api :as api]
-            [re-frame.core :refer [dispatch debug]]
+            [re-frame.core :refer [dispatch after]]
             [status-im.utils.handlers :refer [register-handler]]
             [status-im.models.contacts :as contacts]
             [status-im.protocol.api :refer [init-protocol]]
             [status-im.protocol.protocol-handler :refer [make-handler]]
             [status-im.models.protocol :refer [update-identity
-                                             set-initialized]]
+                                               set-initialized]]
             [status-im.constants :refer [text-content-type]]
             [status-im.models.messages :as messages]
             [status-im.models.chats :as chats]
@@ -102,16 +102,19 @@
       (log/debug action msg-id from group-id identity)
       (participant-invited-to-group-msg group-id identity from msg-id))))
 
+(defn update-message! [status]
+  (fn [_ [_ _ msg-id]]
+    (messages/update-message! {:msg-id          msg-id
+                               :delivery-status status})))
+
+(defn update-message-status [status]
+  (fn [db [_ from msg-id]]
+    (assoc-in db [:message-status from msg-id] status)))
+
 (register-handler :acked-msg
-  (u/side-effect!
+  (after (update-message! :delivered))
-    (fn [_ [action from msg-id]]
+  (update-message-status :delivered))
-      (log/debug action from msg-id)
-      (messages/update-message! {:msg-id          msg-id
-                                 :delivery-status :delivered}))))
 
 (register-handler :msg-delivery-failed
-  (u/side-effect!
+  (after (update-message! :failed))
-    (fn [_ [action msg-id]]
+  (update-message-status :failed))
-      (log/debug action msg-id)
-      (messages/update-message! {:msg-id          msg-id
-                                 :delivery-status :failed}))))

src/status_im/protocol/protocol_handler.cljs

@@ -22,8 +22,8 @@
                                     (dispatch [:received-msg (assoc payload :from from :to to)]))
                          :msg-acked (let [{:keys [msg-id from]} event]
                                       (dispatch [:acked-msg from msg-id]))
-                         :delivery-failed (let [{:keys [msg-id]} event]
+                         :delivery-failed (let [{:keys [msg-id from]} event]
-                                            (dispatch [:msg-delivery-failed msg-id]))
+                                            (dispatch [:msg-delivery-failed from msg-id]))
                          :new-group-chat (let [{:keys [from group-id identities group-name]} event]
                                            (dispatch [:group-chat-invite-received from group-id identities group-name]))
                          :new-group-msg (let [{from     :from