From 0cb554f5c684ff9c3b5902b7fae2ca17a8635b3b Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 27 Aug 2020 14:59:47 +0200 Subject: [PATCH] [#11113] Can't send image without description in 1-1 and group chats --- src/status_im/chat/models/mentions.cljs | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/status_im/chat/models/mentions.cljs b/src/status_im/chat/models/mentions.cljs index 106c9251ee..e629c2fd64 100644 --- a/src/status_im/chat/models/mentions.cljs +++ b/src/status_im/chat/models/mentions.cljs @@ -103,21 +103,23 @@ ([text users-fn] (replace-mentions text users-fn 0)) ([text users-fn idx] - (let [mention-key-idx (string/index-of text "@" idx)] - (if-not mention-key-idx - text - (let [users (users-fn) - {:keys [public-key alias]} - (match-mention text users mention-key-idx)] - (if-not alias - (recur text (fn [] users) (inc mention-key-idx)) - (let [new-text (string/join - [(subs text 0 (inc mention-key-idx)) - public-key - (subs text (+ (inc mention-key-idx) - (count alias)))]) - mention-end (+ (inc mention-key-idx) (count public-key))] - (recur new-text (fn [] users) mention-end)))))))) + (if (string/blank? text) + text + (let [mention-key-idx (string/index-of text "@" idx)] + (if-not mention-key-idx + text + (let [users (users-fn) + {:keys [public-key alias]} + (match-mention text users mention-key-idx)] + (if-not alias + (recur text (fn [] users) (inc mention-key-idx)) + (let [new-text (string/join + [(subs text 0 (inc mention-key-idx)) + public-key + (subs text (+ (inc mention-key-idx) + (count alias)))]) + mention-end (+ (inc mention-key-idx) (count public-key))] + (recur new-text (fn [] users) mention-end))))))))) (defn check-mentions [cofx text] (replace-mentions text #(get-mentionable-users cofx)))