diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-11 01:31:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-11 01:31:03 +0200 |
commit | 87fdd139b890e60f752bf71e3b09d79eaefcf7b5 (patch) | |
tree | 16f65da67dabe51ac5f9418b2f924fb102284d60 /app/javascript/mastodon/features/direct_timeline/index.js | |
parent | 790d3bc6370f1baf0d00ccf89e81387204c65194 (diff) |
Do not push DMs into the home feed (#8940)
* Do not push DMs into the home feed * Show DMs column after sending a DM, if DMs column is not already shown
Diffstat (limited to 'app/javascript/mastodon/features/direct_timeline/index.js')
-rw-r--r-- | app/javascript/mastodon/features/direct_timeline/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js index 41ec73d98..d202f3bfd 100644 --- a/app/javascript/mastodon/features/direct_timeline/index.js +++ b/app/javascript/mastodon/features/direct_timeline/index.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import Column from '../../components/column'; import ColumnHeader from '../../components/column_header'; -import { expandConversations } from '../../actions/conversations'; +import { mountConversations, unmountConversations, expandConversations } from '../../actions/conversations'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { connectDirectStream } from '../../actions/streaming'; @@ -48,11 +48,14 @@ class DirectTimeline extends React.PureComponent { componentDidMount () { const { dispatch } = this.props; + dispatch(mountConversations()); dispatch(expandConversations()); this.disconnect = dispatch(connectDirectStream()); } componentWillUnmount () { + this.props.dispatch(unmountConversations()); + if (this.disconnect) { this.disconnect(); this.disconnect = null; |