logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 23792f5a7cfc0ba2f3f9181f7e9b8aa7647e9cb3
parent: fe5b66aa0870212e27a6632fb9c83a2d16bd99ab
Author: abcang <abcang1015@gmail.com>
Date:   Mon, 21 Aug 2017 00:12:06 +0900

Fix hasUnread on HashtagTimeline (#4644)


Diffstat:

Mapp/javascript/mastodon/features/hashtag_timeline/index.js4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js @@ -14,8 +14,8 @@ import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { FormattedMessage } from 'react-intl'; import createStream from '../../stream'; -const mapStateToProps = state => ({ - hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0, +const mapStateToProps = (state, props) => ({ + hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0, streamingAPIBaseURL: state.getIn(['meta', 'streaming_api_base_url']), accessToken: state.getIn(['meta', 'access_token']), });