mirror of
https://github.com/discourse/discourse.git
synced 2025-05-23 15:31:11 +08:00
DEV: Rename direct message related models
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:

committed by
Loïc Guitaut

parent
7e992cb299
commit
abcaa1a961
@ -7,13 +7,13 @@ module Chat::DirectMessageChannelCreator
|
||||
def self.create!(acting_user:, target_users:)
|
||||
Guardian.new(acting_user).ensure_can_create_direct_message!
|
||||
target_users.uniq!
|
||||
direct_messages_channel = DirectMessageChannel.for_user_ids(target_users.map(&:id))
|
||||
if direct_messages_channel
|
||||
chat_channel = ChatChannel.find_by!(chatable: direct_messages_channel)
|
||||
direct_message = DirectMessage.for_user_ids(target_users.map(&:id))
|
||||
if direct_message
|
||||
chat_channel = ChatChannel.find_by!(chatable: direct_message)
|
||||
else
|
||||
ensure_actor_can_communicate!(acting_user, target_users)
|
||||
direct_messages_channel = DirectMessageChannel.create!(user_ids: target_users.map(&:id))
|
||||
chat_channel = direct_messages_channel.create_chat_channel!
|
||||
direct_message = DirectMessage.create!(user_ids: target_users.map(&:id))
|
||||
chat_channel = direct_message.create_chat_channel!
|
||||
end
|
||||
|
||||
update_memberships(acting_user, target_users, chat_channel.id)
|
||||
|
Reference in New Issue
Block a user