[FIX] Read Receipt for Livechat Messages fixed by knrt10 · Pull Request #13832 · RocketChat/Rocket.Chat

knrt10 · 2019-03-21T17:30:36Z

renatobecker-zz · 2019-03-22T16:47:23Z

imports/message-read-receipt/client/readReceipts.js

+		if (this.user) {
+			return (settings.get('UI_Use_Real_Name') && this.user.name) || this.user.username;
+		}
+		return this.guest.name;


If the Livechat registration form is not enabled, then the name of the guest will not be defined.
Anyway, we don't need to create another property to display the user data, let's use the user property for both regular users and Livechat users.

renatobecker-zz · 2019-03-22T16:50:16Z

imports/message-read-receipt/client/readReceipts.html

 			{{#each receipts}}
 				<li class="read-receipts__user background-transparent-dark-hover">
-					{{> avatar username=user.username}}
+                                        {{#if user}}


Please, undo this change.

@renatobecker Do you want an avatar with guest name or username, cause if it is the guest name, it will change accordingly, otherwise it will always be G

We don't have Avatars for Livechat users.
It's ok showing the default avatar as you just described.

renatobecker-zz · 2019-03-22T17:04:18Z

imports/message-read-receipt/server/lib/ReadReceipt.js

@@ -81,6 +81,7 @@ export const ReadReceipt = {
 		return ReadReceipts.findByMessageId(message._id).map((receipt) => ({
 			...receipt,
 			user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),


We can check the receipt object to ensure that it came from a Livechat user or not. If the receipt.token exists, then you need to get the guest by finding it with the LivechatVisitors model, as you can see below:

Suggested change

user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),

user: message.token? LivechatVisitors.findById(receipt.userId, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }) ,

Ok, let me update that.

renatobecker-zz · 2019-03-22T21:20:57Z

imports/message-read-receipt/server/hooks.js


 	// mark message as read as well
-	ReadReceipt.markMessageAsReadBySender(message, room._id, message.u._id);
+	ReadReceipt.markMessageAsReadBySender(message, room._id, message.u._id, message.token);


This is not a good approach.
The token needs to come from a specific Livechat Room Type method since this package is not the Livechat package.
In addition, the markMessageAsReadBySender needs to expect an object, not a regular variable.

renatobecker-zz · 2019-03-22T21:21:16Z

imports/message-read-receipt/server/lib/ReadReceipt.js

 	},

-	markMessageAsReadBySender(message, roomId, userId) {
+	markMessageAsReadBySender(message, roomId, userId, extraData) {


Suggested change

markMessageAsReadBySender(message, roomId, userId, extraData) {

markMessageAsReadBySender(message, roomId, userId, extraData = {}) {

renatobecker-zz · 2019-03-22T21:21:35Z

imports/message-read-receipt/server/lib/ReadReceipt.js

 				userId,
 				messageId: message._id,
 				ts,
+				token: extraData,


Suggested change

token: extraData,

...extraData,

renatobecker-zz · 2019-03-22T21:23:49Z

imports/message-read-receipt/server/lib/ReadReceipt.js

 		return ReadReceipts.findByMessageId(message._id).map((receipt) => ({
 			...receipt,
-			user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
+			user: (receipt.token && !(Object.keys(receipt.token).length === 0 && receipt.token.constructor === Object)) ? LivechatVisitors.getVisitorByToken(message.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),


Suggested change

user: (receipt.token && !(Object.keys(receipt.token).length === 0 && receipt.token.constructor === Object)) ? LivechatVisitors.getVisitorByToken(message.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),

user: receipt.token ? LivechatVisitors.getVisitorByToken(receipt.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),

renatobecker-zz · 2019-03-22T22:51:34Z

app/utils/lib/RoomTypeConfig.js

 	}

+	/**
+   * Get receipt's extra token for livechat users


These comments are related to Livechat stuff, not the default Room Type Config

renatobecker-zz · 2019-03-22T22:52:38Z

app/utils/lib/RoomTypeConfig.js

+   * @return {object} Token for user
+   */
+	getReadReceiptsExtraData(message) {
+		if (!Meteor.isServer) {


Here the return will be always return {};

@knrt10, are you sure? The code has not changed to me.

renatobecker-zz · 2019-03-25T14:15:10Z

imports/message-read-receipt/server/lib/ReadReceipt.js

 		if (message.unread && message.ts < firstSubscription.ls) {
 			Messages.setAsReadById(message._id, firstSubscription.ls);
 		}
+		const extraData = roomTypes.getConfig('l').getReadReceiptsExtraData(message);


He discussed about it last week:

Suggested change

const extraData = roomTypes.getConfig('l').getReadReceiptsExtraData(message);

const extraData = roomTypes.getConfig(room.t).getReadReceiptsExtraData(message);

You need to find the room and get the room type field:
const room = Rooms.findOneById(roomId, { fields: { t: 1 } });

knrt10 · 2019-03-25T14:27:20Z

Rebased and updated, latest changes

engelgabriel added this to the 1.0.0 milestone Mar 21, 2019

renatobecker-zz added the feat: livechat label Mar 22, 2019

renatobecker-zz self-requested a review March 22, 2019 16:19

renatobecker-zz suggested changes Mar 22, 2019

View reviewed changes

knrt10 force-pushed the issue13302 branch 3 times, most recently from fc9963d to 607929f Compare March 22, 2019 20:16

renatobecker-zz suggested changes Mar 22, 2019

View reviewed changes

knrt10 force-pushed the issue13302 branch 2 times, most recently from 54ee6eb to 91e3ed8 Compare March 22, 2019 22:47

renatobecker-zz suggested changes Mar 22, 2019

View reviewed changes

knrt10 force-pushed the issue13302 branch 2 times, most recently from 3412bc5 to c1c61f3 Compare March 25, 2019 14:08

renatobecker-zz suggested changes Mar 25, 2019

View reviewed changes

knrt10 added 5 commits March 25, 2019 19:55

Fixed error

7bdb780

removing redundnt code

2506e3c

New implementation

532e1d2

Finally working, fixed issue

0cafe48

room type getting by room

cadba89

knrt10 force-pushed the issue13302 branch from 798123e to cadba89 Compare March 25, 2019 14:26

renatobecker added 4 commits March 25, 2019 12:34

Merge branch 'develop' into issue13302

a9c2f74

Merge branch 'develop' into issue13302

05e0a1e

Merge branch 'develop' into issue13302

abd246b

Merge branch 'develop' into issue13302

e81f0ee

renatobecker-zz approved these changes Mar 28, 2019

View reviewed changes

renatobecker-zz merged commit c13708a into RocketChat:develop Mar 28, 2019

bkraul mentioned this pull request Mar 30, 2019

Apps system broken: imgur, giphy apps not returning results #13957

Closed

rodrigok mentioned this pull request Apr 28, 2019

Release 1.0.0 #14277

Merged

tassoevan added subj: livechat squad: omnichannel and removed feat: livechat labels Oct 26, 2022

	user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
	user: message.token? LivechatVisitors.findById(receipt.userId, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }) ,

	markMessageAsReadBySender(message, roomId, userId, extraData) {
	markMessageAsReadBySender(message, roomId, userId, extraData = {}) {

	user: (receipt.token && !(Object.keys(receipt.token).length === 0 && receipt.token.constructor === Object)) ? LivechatVisitors.getVisitorByToken(message.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
	user: receipt.token ? LivechatVisitors.getVisitorByToken(receipt.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),

	const extraData = roomTypes.getConfig('l').getReadReceiptsExtraData(message);
	const extraData = roomTypes.getConfig(room.t).getReadReceiptsExtraData(message);

Conversation

knrt10 commented Mar 21, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renatobecker-zz Mar 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renatobecker-zz Mar 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renatobecker-zz Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renatobecker-zz Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

knrt10 commented Mar 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Comments

renatobecker-zz Mar 22, 2019 •

edited

Loading

renatobecker-zz Mar 22, 2019 •

edited

Loading

renatobecker-zz Mar 25, 2019 •

edited

Loading

renatobecker-zz Mar 25, 2019 •

edited

Loading