Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: hide chat button in user card (#29887) 

when the user isn't able to receive DMs (either because they've disabled it or because they're suspended for example).

Internal ref - t/142198
This commit is contained in:
Régis Hanol 2024-11-22 09:05:58 +01:00 committed by GitHub
parent 5bf5d13356
commit d71016522e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/lib/fabricators.js
View File

@ -82,6 +82,8 @@ export default class CoreFabricators {
name: args.name, name: args.name,
avatar_template: "/letter_avatar_proxy/v3/letter/t/41988e/{size}.png", avatar_template: "/letter_avatar_proxy/v3/letter/t/41988e/{size}.png",
suspended_till: args.suspended_till, suspended_till: args.suspended_till,
can_send_private_message_to_user:
args.can_send_private_message_to_user ?? true,
}); });
} }

5
plugins/chat/assets/javascripts/discourse/components/chat/direct-message-button.gjs
View File

@ -10,7 +10,10 @@ export default class ChatDirectMessageButton extends Component {
@service router; @service router;
get shouldRender() { get shouldRender() {
return this.chat.userCanDirectMessage && !this.args.user.suspended; return (
this.chat.userCanDirectMessage &&
this.args.user.can_send_private_message_to_user
);
} }
@action @action

4
plugins/chat/test/javascripts/components/chat-user-card-button-test.js
View File

@ -39,13 +39,13 @@ module(
.doesNotExist("it doesn’t show the chat button"); .doesNotExist("it doesn’t show the chat button");
}); });
test("when displayed user is suspended", async function (assert) { test("when displayed user has disabled PMs / DMs", async function (assert) {
sinon sinon
.stub(this.owner.lookup("service:chat"), "userCanDirectMessage") .stub(this.owner.lookup("service:chat"), "userCanDirectMessage")
.value(true); .value(true);
this.user = new CoreFabricators(getOwner(this)).user({ this.user = new CoreFabricators(getOwner(this)).user({
suspended_till: moment().add(1, "year").toDate(), can_send_private_message_to_user: false,
}); });
await render( await render(