diff options
Diffstat (limited to 'app/assets/javascripts/components')
4 files changed, 14 insertions, 48 deletions
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx index 839f7267e..5fd43fb2b 100644 --- a/app/assets/javascripts/components/containers/mastodon.jsx +++ b/app/assets/javascripts/components/containers/mastodon.jsx @@ -23,7 +23,6 @@ import GettingStarted from '../features/getting_started'; import PublicTimeline from '../features/public_timeline'; import AccountTimeline from '../features/account_timeline'; import HomeTimeline from '../features/home_timeline'; -import MentionsTimeline from '../features/mentions_timeline'; import Compose from '../features/compose'; import Followers from '../features/followers'; import Following from '../features/following'; @@ -68,15 +67,15 @@ const Mastodon = React.createClass({ this.subscription = App.cable.subscriptions.create('TimelineChannel', { received (data) { - switch(data.type) { + switch(data.event) { case 'update': - store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message))); + store.dispatch(updateTimeline('home', JSON.parse(data.payload))); break; case 'delete': - store.dispatch(deleteFromTimelines(data.id)); + store.dispatch(deleteFromTimelines(data.payload)); break; case 'notification': - store.dispatch(updateNotifications(JSON.parse(data.message), getMessagesForLocale(locale), locale)); + store.dispatch(updateNotifications(JSON.parse(data.payload), getMessagesForLocale(locale), locale)); break; } } @@ -108,7 +107,6 @@ const Mastodon = React.createClass({ <Route path='getting-started' component={GettingStarted} /> <Route path='timelines/home' component={HomeTimeline} /> - <Route path='timelines/mentions' component={MentionsTimeline} /> <Route path='timelines/public' component={PublicTimeline} /> <Route path='timelines/tag/:id' component={HashtagTimeline} /> diff --git a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx index 011b1e54d..7548e6d56 100644 --- a/app/assets/javascripts/components/features/hashtag_timeline/index.jsx +++ b/app/assets/javascripts/components/features/hashtag_timeline/index.jsx @@ -26,11 +26,13 @@ const HashtagTimeline = React.createClass({ }, { received (data) { - switch(data.type) { + switch(data.event) { case 'update': - return dispatch(updateTimeline('tag', JSON.parse(data.message))); + dispatch(updateTimeline('tag', JSON.parse(data.payload))); + break; case 'delete': - return dispatch(deleteFromTimelines(data.id)); + dispatch(deleteFromTimelines(data.payload)); + break; } } diff --git a/app/assets/javascripts/components/features/mentions_timeline/index.jsx b/app/assets/javascripts/components/features/mentions_timeline/index.jsx deleted file mode 100644 index 8583f59a6..000000000 --- a/app/assets/javascripts/components/features/mentions_timeline/index.jsx +++ /dev/null @@ -1,36 +0,0 @@ -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 { refreshTimeline } from '../../actions/timelines'; -import { defineMessages, injectIntl } from 'react-intl'; - -const messages = defineMessages({ - title: { id: 'column.mentions', defaultMessage: 'Mentions' } -}); - -const MentionsTimeline = React.createClass({ - - propTypes: { - dispatch: React.PropTypes.func.isRequired - }, - - mixins: [PureRenderMixin], - - componentWillMount () { - this.props.dispatch(refreshTimeline('mentions')); - }, - - render () { - const { intl } = this.props; - - return ( - <Column icon='at' heading={intl.formatMessage(messages.title)}> - <StatusListContainer {...this.props} type='mentions' /> - </Column> - ); - }, - -}); - -export default connect()(injectIntl(MentionsTimeline)); diff --git a/app/assets/javascripts/components/features/public_timeline/index.jsx b/app/assets/javascripts/components/features/public_timeline/index.jsx index 28cdc639a..42970061c 100644 --- a/app/assets/javascripts/components/features/public_timeline/index.jsx +++ b/app/assets/javascripts/components/features/public_timeline/index.jsx @@ -32,11 +32,13 @@ const PublicTimeline = React.createClass({ this.subscription = App.cable.subscriptions.create('PublicChannel', { received (data) { - switch(data.type) { + switch(data.event) { case 'update': - return dispatch(updateTimeline('public', JSON.parse(data.message))); + dispatch(updateTimeline('public', JSON.parse(data.payload))); + break; case 'delete': - return dispatch(deleteFromTimelines(data.id)); + dispatch(deleteFromTimelines(data.payload)); + break; } } |