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

Change visibility to visibility_ex

Browse source
This commit is contained in:
KMY 2023-04-06 20:28:05 +09:00
parent b18268a0a0
commit 7d76d01795
11 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/picture_in_picture/components/footer.jsx
View file

@ -154,8 +154,8 @@ class Footer extends ImmutablePureComponent {
render () {
const { status, intl, withOpenButton } = this.props;
const publicStatus = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility'));
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
const publicStatus = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility_ex'));
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility_ex') === 'private';
let replyIcon, replyTitle;

2
app/javascript/mastodon/features/report/components/status_check_box.jsx
View file

@ -49,7 +49,7 @@ class StatusCheckBox extends React.PureComponent {
'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
};
const visibilityIcon = visibilityIconInfo[status.get('visibility')];
const visibilityIcon = visibilityIconInfo[status.get('visibility_ex')];
const labelComponent = (
<div className='status-check-box__status poll__option__text'>

6
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -192,8 +192,8 @@ class ActionBar extends React.PureComponent {
const { status, relationship, intl } = this.props;
const { signedIn, permissions } = this.context.identity;
const publicStatus = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility'));
const pinnableStatus = ['public', 'unlisted', 'public_unlisted', 'private'].includes(status.get('visibility'));
const publicStatus = ['public', 'unlisted', 'public_unlisted'].includes(status.get('visibility_ex'));
const pinnableStatus = ['public', 'unlisted', 'public_unlisted', 'private'].includes(status.get('visibility_ex'));
const mutingConversation = status.get('muted');
const account = status.get('account');
const writtenByMe = status.getIn(['account', 'id']) === me;
@ -280,7 +280,7 @@ class ActionBar extends React.PureComponent {
replyIcon = 'reply-all';
}
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility_ex') === 'private';
let reblogTitle;
if (status.get('reblogged')) {

6
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -219,7 +219,7 @@ class DetailedStatus extends ImmutablePureComponent {
'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
};
const visibilityIcon = visibilityIconInfo[status.get('visibility')];
const visibilityIcon = visibilityIconInfo[status.get('visibility_ex')];
const visibilityLink = <React.Fragment> · <Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></React.Fragment>;
const searchabilityIconInfo = {
@ -232,7 +232,7 @@ class DetailedStatus extends ImmutablePureComponent {
const searchabilityIcon = searchabilityIconInfo[status.get('searchability')];
const searchabilityLink = <React.Fragment> · <Icon id={searchabilityIcon.icon} title={searchabilityIcon.text} /></React.Fragment>;
if (['private', 'direct'].includes(status.get('visibility'))) {
if (['private', 'direct'].includes(status.get('visibility_ex'))) {
reblogLink = '';
} else if (this.context.router) {
reblogLink = (
@ -307,7 +307,7 @@ class DetailedStatus extends ImmutablePureComponent {
return (
<div style={outerStyle}>
<div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility')}`, { compact })}>
<div ref={this.setRef} className={classNames('detailed-status', `detailed-status-${status.get('visibility_ex')}`, { compact })}>
<a href={`/@${status.getIn(['account', 'acct'])}`} onClick={this.handleAccountClick} className='detailed-status__display-name'>
<div className='detailed-status__display-avatar'><Avatar account={status.get('account')} size={46} /></div>
<DisplayName account={status.get('account')} localDomain={this.props.domain} />

6
app/javascript/mastodon/features/ui/components/boost_modal.jsx
View file

@ -93,12 +93,12 @@ class BoostModal extends ImmutablePureComponent {
'direct': { icon: 'at', text: intl.formatMessage(messages.direct_short) },
};
const visibilityIcon = visibilityIconInfo[status.get('visibility')];
const visibilityIcon = visibilityIconInfo[status.get('visibility_ex')];
return (
<div className='modal-root__modal boost-modal'>
<div className='boost-modal__container'>
<div className={classNames('status', `status-${status.get('visibility')}`, 'light')}>
<div className={classNames('status', `status-${status.get('visibility_ex')}`, 'light')}>
<div className='status__info'>
<a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
<span className='status__visibility-icon'><Icon id={visibilityIcon.icon} title={visibilityIcon.text} /></span>
@ -127,7 +127,7 @@ class BoostModal extends ImmutablePureComponent {
<div className='boost-modal__action-bar'>
<div><FormattedMessage id='boost_modal.combo' defaultMessage='You can press {combo} to skip this next time' values={{ combo: <span>Shift + <Icon id='retweet' /></span> }} /></div>
{status.get('visibility') !== 'private' && !status.get('reblogged') && (
{status.get('visibility_ex') !== 'private' && !status.get('reblogged') && (
<PrivacyDropdown
noDirect
value={privacy}