github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 12:00:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Rename direct message related models

Browse Source 
This is a followup of the previous refactor where we created two new
models to handle all the dedicated logic that was present in the
`ChatChannel` model.

For the sake of consistency, `DMChannel` has been renamed to
`DirectMessageChannel` and the previous `DirectMessageChannel` model is
now named `DirectMessage`. This should help reasoning about direct
messages.
This commit is contained in:
Loïc Guitaut
2022-11-02 15:53:36 +01:00
committed by Loïc Guitaut
parent 7e992cb299
commit abcaa1a961
57 changed files with 378 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/chat/spec/lib/chat_channel_fetcher_spec.rb
View File

@ -4,10 +4,10 @@ describe Chat::ChatChannelFetcher do
fab!(:category) { Fabricate(:category, name: "support") }
fab!(:private_category) { Fabricate(:private_category, group: Fabricate(:group)) }
fab!(:category_channel) { Fabricate(:category_channel, chatable: category) }
fab!(:dm_channel1) { Fabricate(:direct_message_channel) }
fab!(:dm_channel2) { Fabricate(:direct_message_channel) }
fab!(:direct_message_channel1) { Fabricate(:dm_channel, chatable: dm_channel1) }
fab!(:direct_message_channel2) { Fabricate(:dm_channel, chatable: dm_channel2) }
fab!(:dm_channel1) { Fabricate(:direct_message) }
fab!(:dm_channel2) { Fabricate(:direct_message) }
fab!(:direct_message_channel1) { Fabricate(:direct_message_channel, chatable: dm_channel1) }
fab!(:direct_message_channel2) { Fabricate(:direct_message_channel, chatable: dm_channel2) }
fab!(:user1) { Fabricate(:user) }
fab!(:user2) { Fabricate(:user) }
@ -124,7 +124,7 @@ describe Chat::ChatChannelFetcher do
end
it "returns all the channels if the user is a member of the DM channel also" do
DirectMessageUser.create!(user: user1, direct_message_channel: dm_channel1)
DirectMessageUser.create!(user: user1, direct_message: dm_channel1)
expect(subject.all_secured_channel_ids(guardian)).to match_array(
[category_channel.id, direct_message_channel1.id],
)
@ -285,16 +285,16 @@ describe Chat::ChatChannelFetcher do
user: user1,
following: true,
)
DirectMessageUser.create!(direct_message_channel: dm_channel1, user: user1)
DirectMessageUser.create!(direct_message_channel: dm_channel1, user: user2)
DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
Fabricate(
:user_chat_channel_membership_for_dm,
chat_channel: direct_message_channel2,
user: user1,
following: true,
)
DirectMessageUser.create!(direct_message_channel: dm_channel2, user: user1)
DirectMessageUser.create!(direct_message_channel: dm_channel2, user: user2)
DirectMessageUser.create!(direct_message: dm_channel2, user: user1)
DirectMessageUser.create!(direct_message: dm_channel2, user: user2)
direct_message_channel1.update!(last_message_sent_at: 1.day.ago)
direct_message_channel2.update!(last_message_sent_at: 1.hour.ago)
@ -311,7 +311,7 @@ describe Chat::ChatChannelFetcher do
user: user1,
following: true,
)
DirectMessageUser.create!(direct_message_channel: dm_channel1, user: user2)
DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
expect(
subject.secured_direct_message_channels(user1.id, memberships, guardian).map(&:id),
@ -326,8 +326,8 @@ describe Chat::ChatChannelFetcher do
user: user1,
following: true,
)
DirectMessageUser.create!(direct_message_channel: dm_channel1, user: user1)
DirectMessageUser.create!(direct_message_channel: dm_channel1, user: user2)
DirectMessageUser.create!(direct_message: dm_channel1, user: user1)
DirectMessageUser.create!(direct_message: dm_channel1, user: user2)
Fabricate(:chat_message, user: user2, chat_channel: direct_message_channel1)
Fabricate(:chat_message, user: user2, chat_channel: direct_message_channel1)