mirror of https://github.com/mastodon/mastodon
Remove web UI warnings about OStatus privacy (#5102)
* Remove web UI warnings about OStatus privacy * yarn run manage:translationspull/5125/head
Eugen Rochko
8 years ago
committed by
GitHub
parent
db3ed498b0
commit
e648ef0bfb
@ -1,51 +1,23 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import Warning from '../components/warning';
|
import Warning from '../components/warning';
|
||||||
import { createSelector } from 'reselect';
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import { OrderedSet } from 'immutable';
|
|
||||||
|
|
||||||
const getMentionedUsernames = createSelector(state => state.getIn(['compose', 'text']), text => text.match(/(?:^|[^\/\w])@([a-z0-9_]+@[a-z0-9\.\-]+)/ig));
|
const mapStateToProps = state => ({
|
||||||
|
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', state.getIn(['meta', 'me']), 'locked']),
|
||||||
const getMentionedDomains = createSelector(getMentionedUsernames, mentionedUsernamesWithDomains => {
|
|
||||||
return OrderedSet(mentionedUsernamesWithDomains !== null ? mentionedUsernamesWithDomains.map(item => item.split('@')[2]) : []);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const mapStateToProps = state => {
|
const WarningWrapper = ({ needsLockWarning }) => {
|
||||||
const mentionedUsernames = getMentionedUsernames(state);
|
|
||||||
const mentionedUsernamesWithDomains = getMentionedDomains(state);
|
|
||||||
|
|
||||||
return {
|
|
||||||
needsLeakWarning: (state.getIn(['compose', 'privacy']) === 'private' || state.getIn(['compose', 'privacy']) === 'direct') && mentionedUsernames !== null,
|
|
||||||
mentionedDomains: mentionedUsernamesWithDomains,
|
|
||||||
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', state.getIn(['meta', 'me']), 'locked']),
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const WarningWrapper = ({ needsLeakWarning, needsLockWarning, mentionedDomains }) => {
|
|
||||||
if (needsLockWarning) {
|
if (needsLockWarning) {
|
||||||
return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href='/settings/profile'><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
|
return <Warning message={<FormattedMessage id='compose_form.lock_disclaimer' defaultMessage='Your account is not {locked}. Anyone can follow you to view your follower-only posts.' values={{ locked: <a href='/settings/profile'><FormattedMessage id='compose_form.lock_disclaimer.lock' defaultMessage='locked' /></a> }} />} />;
|
||||||
} else if (needsLeakWarning) {
|
|
||||||
return (
|
|
||||||
<Warning
|
|
||||||
message={<FormattedMessage
|
|
||||||
id='compose_form.privacy_disclaimer'
|
|
||||||
defaultMessage='Your private status will be delivered to mentioned users on {domains}. Do you trust {domainsCount, plural, one {that server} other {those servers}}? Post privacy only works on Mastodon instances. If {domains} {domainsCount, plural, one {is not a Mastodon instance} other {are not Mastodon instances}}, there will be no indication that your post is private, and it may be boosted or otherwise made visible to unintended recipients.'
|
|
||||||
values={{ domains: <strong>{mentionedDomains.join(', ')}</strong>, domainsCount: mentionedDomains.size }}
|
|
||||||
/>}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
};
|
};
|
||||||
|
|
||||||
WarningWrapper.propTypes = {
|
WarningWrapper.propTypes = {
|
||||||
needsLeakWarning: PropTypes.bool,
|
|
||||||
needsLockWarning: PropTypes.bool,
|
needsLockWarning: PropTypes.bool,
|
||||||
mentionedDomains: ImmutablePropTypes.orderedSet.isRequired,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export default connect(mapStateToProps)(WarningWrapper);
|
export default connect(mapStateToProps)(WarningWrapper);
|
||||||
|
|||||||
Loading…
Reference in New Issue