tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Add option to show only local toots in timeline preview

Browse Source 
Port missing changes from 4e4f1b0dcb to glitch-soc
This commit is contained in:
Thibaut Girka
2018-05-27 17:06:13 +02:00
committed by ThibG
parent 1fa3586db5
commit b7508940b7
2 changed files with 84 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/javascript/flavours/glitch/containers/timeline_container.js
View File

@ -6,6 +6,7 @@ import { hydrateStore } from 'flavours/glitch/actions/store';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from 'mastodon/locales';
import PublicTimeline from 'flavours/glitch/features/standalone/public_timeline';
import CommunityTimeline from 'flavours/glitch/features/standalone/community_timeline';
import HashtagTimeline from 'flavours/glitch/features/standalone/hashtag_timeline';
import initialState from 'flavours/glitch/util/initial_state';
@ -23,17 +24,24 @@ export default class TimelineContainer extends React.PureComponent {
static propTypes = {
locale: PropTypes.string.isRequired,
hashtag: PropTypes.string,
showPublicTimeline: PropTypes.bool.isRequired,
};
static defaultProps = {
showPublicTimeline: initialState.settings.known_fediverse,
};
render () {
const { locale, hashtag } = this.props;
const { locale, hashtag, showPublicTimeline } = this.props;
let timeline;
if (hashtag) {
timeline = <HashtagTimeline hashtag={hashtag} />;
} else {
} else if (showPublicTimeline) {
timeline = <PublicTimeline />;
} else {
timeline = <CommunityTimeline />;
}
return (