Cleaning up format of broadcast real-time messages, removing
redis-backed "mentions" timeline as redundant (given notifications)
This commit is contained in:
parent
1da0ce5c7c
commit
d9ca46b464
17 changed files with 26 additions and 110 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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));
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue