github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 07:02:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Chat errors for thread subscriptions (#22657)

Browse Source 
When we have subscriptions for new messages in a channel,
we also have special handling for messages in a thread. For
cases like DM channels where threads are made in the background
but not used in the UI, this is causing JS errors because we
are trying to fetch the thread but it returns 404.

We only want to do things with messages in threads if the
channel actually has threading enabled.
This commit is contained in:
Martin Brennan 2023-07-18 13:02:27 +10:00 committed by GitHub
parent 7c0534c292
commit 1cb2043edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ export default class ChatSubscriptionsManager extends Service {
}
// Thread should be considered unread if not already.
if (busData.thread_id) {
if (busData.thread_id && channel.threadingEnabled) {
channel.threadsManager
.find(channel.id, busData.thread_id)
.then((thread) => {
@ -226,6 +226,10 @@ export default class ChatSubscriptionsManager extends Service {
_onNewThreadMessage(busData) {
this.chatChannelsManager.find(busData.channel_id).then((channel) => {
if (!channel.threadingEnabled) {
return;
}
channel.threadsManager
.find(busData.channel_id, busData.thread_id)
.then((thread) => {
@ -334,12 +338,19 @@ export default class ChatSubscriptionsManager extends Service {
channel.tracking.unreadCount = busData.unread_count;
channel.tracking.mentionCount = busData.mention_count;
if (busData.hasOwnProperty("unread_thread_overview")) {
if (
busData.hasOwnProperty("unread_thread_overview") &&
channel.threadingEnabled
) {
channel.threadsManager.unreadThreadOverview =
busData.unread_thread_overview;
}
if (busData.thread_id && busData.hasOwnProperty("thread_tracking")) {
if (
busData.thread_id &&
busData.hasOwnProperty("thread_tracking") &&
channel.threadingEnabled
) {
channel.threadsManager
.find(channelId, busData.thread_id)
.then((thread) => {