Improvements

This commit is contained in:
Ibrkhalil
2023-11-29 22:20:00 +02:00
parent 3782cd5808
commit a83fa4df87
3 changed files with 26 additions and 9 deletions
+15 -6
View File
@@ -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
@@ -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
+6
View File
@@ -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]