diff --git a/project.clj b/project.clj index 27f640d..81a1715 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject status-im/protocol "0.2.2" +(defproject status-im/protocol "0.2.3" :description "FIXME: write this!" :url "http://example.com/FIXME" :license {:name "Eclipse Public License" diff --git a/src/cljs/status_im/protocol/api.cljs b/src/cljs/status_im/protocol/api.cljs index 3899da0..2241610 100644 --- a/src/cljs/status_im/protocol/api.cljs +++ b/src/cljs/status_im/protocol/api.cljs @@ -152,11 +152,12 @@ (upsert-pending-message new-message) new-message)) -(defn send-group-user-message [{:keys [group-id content]}] - (send-group-message {:group-id group-id - :type :group-user-message - :payload {:content content - :content-type default-content-type}})) +(defn send-group-user-message [{:keys [message-id group-id content]}] + (send-group-message {:message-id message-id + :group-id group-id + :type :group-user-message + :payload {:content content + :content-type default-content-type}})) (defn start-group-chat ([identities] diff --git a/src/cljs/status_im/protocol/group_chat.cljs b/src/cljs/status_im/protocol/group_chat.cljs index 3462e79..9e52733 100644 --- a/src/cljs/status_im/protocol/group_chat.cljs +++ b/src/cljs/status_im/protocol/group_chat.cljs @@ -6,8 +6,9 @@ get-peer-identities]] [status-im.protocol.web3 :refer [make-message]])) -(defn make-group-message [group-id public-key payload type] +(defn make-group-message [message-id group-id public-key payload type] (make-message {:from (state/my-identity) + :message-id message-id :chat-id group-id :send-once false :topics [group-id] @@ -17,10 +18,10 @@ :clear-info {:group-topic group-id :type type}})) -(defn send-group-message [{:keys [group-id payload type internal?] :or {internal? false}}] +(defn send-group-message [{:keys [message-id group-id payload type internal?] :or {internal? false}}] (let [store (storage) {public-key :public} (get-keypair store group-id) - new-message (make-group-message group-id public-key payload type)] + new-message (make-group-message message-id group-id public-key payload type)] (upsert-pending-message new-message {:identities (get-peer-identities store group-id) :internal? internal?}) new-message))