zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge 550ed2fbc7 into 65093c619f

This commit is contained in:
Lety Does Stuff 2024-04-26 18:07:07 +00:00 committed by GitHub
parent 65093c619f 550ed2fbc7
commit 11522e496a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/javascript/mastodon/features/compose/containers/warning_container.jsx
View File

@ -10,37 +10,33 @@ import { HASHTAG_PATTERN_REGEX } from 'mastodon/utils/hashtags';
import Warning from '../components/warning';
const mapStateToProps = state => ({
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
sensitiveAttachmentHint: state.getIn(['compose', 'spoiler']) !== false && state.getIn(['compose', 'media_attachments']).size > 0,
hashtagWarning: state.getIn(['compose', 'privacy']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
});
const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning }) => {
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> }} />} />;
}
if (hashtagWarning) {
return <Warning message={<FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag." />} />;
}
if (directMessageWarning) {
const WarningWrapper = ({ sensitiveAttachmentHint, hashtagWarning, needsLockWarning, directMessageWarning }) => {
if ( sensitiveAttachmentHint || hashtagWarning || needsLockWarning || directMessageWarning) {
const message = (
<span>
<FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a>
</span>
<>
{sensitiveAttachmentHint && <FormattedMessage id='compose_form.sensitive_attachment_hint' defaultMessage='Leave the content warning field empty to mark only the post attachments as sensitive.' />}
{hashtagWarning && <FormattedMessage id='compose_form.hashtag_warning' defaultMessage="This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag." />}
{needsLockWarning && <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> }} />}
{directMessageWarning && <span><FormattedMessage id='compose_form.encryption_warning' defaultMessage='Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.' /> <a href='/terms' target='_blank'><FormattedMessage id='compose_form.direct_message_warning_learn_more' defaultMessage='Learn more' /></a></span>}
</>
);
return <Warning message={message} />;
}
return null;
};
WarningWrapper.propTypes = {
needsLockWarning: PropTypes.bool,
sensitiveAttachmentHint: PropTypes.bool,
hashtagWarning: PropTypes.bool,
needsLockWarning: PropTypes.bool,
directMessageWarning: PropTypes.bool,
};
export default connect(mapStateToProps)(WarningWrapper);
export default connect(mapStateToProps)(WarningWrapper);

1
app/javascript/mastodon/locales/en.json
View File

@ -164,6 +164,7 @@
"compose_form.publish_form": "New post",
"compose_form.reply": "Reply",
"compose_form.save_changes": "Update",
"compose_form.sensitive_attachment_hint": "Leave the content warning field empty to mark only the post attachments as sensitive.",
"compose_form.spoiler.marked": "Remove content warning",
"compose_form.spoiler.unmarked": "Add content warning",
"compose_form.spoiler_placeholder": "Content warning (optional)",

8
app/javascript/styles/mastodon/components.scss
View File

@ -546,6 +546,14 @@ body > [data-popper-placement] {
text-decoration: none;
}
}
& > span {
display: block;
&:not(:first-child) {
margin-top: 0.5em;
}
}
}
.spoiler-input {