github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-19 06:59:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Sync channel tracking state properly on presence change (#21596)

Browse Source 
Followup from 9953a6edd92654845bb34773550d14cb7850240e,
which broke an issue fixed in e8d6277062e711b8c33829b1d708100822cca167.

In the refactor we did not update the place where we resync
channel tracking based on onPresenceChange to use the new
tracking object we added to the serializer, and to directly
update channel.tracking
This commit is contained in:
Martin Brennan 2023-05-16 21:37:51 +02:00 committed by GitHub
parent 0881186bfd
commit 009006893e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/chat/assets/javascripts/discourse/services/chat.js
View File

@ -108,6 +108,8 @@ export default class Chat extends Service {
@bind
onPresenceChangeCallback(present) {
if (present) {
// NOTE: channels is more than a simple array, it also contains
// tracking and membership data, see Chat::StructuredChannelSerializer
this.chatApi.listCurrentUserChannels().then((channels) => {
this.chatSubscriptionsManager.restartChannelsSubscriptions(
channels.meta.message_bus_last_ids
@ -122,6 +124,13 @@ export default class Chat extends Service {
.then((channel) => {
if (channel) {
channel.updateMembership(channelObject.current_user_membership);
const channelTrackingState =
channels.tracking.channel_tracking[channel.id];
channel.tracking.unreadCount =
channelTrackingState.unread_count;
channel.tracking.mentionCount =
channelTrackingState.mention_count;
}
});
});