Display a warning when composing unlisted toots with something looking like a hashtag

This is a backport of b6af88192f to the glitch flavour.
This commit is contained in:
Thibaut Girka
2018-01-19 11:34:48 +01:00
parent 708ec07e27
commit 1287b2782b
2 changed files with 53 additions and 0 deletions

View File

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes';
const APPROX_HASHTAG_RE = /(?:^|[^\/\)\w])#(\S+)/i;
// Actions.
import {
cancelReplyCompose,
@@ -36,6 +38,7 @@ import ComposerSpoiler from './spoiler';
import ComposerTextarea from './textarea';
import ComposerUploadForm from './upload_form';
import ComposerWarning from './warning';
import ComposerHashtagWarning from './hashtag_warning';
// Utils.
import { countableText } from 'flavours/glitch/util/counter';
@@ -312,6 +315,7 @@ class Composer extends React.Component {
text={spoilerText}
/>
{privacy === 'private' && amUnlocked ? <ComposerWarning /> : null}
{privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null}
{replyContent ? (
<ComposerReply
account={replyAccount}