Skip to content

Commit

Permalink
[FIX] Mentions (#1829)
Browse files Browse the repository at this point in the history
Co-authored-by: Diego Mello <diegolmello@gmail.com>
  • Loading branch information
diegolmello committed Mar 5, 2020
1 parent ab07362 commit a7d7ff4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
21 changes: 14 additions & 7 deletions app/lib/methods/sendMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
})
);

Expand All @@ -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;
}
})
);
}
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a7d7ff4

Please sign in to comment.