about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorabcang <abcang1015@gmail.com>2017-08-21 00:12:06 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-08-20 17:12:06 +0200
commit23792f5a7cfc0ba2f3f9181f7e9b8aa7647e9cb3 (patch)
tree0c3a2d9bdcbd49fbda0c97e72ed2770c8c164141 /app
parentfe5b66aa0870212e27a6632fb9c83a2d16bd99ab (diff)
Fix hasUnread on HashtagTimeline (#4644)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/features/hashtag_timeline/index.js4
1 files 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
index b17e8e1a5..10b5c57e9 100644
--- 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']),
 });