parent
64845b1c6e
commit
1794e5a72d
@ -0,0 +1,36 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
|
import { injectIntl, FormattedMessage } from 'react-intl';
|
||||||
|
import SettingToggle from '../../notifications/components/setting_toggle';
|
||||||
|
|
||||||
|
export default @injectIntl
|
||||||
|
class ColumnSettings extends React.PureComponent {
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
settings: ImmutablePropTypes.map.isRequired,
|
||||||
|
onChange: PropTypes.func.isRequired,
|
||||||
|
intl: PropTypes.object.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { settings, onChange } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div>
|
||||||
|
<div className='column-settings__row'>
|
||||||
|
<SettingToggle prefix='public_timeline' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show reposts' />} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className='column-settings__row'>
|
||||||
|
<SettingToggle prefix='public_timeline' settings={settings} settingPath={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className='column-settings__row'>
|
||||||
|
<SettingToggle settings={settings} settingPath={['other', 'onlyMedia']} onChange={onChange} label={<FormattedMessage id='community.column_settings.media_only' defaultMessage='Media Only' />} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
import { connect } from 'react-redux';
|
||||||
|
import ColumnSettings from '../components/column_settings';
|
||||||
|
import { getSettings, changeSetting } from '../../../actions/settings';
|
||||||
|
|
||||||
|
const mapStateToProps = state => ({
|
||||||
|
settings: getSettings(state).get('public'),
|
||||||
|
});
|
||||||
|
|
||||||
|
const mapDispatchToProps = (dispatch) => {
|
||||||
|
return {
|
||||||
|
onChange(key, checked) {
|
||||||
|
dispatch(changeSetting(['public', ...key], checked));
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
|
@ -0,0 +1,101 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import StatusListContainer from '../ui/containers/status_list_container';
|
||||||
|
import Column from '../../components/column';
|
||||||
|
import ColumnSettingsContainer from './containers/column_settings_container';
|
||||||
|
import HomeColumnHeader from '../../components/home_column_header';
|
||||||
|
import { expandRemoteTimeline } from '../../actions/timelines';
|
||||||
|
import { connectRemoteStream } from '../../actions/streaming';
|
||||||
|
import { getSettings } from 'soapbox/actions/settings';
|
||||||
|
|
||||||
|
const messages = defineMessages({
|
||||||
|
title: { id: 'column.remote', defaultMessage: 'Federated timeline' },
|
||||||
|
});
|
||||||
|
|
||||||
|
const mapStateToProps = (state, props) => {
|
||||||
|
const instance = props.params.instance;
|
||||||
|
const settings = getSettings(state);
|
||||||
|
const onlyMedia = settings.getIn(['remote', 'other', 'onlyMedia']);
|
||||||
|
|
||||||
|
const timelineId = 'remote';
|
||||||
|
|
||||||
|
return {
|
||||||
|
timelineId,
|
||||||
|
onlyMedia,
|
||||||
|
hasUnread: state.getIn(['timelines', `${timelineId}${onlyMedia ? ':media' : ''}:${instance}`, 'unread']) > 0,
|
||||||
|
instance,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default @connect(mapStateToProps)
|
||||||
|
@injectIntl
|
||||||
|
class RemoteTimeline extends React.PureComponent {
|
||||||
|
|
||||||
|
static contextTypes = {
|
||||||
|
router: PropTypes.object,
|
||||||
|
};
|
||||||
|
|
||||||
|
static propTypes = {
|
||||||
|
dispatch: PropTypes.func.isRequired,
|
||||||
|
intl: PropTypes.object.isRequired,
|
||||||
|
hasUnread: PropTypes.bool,
|
||||||
|
onlyMedia: PropTypes.bool,
|
||||||
|
timelineId: PropTypes.string,
|
||||||
|
instance: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
componentDidMount() {
|
||||||
|
const { dispatch, onlyMedia, instance } = this.props;
|
||||||
|
dispatch(expandRemoteTimeline(instance, { onlyMedia }));
|
||||||
|
this.disconnect = dispatch(connectRemoteStream(instance, { onlyMedia }));
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidUpdate(prevProps) {
|
||||||
|
if (prevProps.onlyMedia !== this.props.onlyMedia) {
|
||||||
|
const { dispatch, onlyMedia, instance } = this.props;
|
||||||
|
this.disconnect();
|
||||||
|
|
||||||
|
dispatch(expandRemoteTimeline(instance, { onlyMedia }));
|
||||||
|
this.disconnect = dispatch(connectRemoteStream(instance, { onlyMedia }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
if (this.disconnect) {
|
||||||
|
this.disconnect();
|
||||||
|
this.disconnect = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
handleLoadMore = maxId => {
|
||||||
|
const { dispatch, onlyMedia, instance } = this.props;
|
||||||
|
dispatch(expandRemoteTimeline(instance, { maxId, onlyMedia }));
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { intl, hasUnread, onlyMedia, timelineId, instance } = this.props;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Column label={intl.formatMessage(messages.title)}>
|
||||||
|
<HomeColumnHeader activeItem='fediverse' active={hasUnread} >
|
||||||
|
<ColumnSettingsContainer />
|
||||||
|
</HomeColumnHeader>
|
||||||
|
<StatusListContainer
|
||||||
|
scrollKey={`${timelineId}_${instance}_timeline`}
|
||||||
|
timelineId={`${timelineId}${onlyMedia ? ':media' : ''}:${instance}`}
|
||||||
|
onLoadMore={this.handleLoadMore}
|
||||||
|
emptyMessage={
|
||||||
|
<FormattedMessage
|
||||||
|
id='empty_column.remote'
|
||||||
|
defaultMessage='There is nothing here! Manually follow users from {instance} to fill it up'
|
||||||
|
values={{ instance }}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</Column>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in new issue