diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-02 00:03:31 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-02 00:03:31 +0100 |
commit | d9ca46b464dc5a5eb0ad308809c15a79dcd17ada (patch) | |
tree | 481d65b29b53d84314f7783c1eb0f4b122e7a7ef /app/assets/javascripts/components/containers/mastodon.jsx | |
parent | 1da0ce5c7cf6a5b90e28a810c8b3ef4003239383 (diff) |
Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)
Diffstat (limited to 'app/assets/javascripts/components/containers/mastodon.jsx')
-rw-r--r-- | app/assets/javascripts/components/containers/mastodon.jsx | 10 |
1 files changed, 4 insertions, 6 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} /> |