diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 00:47:47 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-11-10 00:47:47 +0100 |
commit | bf5f55a6bbfee69e41acfcd14002308c69d8b68c (patch) | |
tree | 9261287b4c47c3a88c7c30a5e355b50ae9cfa9fe /app/assets/javascripts | |
parent | aabf884c5f6bf5c0a7cdec2c3e4fe174eeecfaec (diff) |
Fix live status removal from public/hashtag channels
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/components/features/hashtag_timeline/index.jsx | 10 | ||||
-rw-r--r-- | app/assets/javascripts/components/features/public_timeline/index.jsx | 18 |
2 files changed, 20 insertions, 8 deletions
diff --git a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx index de6a9618e..bea0a2759 100644 --- a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx +++ b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx @@ -4,7 +4,8 @@ import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../ui/components/column'; import { refreshTimeline, - updateTimeline + updateTimeline, + deleteFromTimelines } from '../../actions/timelines'; const HashtagTimeline = React.createClass({ @@ -24,7 +25,12 @@ const HashtagTimeline = React.createClass({ }, { received (data) { - dispatch(updateTimeline('tag', JSON.parse(data.message))); + switch(data.type) { + case 'update': + return dispatch(updateTimeline('tag', JSON.parse(data.message))); + case 'delete': + return dispatch(deleteFromTimelines(data.id)); + } } }); diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx index 8b2a86947..12f73ba9b 100644 --- a/app/assets/javascripts/components/features/public_timeline/index.jsx +++ b/app/assets/javascripts/components/features/public_timeline/index.jsx @@ -1,11 +1,12 @@ -import { connect } from 'react-redux'; -import PureRenderMixin from 'react-addons-pure-render-mixin'; +import { connect } from 'react-redux'; +import PureRenderMixin from 'react-addons-pure-render-mixin'; import StatusListContainer from '../ui/containers/status_list_container'; -import Column from '../ui/components/column'; +import Column from '../ui/components/column'; import { refreshTimeline, - updateTimeline -} from '../../actions/timelines'; + updateTimeline, + deleteFromTimelines +} from '../../actions/timelines'; const PublicTimeline = React.createClass({ @@ -24,7 +25,12 @@ const PublicTimeline = React.createClass({ this.subscription = App.cable.subscriptions.create('PublicChannel', { received (data) { - dispatch(updateTimeline('public', JSON.parse(data.message))); + switch(data.type) { + case 'update': + return dispatch(updateTimeline('public', JSON.parse(data.message))); + case 'delete': + return dispatch(deleteFromTimelines(data.id)); + } } }); |