[Fixes #10751] Remove messages & list when blocking
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
parent
39cc56dd10
commit
f1272f4d49
|
@ -23,19 +23,17 @@
|
||||||
(fn [[message-id {:keys [from]}]]
|
(fn [[message-id {:keys [from]}]]
|
||||||
(when (= from public-key)
|
(when (= from public-key)
|
||||||
message-id))
|
message-id))
|
||||||
(get-in db [:chats chat-id :messages]))
|
(get-in db [:messages chat-id]))
|
||||||
db (-> db
|
db (-> db
|
||||||
;; remove messages
|
;; remove messages
|
||||||
(update-in [:chats chat-id :messages]
|
(update-in [:messages chat-id]
|
||||||
#(apply dissoc % removed-messages-ids))
|
#(apply dissoc % removed-messages-ids))
|
||||||
;; remove message groups
|
|
||||||
(update-in [:chats chat-id]
|
|
||||||
dissoc :message-list)
|
|
||||||
(update-in [:chats chat-id]
|
(update-in [:chats chat-id]
|
||||||
assoc
|
assoc
|
||||||
:unviewed-messages-count unviewed-messages-count
|
:unviewed-messages-count unviewed-messages-count
|
||||||
:last-message last-message))]
|
:last-message last-message))]
|
||||||
{:db (update-in db [:chats chat-id :message-list] message-list/add-many (vals (get-in db [:chats chat-id :messages])))}))
|
{:db (assoc-in db [:message-lists chat-id]
|
||||||
|
(message-list/add-many nil (vals (get-in db [:messages chat-id]))))}))
|
||||||
|
|
||||||
(fx/defn contact-blocked
|
(fx/defn contact-blocked
|
||||||
{:events [::contact-blocked]}
|
{:events [::contact-blocked]}
|
||||||
|
|
Loading…
Reference in New Issue