balkan/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Add circle visibility

Browse source
This commit is contained in:
KMY 2023-08-21 18:22:14 +09:00
parent 44eb57183e
commit 3af223275f
20 changed files with 154 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/mastodon/features/compose/containers/circle_select_container.js Normal file
View file

@ -0,0 +1,20 @@
import { connect } from 'react-redux';
import { changeCircle } from '../../../actions/compose';
import CircleSelect from '../components/circle_select';
const mapStateToProps = state => ({
unavailable: state.getIn(['compose', 'privacy']) !== 'circle',
circles: state.get('circles'),
circleId: state.getIn(['compose', 'circle_id']),
});
const mapDispatchToProps = dispatch => ({
onChange (circleId) {
dispatch(changeCircle(circleId));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(CircleSelect);

1
app/javascript/mastodon/features/compose/containers/compose_form_container.js
View file

@ -30,6 +30,7 @@ const mapStateToProps = state => ({
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
lang: state.getIn(['compose', 'language']),
circleId: state.getIn(['compose', 'circle_id']),
});
const mapDispatchToProps = (dispatch) => ({

4
app/javascript/mastodon/features/compose/containers/warning_container.jsx
View file

@ -11,10 +11,10 @@ import Warning from '../components/warning';
const mapStateToProps = state => ({
needsLockWarning: state.getIn(['compose', 'privacy']) === 'private' && !state.getIn(['accounts', me, 'locked']),
hashtagWarning: ['public', 'public_unlisted', 'login'].indexOf(state.getIn(['compose', 'privacy'])) < 0 && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
hashtagWarning: ['public', 'public_unlisted', 'login'].includes(state.getIn(['compose', 'privacy'])) && state.getIn(['compose', 'searchability']) !== 'public' && HASHTAG_PATTERN_REGEX.test(state.getIn(['compose', 'text'])),
directMessageWarning: state.getIn(['compose', 'privacy']) === 'direct',
searchabilityWarning: state.getIn(['compose', 'searchability']) === 'limited',
limitedPostWarning: state.getIn(['compose', 'privacy']) === 'mutual',
limitedPostWarning: ['mutual', 'circle'].includes(state.getIn(['compose', 'privacy'])),
});
const WarningWrapper = ({ needsLockWarning, hashtagWarning, directMessageWarning, searchabilityWarning, limitedPostWarning }) => {