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!" :description "FIXME: write this!"
:url "http://example.com/FIXME" :url "http://example.com/FIXME"
:license {:name "Eclipse Public License" :license {:name "Eclipse Public License"

View File

@ -152,8 +152,9 @@
(upsert-pending-message new-message) (upsert-pending-message new-message)
new-message)) new-message))
(defn send-group-user-message [{:keys [group-id content]}] (defn send-group-user-message [{:keys [message-id group-id content]}]
(send-group-message {:group-id group-id (send-group-message {:message-id message-id
:group-id group-id
:type :group-user-message :type :group-user-message
:payload {:content content :payload {:content content
:content-type default-content-type}})) :content-type default-content-type}}))

View File

@ -6,8 +6,9 @@
get-peer-identities]] get-peer-identities]]
[status-im.protocol.web3 :refer [make-message]])) [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) (make-message {:from (state/my-identity)
:message-id message-id
:chat-id group-id :chat-id group-id
:send-once false :send-once false
:topics [group-id] :topics [group-id]
@ -17,10 +18,10 @@
:clear-info {:group-topic group-id :clear-info {:group-topic group-id
:type type}})) :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) (let [store (storage)
{public-key :public} (get-keypair store group-id) {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) (upsert-pending-message new-message {:identities (get-peer-identities store group-id)
:internal? internal?}) :internal? internal?})
new-message)) new-message))