IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: refactor calls to message.cook when sending messages (#21934)

Browse Source 
When editing a message, we call `message.cook()` in the beginning of 
`#sendEditMessage` methods, but when sending a new message, 
the call to `message.cook()` is hidden in the `stageMessage` method.

We can just call `message.cook()` before sending the message, no matter 
whether this is a new message or an edited message.
This commit is contained in:
Andrei Prigorshnev 2023-06-08 18:21:22 +04:00 committed by GitHub
parent 9cbbcdef50
commit c0d3cded73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/chat/assets/javascripts/discourse/components/chat-channel.js
View File

@ -647,6 +647,7 @@ export default class ChatLivePane extends Component {
@action @action
async onSendMessage(message) { async onSendMessage(message) {
await message.cook();
if (message.editing) { if (message.editing) {
await this.#sendEditMessage(message); await this.#sendEditMessage(message);
} else { } else {
@ -660,7 +661,6 @@ export default class ChatLivePane extends Component {
} }
async #sendEditMessage(message) { async #sendEditMessage(message) {
await message.cook();
this.pane.sending = true; this.pane.sending = true;
const data = { const data = {

2
plugins/chat/assets/javascripts/discourse/components/chat-thread.js
View File

@ -228,6 +228,7 @@ export default class ChatThreadPanel extends Component {
async onSendMessage(message) { async onSendMessage(message) {
resetIdle(); resetIdle();
await message.cook();
if (message.editing) { if (message.editing) {
await this.#sendEditMessage(message); await this.#sendEditMessage(message);
} else { } else {
@ -281,7 +282,6 @@ export default class ChatThreadPanel extends Component {
} }
async #sendEditMessage(message) { async #sendEditMessage(message) {
await message.cook();
this.chatThreadPane.sending = true; this.chatThreadPane.sending = true;
const data = { const data = {

1
plugins/chat/assets/javascripts/discourse/models/chat-channel.js
View File

@ -292,7 +292,6 @@ export default class ChatChannel {
message.draft = false; message.draft = false;
message.createdAt ??= moment.utc().format(); message.createdAt ??= moment.utc().format();
message.channel = this; message.channel = this;
await message.cook();
if (message.inReplyTo) { if (message.inReplyTo) {
if (!this.threadingEnabled) { if (!this.threadingEnabled) {

1
plugins/chat/assets/javascripts/discourse/models/chat-thread.js
View File

@ -69,7 +69,6 @@ export default class ChatThread {
message.draft = false; message.draft = false;
message.createdAt ??= moment.utc().format(); message.createdAt ??= moment.utc().format();
message.thread = this; message.thread = this;
await message.cook();
this.messagesManager.addMessages([message]); this.messagesManager.addMessages([message]);
} }