github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 20:51:08 +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

2
plugins/chat/app/controllers/chat_channels_controller.rb
View File

@ -129,7 +129,7 @@ class Chat::ChatChannelsController < Chat::ChatBaseController
if users.count > 0
ChatChannel
.includes(chatable: :users)
.joins(direct_message_channel: :direct_message_users)
.joins(direct_message: :direct_message_users)
.group(1)
.having(
"ARRAY[?] <@ ARRAY_AGG(user_id) AND ARRAY[?] && ARRAY_AGG(user_id)",

10
plugins/chat/app/controllers/direct_messages_controller.rb
View File

@ -25,13 +25,9 @@ class Chat::DirectMessagesController < Chat::ChatBaseController
guardian.ensure_can_chat!(current_user)
users = users_from_usernames(current_user, params)
direct_message_channel = DirectMessageChannel.for_user_ids(users.map(&:id).uniq)
if direct_message_channel
chat_channel =
ChatChannel.find_by(
chatable_id: direct_message_channel.id,
chatable_type: "DirectMessageChannel",
)
direct_message = DirectMessage.for_user_ids(users.map(&:id).uniq)
if direct_message
chat_channel = ChatChannel.find_by(chatable: direct_message)
render_serialized(
chat_channel,
ChatChannelSerializer,