|
@@ -11,6 +11,7 @@ import ColumnBackButtonSlim from '../../components/column_back_button_slim';
|
|
|
import AccountAuthorizeContainer from './containers/account_authorize_container';
|
|
|
import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
|
|
|
import ScrollableList from '../../components/scrollable_list';
|
|
|
+import { me } from '../../initial_state';
|
|
|
|
|
|
const messages = defineMessages({
|
|
|
heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
|
|
@@ -19,6 +20,8 @@ const messages = defineMessages({
|
|
|
const mapStateToProps = state => ({
|
|
|
accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
|
|
|
hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
|
|
|
+ locked: !!state.getIn(['accounts', me, 'locked']),
|
|
|
+ domain: state.getIn(['meta', 'domain']),
|
|
|
});
|
|
|
|
|
|
export default @connect(mapStateToProps)
|
|
@@ -31,6 +34,8 @@ class FollowRequests extends ImmutablePureComponent {
|
|
|
shouldUpdateScroll: PropTypes.func,
|
|
|
hasMore: PropTypes.bool,
|
|
|
accountIds: ImmutablePropTypes.list,
|
|
|
+ locked: PropTypes.bool,
|
|
|
+ domain: PropTypes.string,
|
|
|
intl: PropTypes.object.isRequired,
|
|
|
multiColumn: PropTypes.bool,
|
|
|
};
|
|
@@ -44,7 +49,7 @@ class FollowRequests extends ImmutablePureComponent {
|
|
|
}, 300, { leading: true });
|
|
|
|
|
|
render () {
|
|
|
- const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn } = this.props;
|
|
|
+ const { intl, shouldUpdateScroll, accountIds, hasMore, multiColumn, locked, domain } = this.props;
|
|
|
|
|
|
if (!accountIds) {
|
|
|
return (
|
|
@@ -55,6 +60,15 @@ class FollowRequests extends ImmutablePureComponent {
|
|
|
}
|
|
|
|
|
|
const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
|
|
|
+ const unlockedPrependMessage = locked ? null : (
|
|
|
+ <div className='follow_requests-unlocked_explanation'>
|
|
|
+ <FormattedMessage
|
|
|
+ id='follow_requests.unlocked_explanation'
|
|
|
+ defaultMessage='Even though your account is not locked, the {domain} staff thought you might want to review follow requests from these accounts manually.'
|
|
|
+ values={{ domain: domain }}
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+ );
|
|
|
|
|
|
return (
|
|
|
<Column bindToDocument={!multiColumn} icon='user-plus' heading={intl.formatMessage(messages.heading)}>
|
|
@@ -66,6 +80,7 @@ class FollowRequests extends ImmutablePureComponent {
|
|
|
shouldUpdateScroll={shouldUpdateScroll}
|
|
|
emptyMessage={emptyMessage}
|
|
|
bindToDocument={!multiColumn}
|
|
|
+ prepend={unlockedPrependMessage}
|
|
|
>
|
|
|
{accountIds.map(id =>
|
|
|
<AccountAuthorizeContainer key={id} id={id} />,
|