Skip to content

Only update lastMessageText from pusher event from other users #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 2 commits into from
Mar 16, 2021
Merged

Only update lastMessageText from pusher event from other users #1781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28cf905
Only update lastMessageText from pusher event
tgolen Mar 15, 2021
90c81f8
Update variable name and DRY up some logic
tgolen Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions src/libs/actions/Report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ function removeOptimisticActions(reportID) {
function updateReportWithNewAction(reportID, reportAction) {
const newMaxSequenceNumber = reportAction.sequenceNumber;
const isFromCurrentUser = reportAction.actorAccountID === currentUserAccountID;
const lastReadSequenceNumber = lastReadSequenceNumbers[reportID] || 0;

// When handling an action from the current users we can assume that their
// last read actionID has been updated in the server but not necessarily reflected
Expand All @@ -257,14 +258,21 @@ function updateReportWithNewAction(reportID, reportAction) {
// Always merge the reportID into Onyx
// If the report doesn't exist in Onyx yet, then all the rest of the data will be filled out
// by handleReportChanged
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
const updatedReportObject = {
reportID,
unreadActionCount: newMaxSequenceNumber - (lastReadSequenceNumbers[reportID] || 0),
unreadActionCount: newMaxSequenceNumber - lastReadSequenceNumber,
maxSequenceNumber: reportAction.sequenceNumber,
lastMessageTimestamp: reportAction.timestamp,
lastMessageText: messageText,
lastActorEmail: reportAction.actorEmail,
});
};

// If the report action from pusher is a higher sequence number than we know about (meaning it has come from
// a chat participant in another application), then the last message text and author needs to be updated as well
if (newMaxSequenceNumber > lastReadSequenceNumber) {
updatedReportObject.lastMessageTimestamp = reportAction.timestamp;
updatedReportObject.lastMessageText = messageText;
updatedReportObject.lastActorEmail = reportAction.actorEmail;
}

Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, updatedReportObject);

const reportActionsToMerge = {};
if (reportAction.clientID) {
Expand Down Expand Up @@ -576,17 +584,24 @@ function fetchAll(shouldRedirectToReport = true, shouldRecordHomePageTiming = fa
function addAction(reportID, text, file) {
// Convert the comment from MD into HTML because that's how it is stored in the database
const parser = new ExpensiMark();
const htmlComment = parser.replace(text);
const commentText = parser.replace(text);
const isAttachment = _.isEmpty(text) && file !== undefined;

// The new sequence number will be one higher than the highest
const highestSequenceNumber = reportMaxSequenceNumbers[reportID] || 0;
const newSequenceNumber = highestSequenceNumber + 1;
const htmlForNewComment = isAttachment ? 'Uploading Attachment...' : commentText;

// Remove HTML from text when applying optimistic offline comment
const textForNewComment = isAttachment ? '[Attachment]'
: htmlForNewComment.replace(/<[^>]*>?/gm, '');

// Update the report in Onyx to have the new sequence number
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
maxSequenceNumber: newSequenceNumber,
lastMessageTimestamp: moment().unix(),
lastMessageText: textForNewComment,
lastActorEmail: currentUserEmail,
});

// Generate a clientID so we can save the optimistic action to storage with the clientID as key. Later, we will
Expand Down Expand Up @@ -629,11 +644,8 @@ function addAction(reportID, text, file) {
message: [
{
type: 'COMMENT',
html: isAttachment ? 'Uploading Attachment...' : htmlComment,

// Remove HTML from text when applying optimistic offline comment
text: isAttachment ? '[Attachment]'
: htmlComment.replace(/<[^>]*>?/gm, ''),
html: htmlForNewComment,
text: textForNewComment,
},
],
isFirstItem: false,
Expand All @@ -645,7 +657,7 @@ function addAction(reportID, text, file) {

API.Report_AddComment({
reportID,
reportComment: htmlComment,
reportComment: htmlForNewComment,
file,
clientID: optimisticReportActionID,

Expand Down