diff options
author | ThibG <thib@sitedethib.com> | 2018-05-16 20:17:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 20:17:08 +0200 |
commit | 80aad16e1035a72fec1af56aaac458a35e1f02c5 (patch) | |
tree | 3553dbe64377e08ca4ed2a2db62a487472bf8405 /app/javascript/flavours/glitch/features/composer/index.js | |
parent | 9712d59dda848a7bc7fd9edb814c16717aa9ba6d (diff) | |
parent | 784712791da8c7d21afa62a3bf6a8fdac8c27a80 (diff) |
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
[Glitch] Feature: Direct message from menu
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer/index.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/composer/index.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/index.js b/app/javascript/flavours/glitch/features/composer/index.js index 3aa283628..de85340a3 100644 --- a/app/javascript/flavours/glitch/features/composer/index.js +++ b/app/javascript/flavours/glitch/features/composer/index.js @@ -39,6 +39,7 @@ import ComposerTextarea from './textarea'; import ComposerUploadForm from './upload_form'; import ComposerWarning from './warning'; import ComposerHashtagWarning from './hashtag_warning'; +import ComposerDirectWarning from './direct_warning'; // Utils. import { countableText } from 'flavours/glitch/util/counter'; @@ -326,6 +327,7 @@ class Composer extends React.Component { onSubmit={handleSubmit} text={spoilerText} /> + {privacy === 'direct' ? <ComposerDirectWarning /> : null} {privacy === 'private' && amUnlocked ? <ComposerWarning /> : null} {privacy !== 'public' && APPROX_HASHTAG_RE.test(text) ? <ComposerHashtagWarning /> : null} {replyContent ? ( |