revert local only
This commit is contained in:
parent
eadf7f20e2
commit
68e544dc1f
|
@ -621,7 +621,7 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
|
|||
return menu;
|
||||
};
|
||||
|
||||
const publicStatus = ['public', 'unlisted', 'group', 'local'].includes(status.visibility);
|
||||
const publicStatus = ['public', 'unlisted', 'group'].includes(status.visibility);
|
||||
|
||||
const replyCount = status.replies_count;
|
||||
const reblogCount = status.reblogs_count;
|
||||
|
|
|
@ -8,8 +8,8 @@ import Overlay from 'react-overlays/lib/Overlay';
|
|||
|
||||
import { changeComposeVisibility } from 'soapbox/actions/compose';
|
||||
import { closeModal, openModal } from 'soapbox/actions/modals';
|
||||
import { IconButton, Icon } from 'soapbox/components/ui';
|
||||
import { useFeatures, useLogo } from 'soapbox/hooks';
|
||||
import Icon from 'soapbox/components/icon';
|
||||
import { IconButton } from 'soapbox/components/ui';
|
||||
import { useAppDispatch, useCompose } from 'soapbox/hooks';
|
||||
import { isUserTouching } from 'soapbox/is-mobile';
|
||||
|
||||
|
@ -20,8 +20,6 @@ const messages = defineMessages({
|
|||
public_long: { id: 'privacy.public.long', defaultMessage: 'Post to public timelines' },
|
||||
unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
|
||||
unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Do not post to public timelines' },
|
||||
local_short: { id: 'privacy.local.short', defaultMessage: 'Local-only' },
|
||||
local_long: { id: 'privacy.local.long', defaultMessage: 'Status is only visible to people on this instance' },
|
||||
private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
|
||||
private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
|
||||
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
|
||||
|
@ -152,8 +150,7 @@ const PrivacyDropdown: React.FC<IPrivacyDropdown> = ({
|
|||
const intl = useIntl();
|
||||
const node = useRef<HTMLDivElement>(null);
|
||||
const activeElement = useRef<HTMLElement | null>(null);
|
||||
const logo = useLogo();
|
||||
const features = useFeatures();
|
||||
|
||||
const compose = useCompose(composeId);
|
||||
|
||||
const value = compose.privacy;
|
||||
|
@ -164,7 +161,6 @@ const PrivacyDropdown: React.FC<IPrivacyDropdown> = ({
|
|||
|
||||
const options = [
|
||||
{ icon: require('@tabler/icons/world.svg'), value: 'public', text: intl.formatMessage(messages.public_short), meta: intl.formatMessage(messages.public_long) },
|
||||
(features.localOnlyPrivacy ? [{ icon: logo, value: 'local', text: intl.formatMessage(messages.local_short), meta: intl.formatMessage(messages.local_long) }] : []),
|
||||
{ icon: require('@tabler/icons/lock-open.svg'), value: 'unlisted', text: intl.formatMessage(messages.unlisted_short), meta: intl.formatMessage(messages.unlisted_long) },
|
||||
{ icon: require('@tabler/icons/lock.svg'), value: 'private', text: intl.formatMessage(messages.private_short), meta: intl.formatMessage(messages.private_long) },
|
||||
{ icon: require('@tabler/icons/mail.svg'), value: 'direct', text: intl.formatMessage(messages.direct_short), meta: intl.formatMessage(messages.direct_long) },
|
||||
|
|
|
@ -80,7 +80,6 @@ const messages = defineMessages({
|
|||
displayPostsHideAll: { id: 'preferences.fields.display_media.hide_all', defaultMessage: 'Always hide posts' },
|
||||
displayPostsShowAll: { id: 'preferences.fields.display_media.show_all', defaultMessage: 'Always show posts' },
|
||||
privacy_public: { id: 'preferences.options.privacy_public', defaultMessage: 'Public' },
|
||||
privacy_local: { id: 'preferences.options.privacy_local', defaultMessage: 'Local-only' },
|
||||
privacy_unlisted: { id: 'preferences.options.privacy_unlisted', defaultMessage: 'Unlisted' },
|
||||
privacy_followers_only: { id: 'preferences.options.privacy_followers_only', defaultMessage: 'Followers-only' },
|
||||
content_type_plaintext: { id: 'preferences.options.content_type_plaintext', defaultMessage: 'Plain text' },
|
||||
|
@ -109,7 +108,6 @@ const Preferences = () => {
|
|||
|
||||
const defaultPrivacyOptions = React.useMemo(() => ({
|
||||
public: intl.formatMessage(messages.privacy_public),
|
||||
features.localOnlyPrivacy ? { local: intl.formatMessage(messages.privacy_local) } : {},
|
||||
unlisted: intl.formatMessage(messages.privacy_unlisted),
|
||||
private: intl.formatMessage(messages.privacy_followers_only),
|
||||
}), []);
|
||||
|
|
|
@ -1208,7 +1208,6 @@
|
|||
"preferences.options.content_type_plaintext": "Plain text",
|
||||
"preferences.options.privacy_followers_only": "Followers-only",
|
||||
"preferences.options.privacy_public": "Public",
|
||||
"preferences.options.privacy_local": "Local only",
|
||||
"preferences.options.privacy_unlisted": "Unlisted",
|
||||
"privacy.change": "Adjust post privacy",
|
||||
"privacy.direct.long": "Post to mentioned users only",
|
||||
|
@ -1217,8 +1216,6 @@
|
|||
"privacy.private.short": "Followers-only",
|
||||
"privacy.public.long": "Post to public timelines",
|
||||
"privacy.public.short": "Public",
|
||||
"privacy.local.short": "Local seulement",
|
||||
"privacy.local.long": "Seuls les utilisateurs de votre instance verront vos statuts",
|
||||
"privacy.unlisted.long": "Do not post to public timelines",
|
||||
"privacy.unlisted.short": "Unlisted",
|
||||
"profile_dropdown.add_account": "Add an existing account",
|
||||
|
|
|
@ -642,11 +642,6 @@ const getInstanceFeatures = (instance: Instance) => {
|
|||
v.software === MASTODON && gte(v.compatVersion, '2.1.0'),
|
||||
v.software === PLEROMA && gte(v.version, '0.9.9'),
|
||||
]),
|
||||
/**
|
||||
* Can set status visibility to local-only
|
||||
* @see {@link https://docs.akkoma.dev/stable/development/API/differences_in_mastoapi_responses/#statuses}
|
||||
*/
|
||||
localOnlyPrivacy: v.software === AKKOMA,
|
||||
|
||||
/**
|
||||
* Can sign in using username instead of e-mail address.
|
||||
|
|
Loading…
Reference in a new issue