bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RemoteTimeline: only display filter message if the host isn't pinned

Browse source
This commit is contained in:
Alex Gleason 2021-08-11 20:15:26 -05:00
parent 4e2f12eb18
commit d2a4f433e2
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/soapbox/features/remote_timeline/index.js
View file

@ -27,6 +27,7 @@ const mapStateToProps = (state, props) => {
onlyMedia, onlyMedia,
hasUnread: state.getIn(['timelines', `${timelineId}${onlyMedia ? ':media' : ''}:${instance}`, 'unread']) > 0, hasUnread: state.getIn(['timelines', `${timelineId}${onlyMedia ? ':media' : ''}:${instance}`, 'unread']) > 0,
instance, instance,
pinned: settings.getIn(['remote_timeline', 'pinnedHosts']).includes(instance),
}; };
}; };
@ -45,6 +46,7 @@ class RemoteTimeline extends React.PureComponent {
onlyMedia: PropTypes.bool, onlyMedia: PropTypes.bool,
timelineId: PropTypes.string, timelineId: PropTypes.string,
instance: PropTypes.string.isRequired, instance: PropTypes.string.isRequired,
pinned: PropTypes.bool,
}; };
componentDidMount() { componentDidMount() {
@ -80,20 +82,20 @@ class RemoteTimeline extends React.PureComponent {
} }
render() { render() {
const { intl, hasUnread, onlyMedia, timelineId, instance } = this.props; const { intl, hasUnread, onlyMedia, timelineId, instance, pinned } = this.props;
return ( return (
<Column label={intl.formatMessage(messages.title)}> <Column label={intl.formatMessage(messages.title)}>
<HomeColumnHeader activeItem='fediverse' active={hasUnread} /> <HomeColumnHeader activeItem='fediverse' active={hasUnread} />
<PinnedHostsPicker host={instance} /> <PinnedHostsPicker host={instance} />
<div className='timeline-filter-message'> {!pinned && <div className='timeline-filter-message'>
<IconButton icon='close' onClick={this.handleCloseClick} /> <IconButton icon='close' onClick={this.handleCloseClick} />
<FormattedMessage <FormattedMessage
id='remote_timeline.filter_message' id='remote_timeline.filter_message'
defaultMessage='You are viewing the timeline of {instance}.' defaultMessage='You are viewing the timeline of {instance}.'
values={{ instance }} values={{ instance }}
/> />
</div> </div>}
<StatusListContainer <StatusListContainer
scrollKey={`${timelineId}_${instance}_timeline`} scrollKey={`${timelineId}_${instance}_timeline`}
timelineId={`${timelineId}${onlyMedia ? ':media' : ''}:${instance}`} timelineId={`${timelineId}${onlyMedia ? ':media' : ''}:${instance}`}