Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: correctly set last message bus ids on resync (#21911) 

Replaces `channel.meta.message_bust_last_ids` on full resync instead of restarting the subscriptions, which was moreover not using a correct id.
This commit is contained in:
Joffrey JAFFEUX 2023-06-02 18:06:13 +02:00 committed by GitHub
parent 56ee46bf63
commit 95a51b7d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,15 +54,6 @@ export default class ChatSubscriptionsManager extends Service {
this._channelSubscriptions.delete(channel.id);
}
restartChannelsSubscriptions(messageBusIds) {
this.stopChannelsSubscriptions();
this.startChannelsSubscriptions(messageBusIds);
(this.chatChannelsManager.channels || []).forEach((channel) => {
this.startChannelSubscription(channel);
});
}
startChannelsSubscriptions(messageBusIds) {
this._startNewChannelSubscription(messageBusIds.new_channel);
this._startChannelArchiveStatusSubscription(messageBusIds.archive_status);

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

@ -115,14 +115,10 @@ export default class Chat extends Service {
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
);
this.chatApi.listCurrentUserChannels().then((channelsView) => {
[
...channels.public_channels,
...channels.direct_message_channels,
...channelsView.public_channels,
...channelsView.direct_message_channels,
].forEach((channelObject) => {
this.chatChannelsManager
.find(channelObject.id, { fetchIfNotFound: false })
@ -135,10 +131,11 @@ export default class Chat extends Service {
// endpoint that gives you all channel tracking state and the
// thread tracking state for the current channel.
if (channel) {
channel.meta.message_bus_last_ids =
channelObject.meta.message_bus_last_ids;
channel.updateMembership(channelObject.current_user_membership);
const channelTrackingState =
channels.tracking.channel_tracking[channel.id];
channelsView.tracking.channel_tracking[channel.id];
channel.tracking.unreadCount =
channelTrackingState.unread_count;
channel.tracking.mentionCount =