From 227014674cc0566612767c711ba3df649c591e40 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 19 Jun 2018 13:39:59 +0200 Subject: [PATCH] Add 6 new languages as public channels in the localized language. Closes #4753 --- src/status_im/data_store/browser.cljs | 2 +- src/status_im/data_store/chats.cljs | 2 +- src/status_im/data_store/contacts.cljs | 2 +- src/status_im/data_store/mailservers.cljs | 2 +- src/status_im/data_store/messages.cljs | 26 +++++-------------- src/status_im/data_store/realm/core.cljs | 14 +++------- src/status_im/data_store/transport.cljs | 2 +- .../screens/add_new/new_public_chat/view.cljs | 2 +- 8 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/status_im/data_store/browser.cljs b/src/status_im/data_store/browser.cljs index 8207da4a7b..d861c16add 100644 --- a/src/status_im/data_store/browser.cljs +++ b/src/status_im/data_store/browser.cljs @@ -14,7 +14,7 @@ "Returns tx function for saving browser" [{:keys [browser-id] :as browser}] (fn [realm] - (core/create realm :browser browser (core/exists? realm :browser :browser-id browser-id)))) + (core/create realm :browser browser true))) (defn remove-browser-tx "Returns tx function for removing browser" diff --git a/src/status_im/data_store/chats.cljs b/src/status_im/data_store/chats.cljs index a2ca91fc32..563b63407d 100644 --- a/src/status_im/data_store/chats.cljs +++ b/src/status_im/data_store/chats.cljs @@ -25,7 +25,7 @@ "Returns tx function for saving chat" [{:keys [chat-id] :as chat}] (fn [realm] - (core/create realm :chat chat (core/exists? realm :chat :chat-id chat-id)))) + (core/create realm :chat chat true))) ;; Only used in debug mode (defn delete-chat-tx diff --git a/src/status_im/data_store/contacts.cljs b/src/status_im/data_store/contacts.cljs index cc9b56e1b9..fcdbe36ec6 100644 --- a/src/status_im/data_store/contacts.cljs +++ b/src/status_im/data_store/contacts.cljs @@ -16,7 +16,7 @@ (core/create realm :contact (dissoc contact :command :response :subscriptions :jail-loaded-events) - (core/exists? realm :contact :whisper-identity whisper-identity)))) + true))) (defn save-contacts-tx "Returns tx function for saving contacts" diff --git a/src/status_im/data_store/mailservers.cljs b/src/status_im/data_store/mailservers.cljs index abfa25ce96..05b432d4f9 100644 --- a/src/status_im/data_store/mailservers.cljs +++ b/src/status_im/data_store/mailservers.cljs @@ -16,7 +16,7 @@ (core/create realm :mailserver mailserver - (core/exists? realm :mailserver :id id)))) + true))) (defn delete-tx "Returns tx function for deleting a mailserver" diff --git a/src/status_im/data_store/messages.cljs b/src/status_im/data_store/messages.cljs index 1b120a16de..1c01942aa5 100644 --- a/src/status_im/data_store/messages.cljs +++ b/src/status_im/data_store/messages.cljs @@ -87,12 +87,12 @@ "Returns tx function for saving message" [{:keys [message-id from] :as message}] (fn [realm] - (when-not (core/exists? realm :message :message-id message-id) - (core/create realm - :message - (prepare-message (merge default-values - message - {:from (or from "anonymous")})))))) + (core/create realm + :message + (prepare-message (merge default-values + message + {:from (or from "anonymous")})) + true))) (defn delete-message-tx "Returns tx function for deleting message" @@ -102,20 +102,6 @@ (core/delete realm message) (core/delete realm (core/get-by-field realm :user-status :message-id message-id))))) -(defn update-message-tx - "Returns tx function for updating message" - [{:keys [message-id] :as message}] - (fn [realm] - (when (core/exists? realm :message :message-id message-id) - (core/create realm :message (prepare-message message) true)))) - -(defn update-messages-tx - "Returns tx function for updating messages" - [messages] - (fn [realm] - (doseq [message messages] - ((update-message-tx message) realm)))) - (defn delete-messages-tx "Returns tx function for deleting messages with user statuses for given chat-id" [chat-id] diff --git a/src/status_im/data_store/realm/core.cljs b/src/status_im/data_store/realm/core.cljs index 9d8cc7754b..9169ccec4b 100644 --- a/src/status_im/data_store/realm/core.cljs +++ b/src/status_im/data_store/realm/core.cljs @@ -9,8 +9,7 @@ [status-im.utils.async :as utils.async] [cognitect.transit :as transit] [status-im.react-native.js-dependencies :as rn-dependencies] - [status-im.utils.utils :as utils]) - (:refer-clojure :exclude [exists?])) + [status-im.utils.utils :as utils])) (def new-account-filename "new-account") @@ -35,7 +34,7 @@ (when encryption-key (log/debug "Using encryption key...") (set! (.-encryptionKey options-js) (to-buffer encryption-key))) - (when (cljs.core/exists? js/window) + (when (exists? js/window) (rn-dependencies/realm. options-js)))) (defn- delete-realm @@ -231,9 +230,8 @@ (defmethod to-query :eq [schema-name _ field value] (let [field-type (field-type schema-name field) - escaped-value (when value (gstr/escapeString (str value))) query (str (name field) "=" (if (= "string" (name field-type)) - (str "\"" escaped-value "\"") + (str "\"" value "\"") value))] query)) @@ -260,9 +258,3 @@ (case op :and (and-query queries) :or (or-query queries))))) - -(defn exists? - "Returns true if object/s identified by schema-name and field and value - exists in realm" - [realm schema-name field value] - (pos? (.-length (get-by-field realm schema-name field value)))) diff --git a/src/status_im/data_store/transport.cljs b/src/status_im/data_store/transport.cljs index 285bd109d8..eb7b62bf03 100644 --- a/src/status_im/data_store/transport.cljs +++ b/src/status_im/data_store/transport.cljs @@ -35,7 +35,7 @@ (update :seen pr-str) (update :pending-ack pr-str) (update :pending-send pr-str)) - (core/exists? realm :transport :chat-id chat-id)))) + true))) (defn delete-transport-tx "Returns tx function for deleting transport" diff --git a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs index 0701305d3a..a07b1d5d3c 100644 --- a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs +++ b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs @@ -53,7 +53,7 @@ [list/item-icon {:icon :icons/forward :icon-opts {:color :gray}}]]]]) -(def default-public-chats ["status" "cryptostrikers" "dapps" "ethereum" "openbounty"]) +(def default-public-chats ["status" "status 中文" "status 日本語" "status 한국어" "status по-русски" "status español" "cryptostrikers" "dapps" "ethereum" "openbounty"]) (views/defview new-public-chat [] (views/letsubs [topic [:get :public-group-topic]