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

DEV: Remove chat_channel_id from chat-live-pane details (#20302)

Browse Source 
This is unnecessary indirection, we can just have the
chat_channel_id in the message serializer and use that.
This commit is contained in:
Martin Brennan
2023-02-15 17:27:09 +10:00
committed by GitHub
parent f19044af6a
commit c65cdc0779
8 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,8 +402,6 @@ export default Component.extend({
this.setProperties({
messages: this._prepareMessages(messages),
details: {
chat_channel_id: this.chatChannel.id,
chatable_type: this.chatChannel.chatable_type,
can_delete_self: meta.can_delete_self,
can_delete_others: meta.can_delete_others,
can_flag: meta.can_flag,

2
plugins/chat/assets/javascripts/discourse/components/chat-message-info.hbs
View File

@ -25,7 +25,7 @@
{{/if}}
<span class="chat-message-info__date">
{{format-chat-date @message @details}}
{{format-chat-date @message}}
</span>
{{#if @message.bookmark}}

2
plugins/chat/assets/javascripts/discourse/components/chat-message-left-gutter.hbs
View File

@ -13,7 +13,7 @@
</div>
{{else}}
<span class="chat-message-left-gutter__date">
{{format-chat-date @message @details "tiny"}}
{{format-chat-date @message "tiny"}}
</span>
{{/if}}
{{#if @message.bookmark}}

4
plugins/chat/assets/javascripts/discourse/components/chat-message.hbs
View File

@ -115,14 +115,14 @@
{{/if}}
{{#if this.hideUserInfo}}
<ChatMessageLeftGutter @message={{@message}} @details={{@details}} />
<ChatMessageLeftGutter @message={{@message}} />
{{else}}
<ChatMessageAvatar @message={{@message}} />
{{/if}}
<div class="chat-message-content">
{{#unless this.hideUserInfo}}
<ChatMessageInfo @message={{@message}} @details={{@details}} />
<ChatMessageInfo @message={{@message}} />
{{/unless}}
<ChatMessageText

12
plugins/chat/assets/javascripts/discourse/components/chat-message.js
View File

@ -458,7 +458,7 @@ export default class ChatMessage extends Component {
inviteMentioned() {
const userIds = this.mentionWarning.without_membership.mapBy("id");
ajax(`/chat/${this.args.details.chat_channel_id}/invite`, {
ajax(`/chat/${this.args.message.chat_channel_id}/invite`, {
method: "PUT",
data: { user_ids: userIds, chat_message_id: this.args.message.id },
}).then(() => {
@ -607,7 +607,7 @@ export default class ChatMessage extends Component {
_publishReaction(emoji, reactAction) {
return ajax(
`/chat/${this.args.details.chat_channel_id}/react/${this.args.message.id}`,
`/chat/${this.args.message.chat_channel_id}/react/${this.args.message.id}`,
{
type: "PUT",
data: {
@ -686,7 +686,7 @@ export default class ChatMessage extends Component {
@action
restore() {
return ajax(
`/chat/${this.args.details.chat_channel_id}/restore/${this.args.message.id}`,
`/chat/${this.args.message.chat_channel_id}/restore/${this.args.message.id}`,
{
type: "PUT",
}
@ -730,7 +730,7 @@ export default class ChatMessage extends Component {
@action
rebakeMessage() {
return ajax(
`/chat/${this.args.details.chat_channel_id}/${this.args.message.id}/rebake`,
`/chat/${this.args.message.chat_channel_id}/${this.args.message.id}/rebake`,
{
type: "PUT",
}
@ -740,7 +740,7 @@ export default class ChatMessage extends Component {
@action
deleteMessage() {
return ajax(
`/chat/${this.args.details.chat_channel_id}/${this.args.message.id}`,
`/chat/${this.args.message.chat_channel_id}/${this.args.message.id}`,
{
type: "DELETE",
}
@ -775,7 +775,7 @@ export default class ChatMessage extends Component {
const { protocol, host } = window.location;
let url = getURL(
`/chat/c/-/${this.args.details.chat_channel_id}/${this.args.message.id}`
`/chat/c/-/${this.args.message.chat_channel_id}/${this.args.message.id}`
);
url = url.indexOf("/") === 0 ? protocol + "//" + host + url : url;
clipboardCopy(url);

22
plugins/chat/assets/javascripts/discourse/helpers/format-chat-date.js
View File

@ -4,22 +4,14 @@ import getURL from "discourse-common/lib/get-url";
import I18n from "I18n";
import User from "discourse/models/user";
registerUnbound("format-chat-date", function (message, details, mode) {
let currentUser = User.current();
registerUnbound("format-chat-date", function (message, mode) {
const currentUser = User.current();
const tz = currentUser ? currentUser.user_option.timezone : moment.tz.guess();
const date = moment(new Date(message.created_at), tz);
const url = getURL(`/chat/c/-/${message.chat_channel_id}/${message.id}`);
const title = date.format(I18n.t("dates.long_with_year"));
let tz = currentUser ? currentUser.user_option.timezone : moment.tz.guess();
let date = moment(new Date(message.created_at), tz);
let url = "";
if (details) {
url = getURL(`/chat/c/-/${details.chat_channel_id}/${message.id}`);
}
let title = date.format(I18n.t("dates.long_with_year"));
let display =
const display =
mode === "tiny"
? date.format(I18n.t("chat.dates.time_tiny"))
: date.format(I18n.t("dates.time"));