From a83fa4df8758aa34b457c80c0576341e9994d962 Mon Sep 17 00:00:00 2001
From: Ibrkhalil <vampirekid017@gmail.com>
Date: Wed, 29 Nov 2023 22:20:00 +0200
Subject: [PATCH] Improvements

---
 src/status_im/data_store/messages.cljs        | 21 +++++++++++++------
 .../messages/content/link_preview/view.cljs   |  8 ++++---
 src/status_im2/subs/messages.cljs             |  6 ++++++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/status_im/data_store/messages.cljs b/src/status_im/data_store/messages.cljs
index d08eed7eab..38e1624084 100644
--- a/src/status_im/data_store/messages.cljs
+++ b/src/status_im/data_store/messages.cljs
@@ -5,16 +5,23 @@
     [utils.re-frame :as rf]))
 
 (defn ->rpc
-  [{:keys [content] :as message}]
+  [{:keys [content]
+    :as   message}]
   (cond-> message
     content
     (assoc :text    (:text content)
            :sticker (:sticker content))
     :always
-    (set/rename-keys {:chat-id           :chat_id
-                      :whisper-timestamp :whisperTimestamp
-                      :community-id      :communityId
-                      :clock-value       :clock})))
+    (set/rename-keys {:chat-id            :chat_id
+                      :whisper-timestamp  :whisperTimestamp
+                      :community-id       :communityId
+                      :clock-value        :clock})))
+
+(defn- <-status-link-previews-rpc
+  [preview]
+  (update preview :community set/rename-keys {:communityId  :community-id
+                                              :displayName  :display-name
+                                              :membersCount :members-count}))
 
 (defn- <-link-preview-rpc
   [preview]
@@ -53,8 +60,10 @@
         :new                      :new?
         :albumImagesCount         :album-images-count
         :displayName              :display-name
-        :linkPreviews             :link-previews})
+        :linkPreviews             :link-previews
+        :statusLinkPreviews       :status-link-previews})
       (update :link-previews #(map <-link-preview-rpc %))
+      (update :status-link-previews #(map <-status-link-previews-rpc %))
       (update :quoted-message
               set/rename-keys
               {:parsedText       :parsed-text
diff --git a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs b/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs
index 04a6df7916..ce2252cc1e 100644
--- a/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs
+++ b/src/status_im2/contexts/chat/messages/content/link_preview/view.cljs
@@ -13,10 +13,12 @@
 
 (defn view
   [{:keys [chat-id message-id]}]
-  (let [previews (rf/sub [:chats/message-link-previews chat-id message-id])]
-    (when (seq previews)
+  (let [previews             (rf/sub [:chats/message-link-previews chat-id message-id])
+        status-link-previews (rf/sub [:chats/message-status-link-previews chat-id message-id])]
+    (when (or (seq status-link-previews)
+              (seq previews))
       [:<>
-       (for [{:keys [url title description thumbnail hostname]} previews]
+       (for [{:keys [url title description thumbnail hostname]} (merge status-link-previews previews)]
          ^{:key url}
          [quo/link-preview
           {:title           title
diff --git a/src/status_im2/subs/messages.cljs b/src/status_im2/subs/messages.cljs
index 4b32c7d1c0..84f2efa569 100644
--- a/src/status_im2/subs/messages.cljs
+++ b/src/status_im2/subs/messages.cljs
@@ -152,6 +152,12 @@
  (fn [messages [_ chat-id message-id]]
    (get-in messages [chat-id message-id :link-previews])))
 
+(re-frame/reg-sub
+ :chats/message-status-link-previews
+ :<- [:messages/messages]
+ (fn [messages [_ chat-id message-id]]
+   (get-in messages [chat-id message-id :status-link-previews])))
+
 (re-frame/reg-sub
  :chats/pinned
  :<- [:messages/pin-messages]