github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 09:08:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Use object spread instead of Object.assign (#30407)

Browse Source
This commit is contained in:
Jarek Radosz
2024-12-23 08:44:29 +01:00
committed by GitHub
parent 6f01584607
commit 0336235c74
9 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs
View File

@ -558,17 +558,13 @@ export default class ChatChannel extends Component {
}
try {
const params = {
await this.chatApi.sendMessage(this.args.channel.id, {
message: message.message,
in_reply_to_id: message.inReplyTo?.id,
staged_id: message.id,
upload_ids: message.uploads.map((upload) => upload.id),
};
await this.chatApi.sendMessage(
this.args.channel.id,
Object.assign({}, params, extractCurrentTopicInfo(this))
);
...extractCurrentTopicInfo(this),
});
if (!this.capabilities.isIOS) {
this.scrollToLatestMessage();

17
plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs
View File

@ -442,17 +442,16 @@ export default class ChatThread extends Component {
}
try {
const params = {
message: message.message,
in_reply_to_id: null,
staged_id: message.id,
upload_ids: message.uploads.map((upload) => upload.id),
thread_id: message.thread.id,
};
const response = await this.chatApi.sendMessage(
this.args.thread.channel.id,
Object.assign({}, params, extractCurrentTopicInfo(this))
{
message: message.message,
in_reply_to_id: null,
staged_id: message.id,
upload_ids: message.uploads.map((upload) => upload.id),
thread_id: message.thread.id,
...extractCurrentTopicInfo(this),
}
);
this.args.thread.currentUserMembership ??=

2
plugins/chat/assets/javascripts/discourse/lib/fabricators.js
View File

@ -81,7 +81,7 @@ export default class ChatFabricators {
status: args.status || CHANNEL_STATUSES.open,
slug:
chatable?.slug || chatable instanceof Category ? chatable.slug : null,
meta: Object.assign({ can_delete_self: true }, args.meta || {}),
meta: { can_delete_self: true, ...(args.meta || {}) },
archive_failed: args.archive_failed ?? false,
memberships_count: args.memberships_count ?? 0,
});