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

FIX: dont allow channel non-members to write messages in threads (#31697)

Browse Source 
Prevents channel non-members from seeing the composer in threads. Since
they do not have the correct permissions to post within the channel, we
should show the join channel CTA in place of the chat composer.
This commit is contained in:
David Battersby
2025-03-07 15:50:30 +04:00
committed by GitHub
parent 5bab18e3ea
commit 914543dbb9
4 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/us
import ChatComposerThread from "./chat/composer/thread";
import ChatScrollToBottomArrow from "./chat/scroll-to-bottom-arrow";
import ChatSelectionManager from "./chat/selection-manager";
import ChatChannelPreviewCard from "./chat-channel-preview-card";
import Message from "./chat-message";
import ChatMessagesContainer from "./chat-messages-container";
import ChatMessagesScroller from "./chat-messages-scroller";
@ -71,6 +72,11 @@ export default class ChatThread extends Component {
return this.args.thread.messagesManager;
}
get showChannelPreview() {
const channel = this.args.thread.channel;
return channel?.isCategoryChannel && !channel?.isFollowing;
}
@action
handleKeydown(event) {
if (event.key === "Escape") {
@ -582,13 +588,17 @@ export default class ChatThread extends Component {
@messagesManager={{this.messagesManager}}
/>
{{else}}
<ChatComposerThread
@channel={{@channel}}
@thread={{@thread}}
@onSendMessage={{this.onSendMessage}}
@uploadDropZone={{this.uploadDropZone}}
@scroller={{this.scroller}}
/>
{{#if this.showChannelPreview}}
<ChatChannelPreviewCard @channel={{@thread.channel}} />
{{else}}
<ChatComposerThread
@channel={{@channel}}
@thread={{@thread}}
@onSendMessage={{this.onSendMessage}}
@uploadDropZone={{this.uploadDropZone}}
@scroller={{this.scroller}}
/>
{{/if}}
{{/if}}
<ChatUploadDropZone @model={{@thread}} />