[feature] add block user feature in user profile

- add block/unblock action to user profile
- blocking deletes all messages from user and ignores future messages
- unblocking stops ignoring new messages from user but doesn't recover past ones

src/status_im/chat/models.cljs

@@ -105,7 +105,7 @@
                                 :unviewed-messages-count 0
                                 :deleted-at-clock-value last-message-clock-value})
      :data-store/tx [(chats-store/clear-history-tx chat-id last-message-clock-value)
-                     (messages-store/delete-messages-tx chat-id)]}))
+                     (messages-store/delete-chat-messages-tx chat-id)]}))
 
 (fx/defn deactivate-chat
   [{:keys [db now] :as cofx} chat-id]

src/status_im/chat/models/loading.cljs

@@ -35,13 +35,6 @@
                db
                (group-by (comp time/day-relative :timestamp) messages))})
 
-(fx/defn group-messages
-  [{:keys [db]}]
-  (reduce-kv (fn [fx chat-id {:keys [messages]}]
-               (group-chat-messages fx chat-id (vals messages)))
-             {:db db}
-             (:chats db)))
-
 (defn- get-referenced-ids
   "Takes map of `message-id->messages` and returns set of maps of
   `{:response-to old-message-id :response-to-v2 message-id}`,

src/status_im/contact/core.cljs

@@ -4,19 +4,25 @@
             [status-im.chat.models :as chat.models]
             [status-im.contact.db :as contact.db]
             [status-im.data-store.contacts :as contacts-store]
+            [status-im.data-store.messages :as data-store.messages]
+            [status-im.data-store.chats :as data-store.chats]
             [status-im.i18n :as i18n]
             [status-im.transport.message.contact :as message.contact]
             [status-im.transport.message.protocol :as protocol]
             [status-im.ui.screens.add-new.new-chat.db :as new-chat.db]
             [status-im.ui.screens.navigation :as navigation]
             [status-im.utils.fx :as fx]
-            [status-im.utils.utils :as utils]))
+            [status-im.utils.utils :as utils]
+            [status-im.chat.models.loading :as chat.models.loading]
+            [status-im.chat.models.message :as chat.models.message]))
 
 (fx/defn load-contacts
   [{:keys [db all-contacts]}]
   (let [contacts-list (map #(vector (:public-key %) %) all-contacts)
         contacts (into {} contacts-list)]
-    {:db (update db :contacts/contacts #(merge contacts %))}))
+    {:db (-> db
+             (update :contacts/contacts #(merge contacts %))
+             (assoc :contacts/blocked (contact.db/get-blocked-contacts all-contacts)))}))
 
 (defn can-add-to-contacts? [{:keys [pending? dapp?]}]
   (and (not dapp?)
@@ -26,11 +32,10 @@
 
 (defn build-contact [{{:keys [chats] :account/keys [account]
                        :contacts/keys [contacts]} :db} public-key]
-  (cond-> (assoc (or (get contacts public-key)
-                     (contact.db/public-key->new-contact public-key))
+  (cond-> (assoc (contact.db/public-key->contact contacts public-key)
                  :address (contact.db/public-key->address public-key))
-
-    (= public-key (:public-key account)) (assoc :name (:name account))))
+    (= public-key (:public-key account))
+    (assoc :name (:name account))))
 
 (defn- own-info [db]
   (let [{:keys [name photo-path address]} (:account/account db)
@@ -81,6 +86,94 @@
     {:db (assoc-in db [:contacts/contacts public-key :tags] tags)
      :data-store/tx [(contacts-store/remove-contact-tag-tx public-key tag)]}))
 
+(fx/defn block-contact-confirmation
+  [cofx public-key]
+  {:utils/show-confirmation
+   {:title (i18n/label :t/block-contact)
+    :content (i18n/label :t/block-contact-details)
+    :confirm-button-text (i18n/label :t/to-block)
+    :on-accept #(re-frame/dispatch [:contact.ui/block-contact-confirmed public-key])}})
+
+(defn get-removed-unseen-count
+  [current-public-key user-statuses chat-id removed-messages-ids]
+  (- (count removed-messages-ids)
+     (count (filter (fn [[message-id statuses]]
+                      (= :seen
+                         (:status (get statuses
+                                       current-public-key))))
+                    user-statuses))))
+
+(fx/defn clean-up-chat
+  [{:keys [db get-stored-user-statuses] :as cofx} chat-id removed-chat-messages]
+  (let [current-public-key (accounts.db/current-public-key cofx)
+        removed-messages-ids (map :message-id removed-chat-messages)
+        user-statuses (get-stored-user-statuses chat-id
+                                                removed-messages-ids)
+        removed-unseen-count (get-removed-unseen-count current-public-key
+                                                       user-statuses
+                                                       chat-id
+                                                       removed-messages-ids)
+        db (-> db
+               ;; remove messages
+               (update-in [:chats chat-id :messages]
+                          #(apply dissoc % removed-messages-ids))
+               ;; remove message statuses
+               (update-in [:chats chat-id :messages-statuses]
+                          #(apply dissoc % removed-messages-ids))
+               ;; remove message groups
+               (update-in [:chats chat-id]
+                          dissoc :message-groups))]
+    (fx/merge cofx
+              {:db db}
+              ;; update unviewed messages count
+              (chat.models/upsert-chat
+               {:chat-id                      chat-id
+                :unviewed-messages-count
+                (- (get-in db [:chats chat-id :unviewed-messages-count])
+                   removed-unseen-count)})
+              ;; recompute message group
+              (chat.models.loading/group-chat-messages
+               chat-id
+               (vals (get-in db [:chats chat-id :messages]))))))
+
+(fx/defn clean-up-chats
+  [{:keys [db] :as cofx} removed-messages-by-chat]
+  (apply fx/merge cofx
+         (map (fn [[chat-id messages]]
+                (clean-up-chat chat-id messages))
+              removed-messages-by-chat)))
+
+(fx/defn block-contact
+  [{:keys [db get-blocked-user-data] :as cofx} public-key]
+  (let [contact (assoc (contact.db/public-key->contact
+                        (:contacts/contacts db)
+                        public-key)
+                       :blocked? true)
+        {:keys [messages chat]} (get-blocked-user-data public-key)
+        removed-messages-by-chat (group-by :chat-id messages)]
+    (fx/merge cofx
+              {:db (-> db
+                       ;; add the contact to blocked contacts
+                       (update :contacts/blocked conj public-key)
+                       ;; update the contact in contacts list
+                       (assoc-in [:contacts/contacts public-key] contact)
+                       ;; remove the 1-1 chat if it exists
+                       (update-in [:chats] dissoc public-key))
+               :data-store/tx [(contacts-store/block-user-tx contact)]}
+              ;;remove the messages from chat
+              (clean-up-chats removed-messages-by-chat)
+              (chat.models.message/update-last-messages
+               (keys removed-messages-by-chat)))))
+
+(fx/defn unblock-contact
+  [{:keys [db]} public-key]
+  (let [contact (assoc (get-in db [:contacts/contacts public-key])
+                       :blocked? false)])
+  {:db (-> db
+           (update :contacts/blocked disj public-key)
+           (assoc-in [:contacts/contacts public-key] contact))
+   :data-store/tx [(contacts-store/save-contact-tx contact)]})
+
 (defn handle-contact-update
   [public-key
    timestamp

src/status_im/contact/db.cljs

@@ -68,6 +68,12 @@
    :photo-path (identicon/identicon public-key)
    :public-key public-key})
 
+(defn public-key->contact
+  [contacts public-key]
+  (when public-key
+    (get contacts public-key
+         (public-key->new-contact public-key))))
+
 (defn public-key->address [public-key]
   (let [length (count public-key)
         normalized-key (case length
@@ -121,3 +127,7 @@
          (map #(if (admins (:public-key %))
                  (assoc % :admin? true)
                  %)))))
+
+(defn get-blocked-contacts
+  [contacts]
+  (into #{} (filter #(:blocked? %) contacts)))

src/status_im/contact/subs.cljs

@@ -25,8 +25,17 @@
  :<- [:contacts/contacts]
  (fn [contacts]
    (->> contacts
-        (remove (fn [[_ {:keys [pending? hide-contact?]}]]
-                  (or pending? hide-contact?)))
+        (remove (fn [[_ {:keys [pending? hide-contact? blocked?]}]]
+                  (or pending? hide-contact? blocked?)))
+        (contact.db/sort-contacts))))
+
+(re-frame/reg-sub
+ :contacts/blocked
+ :<- [:contacts/contacts]
+ (fn [contacts]
+   (->> contacts
+        (filter (fn [[_ {:keys [blocked?]}]]
+                  blocked?))
         (contact.db/sort-contacts))))
 
 (re-frame/reg-sub

src/status_im/data_store/contacts.cljs

@@ -1,7 +1,8 @@
 (ns status-im.data-store.contacts
   (:require [goog.object :as object]
             [re-frame.core :as re-frame]
-            [status-im.data-store.realm.core :as core]))
+            [status-im.data-store.realm.core :as core]
+            [clojure.set :as clojure.set]))
 
 (defn- normalize-contact [contact]
   (-> contact
@@ -21,7 +22,7 @@
   (fn [realm]
     (core/create realm
                  :contact
-                 (dissoc contact :command :response :subscriptions)
+                 contact
                  true)))
 
 (defn save-contacts-tx
@@ -34,6 +35,33 @@
 (defn- get-contact-by-id [public-key realm]
   (core/single (core/get-by-field realm :contact :public-key public-key)))
 
+(defn get-blocked-user-data
+  [public-key]
+  {:messages (core/all-clj (core/get-by-field @core/account-realm
+                                              :message :from public-key)
+                           :message)
+   :chat (core/single-clj (core/get-by-field @core/account-realm
+                                             :chat :chat-id public-key)
+                          :chat)})
+
+(re-frame/reg-cofx
+ :data-store/get-blocked-user-data
+ (fn [cofx _]
+   (assoc cofx :get-blocked-user-data get-blocked-user-data)))
+
+(defn block-user-tx
+  "Returns tx function for deleting user messages"
+  [{:keys [public-key] :as contact}]
+  (fn [realm]
+    (core/create realm :contact contact true)
+    (let [chat (core/get-by-field realm :chat :chat-id public-key)
+          messages (core/get-by-field realm :message :from public-key)
+          statuses (core/get-by-field realm :user-status :public-key public-key)]
+      (when chat
+        (core/delete realm chat))
+      (core/delete realm messages)
+      (core/delete realm statuses))))
+
 (defn delete-contact-tx
   "Returns tx function for deleting contact"
   [public-key]

src/status_im/data_store/messages.cljs

@@ -93,7 +93,7 @@
       (core/delete realm message)
       (core/delete realm (core/get-by-field realm :user-status :message-id message-id)))))
 
-(defn delete-messages-tx
+(defn delete-chat-messages-tx
   "Returns tx function for deleting messages with user statuses for given chat-id"
   [chat-id]
   (fn [realm]

src/status_im/events.cljs

@@ -36,6 +36,7 @@
             [status-im.signals.core :as signals]
             [status-im.transport.message.core :as transport.message]
             [status-im.ui.screens.currency-settings.models :as currency-settings.models]
+            [status-im.chat.models.message :as models.message]
             [status-im.node.core :as node]
             [status-im.web3.core :as web3]
             [status-im.ui.screens.navigation :as navigation]
@@ -96,11 +97,14 @@
  [(re-frame/inject-cofx :web3/get-web3)
   (re-frame/inject-cofx :get-default-dapps)
   (re-frame/inject-cofx :data-store/all-chats)]
- (fn [{:keys [db] :as cofx} [_ address]]
+ (fn [{:keys [db all-stored-chats] :as cofx} [_ update-last-messages]]
    (fx/merge cofx
              {:db (assoc db :chats/loading? false)}
              (chat-loading/initialize-chats)
-             (chat-loading/initialize-pending-messages))))
+             (chat-loading/initialize-pending-messages)
+             (when update-last-messages
+               (models.message/update-last-messages
+                (map :chat-id all-stored-chats))))))
 
 (handlers/register-handler-fx
  :init.callback/account-change-success
@@ -1292,6 +1296,23 @@
  (fn [cofx [_ public-key]]
    (contact/add-contact cofx public-key)))
 
+(handlers/register-handler-fx
+ :contact.ui/block-contact-pressed
+ (fn [cofx [_ public-key]]
+   (contact/block-contact-confirmation cofx public-key)))
+
+(handlers/register-handler-fx
+ :contact.ui/block-contact-confirmed
+ [(re-frame/inject-cofx :data-store/get-blocked-user-data)
+  (re-frame/inject-cofx :data-store/get-user-statuses)]
+ (fn [cofx [_ public-key]]
+   (contact/block-contact cofx public-key)))
+
+(handlers/register-handler-fx
+ :contact.ui/unblock-contact-pressed
+ (fn [cofx [_ public-key]]
+   (contact/unblock-contact cofx public-key)))
+
 (handlers/register-handler-fx
  :contact.ui/close-contact-pressed
  (fn [cofx [_ public-key]]

src/status_im/transport/message/core.cljs

@@ -12,11 +12,14 @@
 
 (fx/defn receive-message
   [cofx now-in-s filter-chat-id js-message]
-  (let [{:keys [payload sig timestamp ttl]} (js->clj js-message :keywordize-keys true)
+  (let [blocked-contacts (get-in cofx [:db :contacts/blocked])
+        {:keys [payload sig timestamp ttl]} (js->clj js-message :keywordize-keys true)
         status-message (-> payload
                            transport.utils/to-utf8
                            transit/deserialize)]
-    (when (and sig status-message)
+    (when (and sig
+               status-message
+               (not (blocked-contacts sig)))
       (try
         (when-let [valid-message (protocol/validate status-message)]
           (fx/merge (assoc cofx :js-obj js-message)

src/status_im/ui/components/icons/vector_icons.cljs

@@ -51,6 +51,7 @@
      :icons/flash-inactive      (js/require "./resources/icons/flash_inactive.svg")
      :icons/attach              (js/require "./resources/icons/attach.svg")
      :icons/browse              (js/require "./resources/icons/browse.svg")
+     :icons/cancel              (js/require "./resources/icons/cancel.svg")
      :icons/close               (js/require "./resources/icons/close.svg")
      :icons/copy-from           (js/require "./resources/icons/copy_from.svg")
      :icons/delete              (js/require "./resources/icons/delete.svg")
@@ -119,6 +120,7 @@
      :icons/add-contact         (components.svg/slurp-svg "./resources/icons/add_contact.svg")
      :icons/add-wallet          (components.svg/slurp-svg "./resources/icons/add_wallet.svg")
      :icons/address             (components.svg/slurp-svg "./resources/icons/address.svg")
+     :icons/cancel              (components.svg/slurp-svg "./resources/icons/cancel.svg")
      :icons/arrow-left          (components.svg/slurp-svg "./resources/icons/arrow_left.svg")
      :icons/angle-arrow-left    (components.svg/slurp-svg "./resources/icons/angle_arrow_left.svg")
      :icons/arrow-right         (components.svg/slurp-svg "./resources/icons/arrow_right.svg")

src/status_im/ui/screens/profile/contact/styles.cljs

@@ -29,8 +29,7 @@
              :color     colors/black}})
 
 (def action-container
-  {:background-color colors/white
-   :padding-top      24})
+  {:background-color colors/white})
 
 (def action
   {:background-color (colors/alpha colors/blue 0.1)
@@ -47,6 +46,16 @@
 (def action-icon-opts
   {:color colors/blue})
 
+(def block-action
+  {:background-color (colors/alpha colors/red 0.1)
+   :border-radius    50})
+
+(def block-action-label
+  {:color colors/red})
+
+(def block-action-icon-opts
+  {:color colors/red})
+
 (def profile-setting-text-empty
   (merge profile-setting-text
          {:color colors/gray}))