verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Mentions (#1829) 

Co-authored-by: Diego Mello <diegolmello@gmail.com>
This commit is contained in:
Diego Mello 2020-03-05 13:30:13 -03:00 committed by GitHub
parent ab0736233d
commit a7d7ff4bb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/lib/methods/sendMessage.js
View File

@ -14,8 +14,10 @@ const changeMessageStatus = async(id, tmid, status, message) => {
successBatch.push(
messageRecord.prepareUpdate((m) => {
m.status = status;
m.mentions = message.mentions;
m.channels = message.channels;
if (message) {
m.mentions = message.mentions;
m.channels = message.channels;
}
})
);
@ -24,8 +26,10 @@ const changeMessageStatus = async(id, tmid, status, message) => {
successBatch.push(
threadMessageRecord.prepareUpdate((tm) => {
tm.status = status;
tm.mentions = message.mentions;
tm.channels = message.channels;
if (message) {
tm.mentions = message.mentions;
tm.channels = message.channels;
}
})
);
}
@ -51,10 +55,13 @@ export async function sendMessageCall(message) {
_id, rid, msg, tmid
}
});
await changeMessageStatus(_id, tmid, messagesStatus.SENT, result.message);
} catch (e) {
await changeMessageStatus(_id, tmid, messagesStatus.ERROR);
if (result.success) {
return changeMessageStatus(_id, tmid, messagesStatus.SENT, result.message);
}
} catch {
// do nothing
}
return changeMessageStatus(_id, tmid, messagesStatus.ERROR);
}
export default async function(rid, msg, tmid, user) {

2
yarn.lock
View File

@ -3331,7 +3331,7 @@ commondir@^1.0.1:
"commonmark@git+https://github.com/RocketChat/commonmark.js.git":
version "0.29.0"
resolved "git+https://github.com/RocketChat/commonmark.js.git#fe037b1c97ca5bc7d329ef312bf9a374ab8f3d4a"
resolved "git+https://github.com/RocketChat/commonmark.js.git#5d293fe9ba83a3e6f842d5d3f41a9b57c35bea1f"
dependencies:
entities "~ 1.1.1"
mdurl "~ 1.0.1"