mirror of
https://github.com/mastodon/mastodon.git
synced 2025-11-27 18:10:58 +00:00
Change private quote education modal to not show up on self-quotes
Fixes #36918
This commit is contained in:
parent
b14f113929
commit
012804fb76
|
|
@ -13,6 +13,7 @@ import {
|
||||||
import { pasteLinkCompose } from 'mastodon/actions/compose_typed';
|
import { pasteLinkCompose } from 'mastodon/actions/compose_typed';
|
||||||
import { openModal } from 'mastodon/actions/modal';
|
import { openModal } from 'mastodon/actions/modal';
|
||||||
import { PRIVATE_QUOTE_MODAL_ID } from 'mastodon/features/ui/components/confirmation_modals/private_quote_notify';
|
import { PRIVATE_QUOTE_MODAL_ID } from 'mastodon/features/ui/components/confirmation_modals/private_quote_notify';
|
||||||
|
import { me } from 'mastodon/initial_state';
|
||||||
|
|
||||||
import ComposeForm from '../components/compose_form';
|
import ComposeForm from '../components/compose_form';
|
||||||
|
|
||||||
|
|
@ -53,6 +54,7 @@ const mapStateToProps = state => ({
|
||||||
quoteToPrivate:
|
quoteToPrivate:
|
||||||
!!state.getIn(['compose', 'quoted_status_id'])
|
!!state.getIn(['compose', 'quoted_status_id'])
|
||||||
&& state.getIn(['compose', 'privacy']) === 'private'
|
&& state.getIn(['compose', 'privacy']) === 'private'
|
||||||
|
&& state.getIn(['statuses', state.getIn(['compose', 'quoted_status_id']), 'account']) !== me
|
||||||
&& !state.getIn(['settings', 'dismissed_banners', PRIVATE_QUOTE_MODAL_ID]),
|
&& !state.getIn(['settings', 'dismissed_banners', PRIVATE_QUOTE_MODAL_ID]),
|
||||||
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
|
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
|
||||||
lang: state.getIn(['compose', 'language']),
|
lang: state.getIn(['compose', 'language']),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user