status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-04 12:55:03 +00:00
Code Issues Projects Releases Wiki Activity

[#11317] Prevent joining to pubchats with upper case letter in topic

Browse Source
This commit is contained in:
Roman Volosovskyi 2020-10-22 17:12:13 +03:00
parent 466d279e2a
commit dca26b3350
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/status_im/chat/models.cljs
View File

@ -15,7 +15,8 @@
[status-im.utils.fx :as fx] [status-im.utils.fx :as fx]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.chat.models.loading :as loading] [status-im.chat.models.loading :as loading]
[status-im.utils.types :as types])) [status-im.utils.types :as types]
[status-im.ui.screens.add-new.new-public-chat.db :as new-public-chat.db]))
(defn chats [] (defn chats []
(:chats (types/json->clj (js/require "./chats.js")))) (:chats (types/json->clj (js/require "./chats.js"))))
@ -262,6 +263,7 @@
(fx/defn start-public-chat (fx/defn start-public-chat
"Starts a new public chat" "Starts a new public chat"
[cofx topic {:keys [dont-navigate?]}] [cofx topic {:keys [dont-navigate?]}]
(if (new-public-chat.db/valid-topic? topic)
(if (active-chat? cofx topic) (if (active-chat? cofx topic)
(when-not dont-navigate? (when-not dont-navigate?
(navigate-to-chat cofx topic)) (navigate-to-chat cofx topic))
@ -269,7 +271,9 @@
(add-public-chat topic) (add-public-chat topic)
(transport.filters/load-chat topic) (transport.filters/load-chat topic)
#(when-not dont-navigate? #(when-not dont-navigate?
(navigate-to-chat % topic))))) (navigate-to-chat % topic))))
{:utils/show-popup {:title (i18n/label :t/cant-open-public-chat)
:content (i18n/label :t/invalid-public-chat-topic)}}))
(fx/defn disable-chat-cooldown (fx/defn disable-chat-cooldown
"Turns off chat cooldown (protection against message spamming)" "Turns off chat cooldown (protection against message spamming)"

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.62.12", "version": "v0.62.13",
"commit-sha1": "a36144983aa99cf14b8fd1a9969ee26a6aeff8f8", "commit-sha1": "7467ca7b103f685dd64d73485555f90c181a4484",
"src-sha256": "0ggs7sqf5w7yr049lfdz7wr8aby0vzaybj3v0ln96f8njghvzwfq" "src-sha256": "0gv9jxn5c5arnxdr33rfw2zkly9c2nyss59vbdyf444140bd6y6y"
} }

4
translations/en.json
View File

@ -1280,5 +1280,7 @@
"name-optional": "Name (optional)", "name-optional": "Name (optional)",
"mute": "Mute", "mute": "Mute",
"scan-tokens": "Scan tokens", "scan-tokens": "Scan tokens",
"warning-sending-to-contract-descr": "The address you entered is a smart contract, sending funds to this address may result in loss of funds. To interact with a DApp, open the DApp in the Status DApp Browser." "warning-sending-to-contract-descr": "The address you entered is a smart contract, sending funds to this address may result in loss of funds. To interact with a DApp, open the DApp in the Status DApp Browser.",
"cant-open-public-chat": "Can't open public chat",
"invalid-public-chat-topic": "Invalid public chat topic"
} }