github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 13:51:09 +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/test/javascripts/acceptance/chat-sidebar-user-status-test.js
View File

@ -32,7 +32,7 @@ acceptance("Discourse Chat - Sidebar - User Status", function (needs) {
},
],
},
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
title: "@user1",
};

4
plugins/chat/test/javascripts/acceptance/chat-test.js
View File

@ -95,7 +95,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
chat_channels: [],
chatable: { users: [hawkAsJson] },
chatable_id: 16,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 75,
title: "@hawk",
@ -116,7 +116,7 @@ acceptance("Discourse Chat - without unread", function (needs) {
chat_channel: {
id: 75,
title: "hawk",
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
last_message_sent_at: "2021-07-20T08:14:16.950Z",
chatable: {
users: [{ username: "hawk" }],

6
plugins/chat/test/javascripts/acceptance/core-sidebar-test.js
View File

@ -51,7 +51,7 @@ acceptance("Discourse Chat - Core Sidebar", function (needs) {
],
},
chatable_id: 59,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 76,
title: "@sam",
@ -79,7 +79,7 @@ acceptance("Discourse Chat - Core Sidebar", function (needs) {
},
],
},
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 77,
title: "@<script>sam</script>",
@ -177,7 +177,7 @@ acceptance("Discourse Chat - Core Sidebar", function (needs) {
chat_channel: {
id: 75,
title: "hawk",
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
last_message_sent_at: "2021-07-20T08:14:16.950Z",
chatable: {
users: [{ username: "hawk" }],

2
plugins/chat/test/javascripts/acceptance/user-card-chat-test.js
View File

@ -51,7 +51,7 @@ acceptance("Discourse Chat - User card test", function (needs) {
],
},
chatable_id: 16,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 75,
title: "@hawk",

4
plugins/chat/test/javascripts/chat-fixtures.js
View File

@ -22,7 +22,7 @@ export const directMessageChannels = [
],
},
chatable_id: 58,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 75,
title: "@hawk",
@ -53,7 +53,7 @@ export const directMessageChannels = [
],
},
chatable_id: 59,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable_url: null,
id: 76,
title: "@eviltrout, @markvanlan",

4
plugins/chat/test/javascripts/components/chat-channel-leave-btn-test.js
View File

@ -19,7 +19,7 @@ module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
this.set("onLeaveChannel", () => this.set("foo", 2));
this.set("channel", {
id: 1,
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable: {
users: [{ id: 1 }],
},
@ -42,7 +42,7 @@ module("Discourse Chat | Component | chat-channel-leave-btn", function (hooks) {
template: hbs`{{chat-channel-leave-btn channel=channel}}`,
beforeEach() {
this.set("channel", { chatable_type: "DirectMessageChannel" });
this.set("channel", { chatable_type: "DirectMessage" });
},
async test(assert) {

4
plugins/chat/test/javascripts/components/chat-composer-placeholder-test.js
View File

@ -20,7 +20,7 @@ module(
this.set(
"chatChannel",
ChatChannel.create({
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable: {
users: [{ id: 1 }],
},
@ -43,7 +43,7 @@ module(
this.set(
"chatChannel",
ChatChannel.create({
chatable_type: "DirectMessageChannel",
chatable_type: "DirectMessage",
chatable: {
users: [
{ name: "Tomtom" },

4
plugins/chat/test/javascripts/components/chat-retention-reminder-test.js
View File

@ -59,7 +59,7 @@ module(
async beforeEach() {
this.set(
"chatChannel",
ChatChannel.create({ chatable_type: "DirectMessageChannel" })
ChatChannel.create({ chatable_type: "DirectMessage" })
);
set(this.currentUser, "needs_dm_retention_reminder", true);
this.siteSettings.chat_dm_retention_days = 100;
@ -79,7 +79,7 @@ module(
async beforeEach() {
this.set(
"chatChannel",
ChatChannel.create({ chatable_type: "DirectMessageChannel" })
ChatChannel.create({ chatable_type: "DirectMessage" })
);
set(this.currentUser, "needs_dm_retention_reminder", false);
this.siteSettings.chat_dm_retention_days = 100;