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

FIX: improve chat channel sorting for DMs (#30124)

Browse Source 
This change sorts unread channels in descending order based on last message date, so channels with the latest activity will always appear at the top. It also adds some improvements for sorting channels with unread threads, now when multiple channels have unread threads, they will be sorted by last thread reply date to ensure more active channels rise to the top.

For DM channels, the order is now:

- Urgent (green badge) - unread messages, mentions and unread watched threads (most recent activity at top)
- Unread (blue badge) - unread tracked threads (most recent thread reply at top)
- Everything else (most recent message at top)
This commit is contained in:
David Battersby
2024-12-05 13:33:55 +04:00
committed by GitHub
parent 1ca90c3070
commit b3c94839ed
4 changed files with 106 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
plugins/chat/spec/system/list_channels/drawer_spec.rb
View File

@ -145,45 +145,73 @@ RSpec.describe "List channels | Drawer", type: :system do
expect(drawer_page).to have_channel_at_position(dm_channel_3, 4)
end
it "sorts channels with threads by urgency" do
drawer_page.visit_index
drawer_page.click_direct_messages
context "with unread threads" do
fab!(:message_1) do
Fabricate(
:chat_message,
chat_channel: dm_channel_3,
user: current_user,
use_service: true,
)
end
fab!(:thread_1) do
Fabricate(
:chat_thread,
channel: dm_channel_3,
original_message: message_1,
use_service: true,
)
end
fab!(:message_2) do
Fabricate(
:chat_message,
chat_channel: dm_channel_4,
user: current_user,
use_service: true,
)
end
fab!(:thread_2) do
Fabricate(
:chat_thread,
channel: dm_channel_4,
original_message: message_2,
use_service: true,
)
end
Fabricate(
:chat_thread,
notification_level: :watching,
original_message:
Fabricate(
:chat_message,
chat_channel: dm_channel_4,
user: current_user,
use_service: true,
),
with_replies: 2,
use_service: true,
)
before do
dm_channel_3.membership_for(current_user).mark_read!(message_1.id)
dm_channel_4.membership_for(current_user).mark_read!(message_2.id)
Fabricate(
:chat_thread,
original_message:
Fabricate(
:chat_message,
chat_channel: dm_channel_3,
user: current_user,
use_service: true,
),
with_replies: 2,
use_service: true,
)
drawer_page.visit_index
drawer_page.click_direct_messages
end
expect(drawer_page).to have_channel_at_position(dm_channel_4, 1)
expect(drawer_page).to have_urgent_channel(dm_channel_4)
it "sorts channels with unread threads by last reply" do
Fabricate(:chat_message, thread: thread_1, user: user_2, use_service: true)
Fabricate(:chat_message, thread: thread_2, user: user_3, use_service: true)
expect(drawer_page).to have_channel_at_position(dm_channel_3, 2)
expect(drawer_page).to have_unread_channel(dm_channel_3)
expect(drawer_page).to have_channel_at_position(dm_channel_4, 1)
expect(drawer_page).to have_unread_channel(dm_channel_4)
expect(drawer_page).to have_channel_at_position(dm_channel_1, 3)
expect(drawer_page).to have_channel_at_position(dm_channel_2, 4)
expect(drawer_page).to have_channel_at_position(dm_channel_3, 2)
expect(drawer_page).to have_unread_channel(dm_channel_3)
end
it "sorts channels with unread threads by importance" do
thread_1.membership_for(current_user).update!(
notification_level: ::Chat::NotificationLevels.all[:watching],
)
Fabricate(:chat_message, thread: thread_1, user: user_2, use_service: true)
Fabricate(:chat_message, thread: thread_2, user: user_3, use_service: true)
expect(drawer_page).to have_channel_at_position(dm_channel_3, 1)
expect(drawer_page).to have_urgent_channel(dm_channel_3)
expect(drawer_page).to have_channel_at_position(dm_channel_4, 2)
expect(drawer_page).to have_unread_channel(dm_channel_4)
end
end
end
end