monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable real-time updates on public pages to improve readability (#10260)

This commit is contained in:
Eugen Rochko 2019-03-18 18:34:56 +01:00 committed by GitHub
parent f85b66eb8c
commit 42c581c458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
View File

@ -3,7 +3,6 @@ import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { expandHashtagTimeline } from 'mastodon/actions/timelines'; import { expandHashtagTimeline } from 'mastodon/actions/timelines';
import { connectHashtagStream } from 'mastodon/actions/streaming';
import Masonry from 'react-masonry-infinite'; import Masonry from 'react-masonry-infinite';
import { List as ImmutableList } from 'immutable'; import { List as ImmutableList } from 'immutable';
import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container'; import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container';
@ -31,14 +30,6 @@ class HashtagTimeline extends React.PureComponent {
const { dispatch, hashtag } = this.props; const { dispatch, hashtag } = this.props;
dispatch(expandHashtagTimeline(hashtag)); dispatch(expandHashtagTimeline(hashtag));
this.disconnect = dispatch(connectHashtagStream(hashtag, hashtag));
}
componentWillUnmount () {
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
} }
handleLoadMore = () => { handleLoadMore = () => {

14
app/javascript/mastodon/features/standalone/public_timeline/index.js
View File

@ -3,7 +3,6 @@ import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines'; import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines';
import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
import Masonry from 'react-masonry-infinite'; import Masonry from 'react-masonry-infinite';
import { List as ImmutableList, Map as ImmutableMap } from 'immutable'; import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container'; import DetailedStatusContainer from 'mastodon/features/status/containers/detailed_status_container';
@ -37,27 +36,14 @@ class PublicTimeline extends React.PureComponent {
componentDidUpdate (prevProps) { componentDidUpdate (prevProps) {
if (prevProps.local !== this.props.local) { if (prevProps.local !== this.props.local) {
this._disconnect();
this._connect(); this._connect();
} }
} }
componentWillUnmount () {
this._disconnect();
}
_connect () { _connect () {
const { dispatch, local } = this.props; const { dispatch, local } = this.props;
dispatch(local ? expandCommunityTimeline() : expandPublicTimeline()); dispatch(local ? expandCommunityTimeline() : expandPublicTimeline());
this.disconnect = dispatch(local ? connectCommunityStream() : connectPublicStream());
}
_disconnect () {
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
} }
handleLoadMore = () => { handleLoadMore = () => {