-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove threads buttons * Add patch name to deactivate threads in patches.json and hide a new occurrence of thread in MessageActionBar * Test: fix bug-web file * Fix enhancement.yml indent --------- Co-authored-by: Audrey Lambert <audrey.lambert.42@gmail.com>
- Loading branch information
Showing
4 changed files
with
124 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
patches/remove-thread-buttons/matrix-react-sdk+3.68.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| diff --git a/node_modules/matrix-react-sdk/src/components/views/context_menus/MessageContextMenu.tsx b/node_modules/matrix-react-sdk/src/components/views/context_menus/MessageContextMenu.tsx | ||
| index ad56409..f9591dc 100644 | ||
| --- a/node_modules/matrix-react-sdk/src/components/views/context_menus/MessageContextMenu.tsx | ||
| +++ b/node_modules/matrix-react-sdk/src/components/views/context_menus/MessageContextMenu.tsx | ||
| @@ -678,7 +678,9 @@ export default class MessageContextMenu extends React.Component<IProps, IState> | ||
| <IconizedContextMenuOptionList> | ||
| {reactButton} | ||
| {replyButton} | ||
| + {/* :TCHAP: Remove Reply In Thread Button | ||
| {replyInThreadButton} | ||
| + end :TCHAP: */} | ||
| {editButton} | ||
| </IconizedContextMenuOptionList> | ||
| ); | ||
| diff --git a/node_modules/matrix-react-sdk/src/components/views/messages/MessageActionBar.tsx b/node_modules/matrix-react-sdk/src/components/views/messages/MessageActionBar.tsx | ||
| index 1a7d773..4e8f18f 100644 | ||
| --- a/node_modules/matrix-react-sdk/src/components/views/messages/MessageActionBar.tsx | ||
| +++ b/node_modules/matrix-react-sdk/src/components/views/messages/MessageActionBar.tsx | ||
| @@ -367,18 +367,21 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction | ||
| private readonly forbiddenThreadHeadMsgType = [MsgType.KeyVerificationRequest]; | ||
|
|
||
| private get showReplyInThreadAction(): boolean { | ||
| - const inNotThreadTimeline = this.context.timelineRenderingType !== TimelineRenderingType.Thread; | ||
| - | ||
| - const isAllowedMessageType = | ||
| - !this.forbiddenThreadHeadMsgType.includes(this.props.mxEvent.getContent().msgtype as MsgType) && | ||
| - /** forbid threads from live location shares | ||
| - * until cross-platform support | ||
| - * (PSF-1041) | ||
| - */ | ||
| - !M_BEACON_INFO.matches(this.props.mxEvent.getType()) && | ||
| - !(this.props.mxEvent.getType() === VoiceBroadcastInfoEventType); | ||
| - | ||
| - return inNotThreadTimeline && isAllowedMessageType; | ||
| + // :TCHAP: hide thread button | ||
| + return false; | ||
| + // const inNotThreadTimeline = this.context.timelineRenderingType !== TimelineRenderingType.Thread; | ||
| + | ||
| + // const isAllowedMessageType = | ||
| + // !this.forbiddenThreadHeadMsgType.includes(this.props.mxEvent.getContent().msgtype as MsgType) && | ||
| + // /** forbid threads from live location shares | ||
| + // * until cross-platform support | ||
| + // * (PSF-1041) | ||
| + // */ | ||
| + // !M_BEACON_INFO.matches(this.props.mxEvent.getType()) && | ||
| + // !(this.props.mxEvent.getType() === VoiceBroadcastInfoEventType); | ||
| + | ||
| + // return inNotThreadTimeline && isAllowedMessageType; | ||
| + // end :TCHAP | ||
| } | ||
|
|
||
| /** | ||
| diff --git a/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomHeaderButtons.tsx b/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomHeaderButtons.tsx | ||
| index 4d7e873..1a6e2f6 100644 | ||
| --- a/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomHeaderButtons.tsx | ||
| +++ b/node_modules/matrix-react-sdk/src/components/views/right_panel/RoomHeaderButtons.tsx | ||
| @@ -292,6 +292,7 @@ export default class RoomHeaderButtons extends HeaderButtons<IProps> { | ||
| onClick={this.onTimelineCardClicked} | ||
| />, | ||
| ); | ||
| + /* :TCHAP: Remove Thread from Header Buttons | ||
| rightPanelPhaseButtons.set( | ||
| RightPanelPhases.ThreadPanel, | ||
| <HeaderButton | ||
| @@ -306,6 +307,7 @@ export default class RoomHeaderButtons extends HeaderButtons<IProps> { | ||
| <UnreadIndicator color={this.state.threadNotificationColor} /> | ||
| </HeaderButton>, | ||
| ); | ||
| + end :TCHAP: */ | ||
| rightPanelPhaseButtons.set( | ||
| RightPanelPhases.NotificationPanel, | ||
| <HeaderButton |