mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from GHSA-qmf4-7w7j-vf23 (#8059)

Browse source 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
This commit is contained in:
David Baker 2022-03-15 14:14:25 +00:00 committed by GitHub
parent 4d6643c7b8
commit 7ca7aa1303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/ThreadPanel.tsx
View file

@ -318,7 +318,7 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
manageReadMarkers={false} // No RM support in thread's MVP manageReadMarkers={false} // No RM support in thread's MVP
sendReadReceiptOnLoad={false} // No RR support in thread's MVP sendReadReceiptOnLoad={false} // No RR support in thread's MVP
timelineSet={timelineSet} timelineSet={timelineSet}
showUrlPreview={true} showUrlPreview={false} // No URL previews at the threads list level
empty={<EmptyThread empty={<EmptyThread
filterOption={filterOption} filterOption={filterOption}
showAllThreadsCallback={() => setFilterOption(ThreadFilterType.All)} showAllThreadsCallback={() => setFilterOption(ThreadFilterType.All)}

2
src/components/structures/ThreadView.tsx
View file

@ -351,7 +351,7 @@ export default class ThreadView extends React.Component<IProps, IState> {
manageReadMarkers={true} manageReadMarkers={true}
sendReadReceiptOnLoad={true} sendReadReceiptOnLoad={true}
timelineSet={this.state?.thread?.timelineSet} timelineSet={this.state?.thread?.timelineSet}
showUrlPreview={true} showUrlPreview={this.context.showUrlPreview}
// ThreadView doesn't support IRC layout at this time // ThreadView doesn't support IRC layout at this time
layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group} layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
hideThreadedMessages={false} hideThreadedMessages={false}

2
src/components/views/right_panel/TimelineCard.tsx
View file

@ -248,7 +248,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
manageReadMarkers={false} // No RM support in the TimelineCard manageReadMarkers={false} // No RM support in the TimelineCard
sendReadReceiptOnLoad={true} sendReadReceiptOnLoad={true}
timelineSet={this.props.timelineSet} timelineSet={this.props.timelineSet}
showUrlPreview={true} showUrlPreview={this.context.showUrlPreview}
// The right panel timeline (and therefore threads) don't support IRC layout at this time // The right panel timeline (and therefore threads) don't support IRC layout at this time
layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group} layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
hideThreadedMessages={false} hideThreadedMessages={false}

1
src/contexts/RoomContext.ts
View file

@ -60,6 +60,7 @@ const RoomContext = createContext<IRoomState>({
showAvatarChanges: true, showAvatarChanges: true,
showDisplaynameChanges: true, showDisplaynameChanges: true,
matrixClientIsReady: false, matrixClientIsReady: false,
showUrlPreview: false,
timelineRenderingType: TimelineRenderingType.Room, timelineRenderingType: TimelineRenderingType.Room,
threadId: undefined, threadId: undefined,
liveTimeline: undefined, liveTimeline: undefined,