osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: corrects a regression with last_read_message_id (#19553)

Browse Source 
This commit also adds a system to correctly track this case.
This commit is contained in:
Joffrey JAFFEUX
2022-12-21 19:49:32 +01:00
committed by GitHub
parent 58479fe10b
commit 48ac5d5db9
10 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
+1 -1
View File
@@ -546,7 +546,7 @@ export default Component.extend({
},
_getLastReadId() {
return this.chatChannel.currentUserMembership.chat_message_id;
return this.chatChannel.currentUserMembership.last_read_message_id;
},
_markLastReadMessage(opts = { reRender: false }) {
plugins/chat/assets/javascripts/discourse/models/user-chat-channel-membership.js
-2
View File
@@ -6,8 +6,6 @@ export default class UserChatChannelMembership extends RestModel {
@tracked muted = false;
@tracked unread_count = 0;
@tracked unread_mentions = 0;
@tracked chat_message_id = null;
@tracked chat_channel_id = null;
@tracked desktop_notification_level = null;
@tracked mobile_notification_level = null;
@tracked last_read_message_id = null;
plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
+10 -7
View File
@@ -95,16 +95,17 @@ export default class ChatSubscriptionsManager extends Service {
this.chatChannelsManager.find(busData.channel_id).then((channel) => {
if (busData.user_id === this.currentUser.id) {
// User sent message, update tracking state to no unread
channel.currentUserMembership.chat_message_id = busData.message_id;
channel.currentUserMembership.last_read_message_id = busData.message_id;
} else {
// Ignored user sent message, update tracking state to no unread
if (this.currentUser.ignored_users.includes(busData.username)) {
channel.currentUserMembership.chat_message_id = busData.message_id;
channel.currentUserMembership.last_read_message_id =
busData.message_id;
} else {
// Message from other user. Increment trackings state
if (
busData.message_id >
(channel.currentUserMembership.chat_message_id || 0)
(channel.currentUserMembership.last_read_message_id || 0)
) {
channel.currentUserMembership.unread_count =
channel.currentUserMembership.unread_count + 1;
@@ -140,12 +141,14 @@ export default class ChatSubscriptionsManager extends Service {
}
@bind
_onUserTrackingStateUpdate(data) {
this.chatChannelsManager.find(data.chat_channel_id).then((channel) => {
_onUserTrackingStateUpdate(busData) {
this.chatChannelsManager.find(busData.chat_channel_id).then((channel) => {
if (
channel?.currentUserMembership?.chat_message_id < data.chat_message_id
channel?.currentUserMembership?.last_read_message_id <
busData.chat_message_id
) {
channel.currentUserMembership.chat_message_id = data.chat_message_id;
channel.currentUserMembership.last_read_message_id =
busData.chat_message_id;
channel.currentUserMembership.unread_count = 0;
channel.currentUserMembership.unread_mentions = 0;
}