parent
721af7a283
commit
ca2e5681db
|
@ -27,13 +27,12 @@
|
||||||
(assoc db :show-actions show-actions)))
|
(assoc db :show-actions show-actions)))
|
||||||
|
|
||||||
(register-handler :load-more-messages
|
(register-handler :load-more-messages
|
||||||
(fn [db _]
|
debug
|
||||||
db
|
(fn [{:keys [current-chat-id] :as db} _]
|
||||||
;; TODO implement
|
(let [messages-path [:chats current-chat-id :messages]
|
||||||
#_(let [chat-id (get-in db [:chat :current-chat-id])
|
messages (get-in db messages-path)
|
||||||
messages [:chats chat-id :messages]
|
new-messages (messages/get-messages current-chat-id (count messages))]
|
||||||
new-messages (gen-messages 10)]
|
(update-in db messages-path concat new-messages))))
|
||||||
(update-in db messages concat new-messages))))
|
|
||||||
|
|
||||||
(defn safe-trim [s]
|
(defn safe-trim [s]
|
||||||
(when (string? s)
|
(when (string? s)
|
||||||
|
@ -287,10 +286,8 @@
|
||||||
|
|
||||||
(defn load-messages!
|
(defn load-messages!
|
||||||
([db] (load-messages! db nil))
|
([db] (load-messages! db nil))
|
||||||
([db _]
|
([{:keys [current-chat-id] :as db} _]
|
||||||
(->> (:current-chat-id db)
|
(assoc db :messages (messages/get-messages current-chat-id))))
|
||||||
messages/get-messages
|
|
||||||
(assoc db :messages))))
|
|
||||||
|
|
||||||
(defn init-chat
|
(defn init-chat
|
||||||
([db] (init-chat db nil))
|
([db] (init-chat db nil))
|
||||||
|
|
|
@ -15,3 +15,5 @@
|
||||||
|
|
||||||
(def response-input-hiding-duration 100)
|
(def response-input-hiding-duration 100)
|
||||||
(def response-suggesstion-resize-duration 100)
|
(def response-suggesstion-resize-duration 100)
|
||||||
|
|
||||||
|
(def default-number-of-messages 10)
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
[re-frame.core :refer [dispatch]]
|
[re-frame.core :refer [dispatch]]
|
||||||
[cljs.reader :refer [read-string]]
|
[cljs.reader :refer [read-string]]
|
||||||
[status-im.utils.random :refer [timestamp]]
|
[status-im.utils.random :refer [timestamp]]
|
||||||
[status-im.db :as db]
|
|
||||||
[status-im.utils.logging :as log]
|
[status-im.utils.logging :as log]
|
||||||
[clojure.string :refer [join split]]
|
[clojure.string :refer [join split]]
|
||||||
[clojure.walk :refer [stringify-keys keywordize-keys]]
|
[clojure.walk :refer [stringify-keys keywordize-keys]]
|
||||||
|
@ -46,16 +45,19 @@
|
||||||
#{c/content-type-command c/content-type-command-request}
|
#{c/content-type-command c/content-type-command-request}
|
||||||
type))
|
type))
|
||||||
|
|
||||||
(defn get-messages [chat-id]
|
(defn get-messages
|
||||||
|
([chat-id] (get-messages chat-id 0))
|
||||||
|
([chat-id from]
|
||||||
(->> (-> (r/get-by-field :msgs :chat-id chat-id)
|
(->> (-> (r/get-by-field :msgs :chat-id chat-id)
|
||||||
(r/sorted :timestamp :desc)
|
(r/sorted :timestamp :desc)
|
||||||
|
(r/page from (+ from c/default-number-of-messages))
|
||||||
(r/collection->map))
|
(r/collection->map))
|
||||||
(into '())
|
(into '())
|
||||||
reverse
|
reverse
|
||||||
(map (fn [{:keys [content-type] :as message}]
|
(map (fn [{:keys [content-type] :as message}]
|
||||||
(if (command-type? content-type)
|
(if (command-type? content-type)
|
||||||
(update message :content str-to-map)
|
(update message :content str-to-map)
|
||||||
message)))))
|
message))))))
|
||||||
|
|
||||||
(defn update-message! [{:keys [msg-id] :as msg}]
|
(defn update-message! [{:keys [msg-id] :as msg}]
|
||||||
(log/debug "update-message!" msg)
|
(log/debug "update-message!" msg)
|
||||||
|
|
Loading…
Reference in New Issue