group chat statuses

This commit is contained in:
alwxndr 2016-09-14 18:55:58 +03:00
parent 088d6dbf94
commit fed628a2b8
3 changed files with 11 additions and 9 deletions

View File

@ -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"

View File

@ -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]

View File

@ -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))