about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/account_timeline/containers
diff options
context:
space:
mode:
authorEmelia Smith <ThisIsMissEm@users.noreply.github.com>2018-03-29 19:08:34 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-03-29 19:08:34 +0200
commitd1f34151aee564bb1e60ee48107797681c869a81 (patch)
tree101044875b49579d890d95463eee82c647ea3ebe /app/javascript/mastodon/features/account_timeline/containers
parentf1f846045f26518525d5484ed9e782b73086ebe4 (diff)
Feature: Direct message from menu (#6956)
* Implement ability to send direct messages from the user menu

* Implement message warning users that direct messages are visible to all mentioned users

* Update locales
Diffstat (limited to 'app/javascript/mastodon/features/account_timeline/containers')
-rw-r--r--app/javascript/mastodon/features/account_timeline/containers/header_container.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index b5e0e9a3f..214441b8a 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -9,7 +9,10 @@ import {
   unblockAccount,
   unmuteAccount,
 } from '../../../actions/accounts';
-import { mentionCompose } from '../../../actions/compose';
+import {
+  mentionCompose,
+  directCompose,
+} from '../../../actions/compose';
 import { initMuteModal } from '../../../actions/mutes';
 import { initReport } from '../../../actions/reports';
 import { openModal } from '../../../actions/modal';
@@ -67,6 +70,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(mentionCompose(account, router));
   },
 
+  onDirect (account, router) {
+    dispatch(directCompose(account, router));
+  },
+
   onReblogToggle (account) {
     if (account.getIn(['relationship', 'showing_reblogs'])) {
       dispatch(followAccount(account.get('id'), false));