Merge pull request from GHSA-qmf4-7w7j-vf23

Author: jryans

src/components/structures/ThreadPanel.tsx

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

src/components/structures/ThreadView.tsx

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

src/components/views/right_panel/TimelineCard.tsx

@@ -248,7 +248,7 @@ export default class TimelineCard extends React.Component<IProps, IState> {
  manageReadMarkers={false} // No RM support in the TimelineCard
  sendReadReceiptOnLoad={true}
  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
  layout={this.state.layout === Layout.Bubble ? Layout.Bubble : Layout.Group}
  hideThreadedMessages={false}

src/contexts/RoomContext.ts

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