Skip to content

A platform for community discussion. Free, open, simple.

FIX: use available channel for /chat/new-channel MessageBus event (#41625)

Penar Musaraj1f31aaae8a69
diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js b/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
index 1a6fc2042a6..9767a16d057 100644
--- a/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
+++ b/plugins/chat/assets/javascripts/discourse/services/chat-subscriptions-manager.js
@@ -449,28 +449,28 @@ export default class ChatSubscriptionsManager extends Service {
@bind
_onNewChannelSubscription(data) {
- this.chatChannelsManager.find(data.channel.id).then((channel) => {
- // we need to refresh here to have correct last message ids
- channel.meta = data.channel.meta;
- channel.currentUserMembership = data.channel.current_user_membership;
+ const channel = this.chatChannelsManager.store(data.channel);
- if (!this.currentUser) {
- if (channel.isCategoryChannel) {
- this.startChannelSubscription(channel, { readOnly: true });
- }
+ // we need to refresh here to have correct last message ids
+ channel.meta = data.channel.meta;
+ channel.currentUserMembership = data.channel.current_user_membership;
- return;
+ if (!this.currentUser) {
+ if (channel.isCategoryChannel) {
+ this.startChannelSubscription(channel, { readOnly: true });
}
- if (
- channel.isDirectMessageChannel &&
- !channel.currentUserMembership.following
- ) {
- channel.tracking.unreadCount = 1;
- }
+ return;
+ }
- this.chatChannelsManager.follow(channel);
- });
+ if (
+ channel.isDirectMessageChannel &&
+ !channel.currentUserMembership.following
+ ) {
+ channel.tracking.unreadCount = 1;
+ }
+
+ this.chatChannelsManager.follow(channel);
}
_startChannelsMetadataChangesSubscription(lastId) {
diff --git a/plugins/chat/test/javascripts/unit/services/chat-subscriptions-manager-test.js b/plugins/chat/test/javascripts/unit/services/chat-subscriptions-manager-test.js
index 35a18354eb8..859c45f3d70 100644
--- a/plugins/chat/test/javascripts/unit/services/chat-subscriptions-manager-test.js
+++ b/plugins/chat/test/javascripts/unit/services/chat-subscriptions-manager-test.js
@@ -68,4 +68,19 @@ module("Unit | Service | chat-subscriptions-manager", function (hooks) {
assert.strictEqual(channel.lastMessage, message);
assert.strictEqual(channel.tracking.unreadCount, 0);
});
+
+ test("new channel subscriptions use the channel from the event", async function (assert) {
+ const channel = this.fabricators.directMessageChannel({ id: 46 });
+ channel.current_user_membership = { following: true };
+ sinon.stub(this.chatChannelsManager.chatApi, "channel").throws();
+
+ this.subject._onNewChannelSubscription({ channel });
+
+ const storedChannel = await this.chatChannelsManager.find(channel.id, {
+ fetchIfNotFound: false,
+ });
+
+ assert.strictEqual(storedChannel, channel);
+ assert.true(storedChannel.currentUserMembership.following);
+ });
});