status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Safe deserialization of the last message's content 

The issue was fixed in #7085 but reintroduced in #7055.
This commit is contained in:
Roman Volosovskyi 2018-12-24 14:12:26 +02:00
parent 7fa46065a7
commit 8f48dc8df6
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/data_store/chats.cljs
View File

@ -55,7 +55,7 @@
(update :membership-updates (partial unmarshal-membership-updates chat-id)) (update :membership-updates (partial unmarshal-membership-updates chat-id))
(update :last-clock-value utils.clocks/safe-timestamp) (update :last-clock-value utils.clocks/safe-timestamp)
(update :last-message-type keyword) (update :last-message-type keyword)
(update :last-message-content edn/read-string))) (update :last-message-content utils/safe-read-message-content)))
(re-frame/reg-cofx (re-frame/reg-cofx
:data-store/all-chats :data-store/all-chats

12
src/status_im/data_store/messages.cljs
View File

@ -1,19 +1,15 @@
(ns status-im.data-store.messages (ns status-im.data-store.messages
(:require [cljs.tools.reader.edn :as edn] (:require [re-frame.core :as re-frame]
[taoensso.timbre :as log]
[re-frame.core :as re-frame]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.data-store.realm.core :as core] [status-im.data-store.realm.core :as core]
[status-im.utils.core :as utils] [status-im.utils.core :as utils]
[status-im.js-dependencies :as dependencies])) [status-im.js-dependencies :as dependencies]))
(defn- transform-message [message] (defn- transform-message [{:keys [content] :as message}]
(try (when-let [parsed-content (utils/safe-read-message-content content)]
(-> message (-> message
(update :message-type keyword) (update :message-type keyword)
(update :content edn/read-string)) (assoc :content parsed-content))))
(catch :default e
(log/warn "failed to transform message with " e))))
(defn- get-by-chat-id (defn- get-by-chat-id
([chat-id] ([chat-id]

10
src/status_im/utils/core.cljc
View File

@ -1,5 +1,7 @@
(ns status-im.utils.core (ns status-im.utils.core
(:require [clojure.string :as str])) (:require [clojure.string :as str]
[cljs.tools.reader.edn :as edn]
[taoensso.timbre :as log]))
(defn truncate-str (defn truncate-str
"Given string and max threshold, trims the string to threshold length with `...` "Given string and max threshold, trims the string to threshold length with `...`
@ -63,3 +65,9 @@
Similar to group-by except that the map values are single objects (depends on key uniqueness)." Similar to group-by except that the map values are single objects (depends on key uniqueness)."
[key coll] [key coll]
(into {} (map #(vector (key %) %) coll))) (into {} (map #(vector (key %) %) coll)))
(defn safe-read-message-content [content]
(try
(edn/read-string content)
(catch :default e
(log/warn "failed to transform message with " e))))