kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
InstanceInfoPanel: refactor to reuse InstanceRestrictions component
Alex Gleason
rodzic
4599d9e39f
commit
61a4bc90b8
|
|
@ -6,15 +6,8 @@ import PropTypes from 'prop-types';
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import Icon from 'soapbox/components/icon';
|
|
||||||
import { makeGetRemoteInstance } from 'soapbox/selectors';
|
import { makeGetRemoteInstance } from 'soapbox/selectors';
|
||||||
|
import InstanceRestrictions from 'soapbox/features/federation_restrictions/components/instance_restrictions';
|
||||||
const hasRestrictions = remoteInstance => {
|
|
||||||
return remoteInstance
|
|
||||||
.get('federation')
|
|
||||||
.deleteAll(['accept', 'reject_deletes', 'report_removal'])
|
|
||||||
.reduce((acc, value) => acc || value, false);
|
|
||||||
};
|
|
||||||
|
|
||||||
const getRemoteInstance = makeGetRemoteInstance();
|
const getRemoteInstance = makeGetRemoteInstance();
|
||||||
|
|
||||||
|
|
@ -35,144 +28,9 @@ class InstanceInfoPanel extends ImmutablePureComponent {
|
||||||
remoteInstance: ImmutablePropTypes.map,
|
remoteInstance: ImmutablePropTypes.map,
|
||||||
};
|
};
|
||||||
|
|
||||||
renderRestrictions = () => {
|
|
||||||
const { remoteInstance } = this.props;
|
|
||||||
const items = [];
|
|
||||||
|
|
||||||
const {
|
|
||||||
avatar_removal,
|
|
||||||
banner_removal,
|
|
||||||
federated_timeline_removal,
|
|
||||||
followers_only,
|
|
||||||
media_nsfw,
|
|
||||||
media_removal,
|
|
||||||
} = remoteInstance.get('federation').toJS();
|
|
||||||
|
|
||||||
const fullMediaRemoval = media_removal && avatar_removal && banner_removal;
|
|
||||||
const partialMediaRemoval = media_removal || avatar_removal || banner_removal;
|
|
||||||
|
|
||||||
if (followers_only) {
|
|
||||||
items.push((
|
|
||||||
<div className='federation-restriction' key='followers_only'>
|
|
||||||
<div className='federation-restriction__icon'>
|
|
||||||
<Icon id='lock' />
|
|
||||||
</div>
|
|
||||||
<div className='federation-restriction__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='federation_restriction.followers_only'
|
|
||||||
defaultMessage='Hidden except to followers'
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
} else if (federated_timeline_removal) {
|
|
||||||
items.push((
|
|
||||||
<div className='federation-restriction' key='federated_timeline_removal'>
|
|
||||||
<div className='federation-restriction__icon'>
|
|
||||||
<Icon id='unlock' />
|
|
||||||
</div>
|
|
||||||
<div className='federation-restriction__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='federation_restriction.federated_timeline_removal'
|
|
||||||
defaultMessage='Fediverse timeline removal'
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fullMediaRemoval) {
|
|
||||||
items.push((
|
|
||||||
<div className='federation-restriction' key='full_media_removal'>
|
|
||||||
<div className='federation-restriction__icon'>
|
|
||||||
<Icon id='photo' />
|
|
||||||
</div>
|
|
||||||
<div className='federation-restriction__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='federation_restriction.full_media_removal'
|
|
||||||
defaultMessage='Full media removal'
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
} else if (partialMediaRemoval) {
|
|
||||||
items.push((
|
|
||||||
<div className='federation-restriction' key='partial_media_removal'>
|
|
||||||
<div className='federation-restriction__icon'>
|
|
||||||
<Icon id='photo' />
|
|
||||||
</div>
|
|
||||||
<div className='federation-restriction__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='federation_restriction.partial_media_removal'
|
|
||||||
defaultMessage='Partial media removal'
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fullMediaRemoval && media_nsfw) {
|
|
||||||
items.push((
|
|
||||||
<div className='federation-restriction' key='media_nsfw'>
|
|
||||||
<div className='federation-restriction__icon'>
|
|
||||||
<Icon id='eye-slash' />
|
|
||||||
</div>
|
|
||||||
<div className='federation-restriction__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='federation_restriction.media_nsfw'
|
|
||||||
defaultMessage='Attachments marked NSFW'
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
return items;
|
|
||||||
}
|
|
||||||
|
|
||||||
renderContent = () => {
|
|
||||||
const { host, instance, remoteInstance } = this.props;
|
|
||||||
if (!instance || !remoteInstance) return null;
|
|
||||||
|
|
||||||
if (remoteInstance.getIn(['federation', 'reject']) === true) {
|
|
||||||
return (
|
|
||||||
<div className='instance-federation-panel__message'>
|
|
||||||
<Icon id='close' />
|
|
||||||
<FormattedMessage
|
|
||||||
id='remote_instance.federation_panel.restricted_message'
|
|
||||||
defaultMessage='{siteTitle} blocks all activities from {host}.'
|
|
||||||
values={{ host, siteTitle: instance.get('title') }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
} else if (hasRestrictions(remoteInstance)) {
|
|
||||||
return [
|
|
||||||
(
|
|
||||||
<div className='instance-federation-panel__message'>
|
|
||||||
<FormattedMessage
|
|
||||||
id='remote_instance.federation_panel.some_restrictions_message'
|
|
||||||
defaultMessage='{siteTitle} has placed some restrictions on {host}.'
|
|
||||||
values={{ host, siteTitle: instance.get('title') }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
),
|
|
||||||
this.renderRestrictions(),
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
return (
|
|
||||||
<div className='instance-federation-panel__message'>
|
|
||||||
<Icon id='check' />
|
|
||||||
<FormattedMessage
|
|
||||||
id='remote_instance.federation_panel.no_restrictions_message'
|
|
||||||
defaultMessage='{siteTitle} has placed no restrictions on {host}.'
|
|
||||||
values={{ host, siteTitle: instance.get('title') }}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
const { remoteInstance } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='wtf-panel instance-federation-panel'>
|
<div className='wtf-panel instance-federation-panel'>
|
||||||
<div className='wtf-panel-header'>
|
<div className='wtf-panel-header'>
|
||||||
|
|
@ -182,7 +40,7 @@ class InstanceInfoPanel extends ImmutablePureComponent {
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className='wtf-panel__content'>
|
<div className='wtf-panel__content'>
|
||||||
{this.renderContent()}
|
<InstanceRestrictions remoteInstance={remoteInstance} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,18 @@
|
||||||
.instance-federation-panel {
|
.instance-federation-panel {
|
||||||
&__message {
|
|
||||||
margin-bottom: 15px;
|
|
||||||
|
|
||||||
i.fa {
|
|
||||||
padding-right: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.wtf-panel__content {
|
.wtf-panel__content {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 15px;
|
padding: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.instance-restrictions {
|
||||||
|
&__message {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
|
||||||
|
i.fa {
|
||||||
|
padding-right: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.federation-restriction {
|
.federation-restriction {
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue