sunoru/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Split public timeline into "public timeline" which is local, and

Browse source 
"whole known network" which is what public timeline used to be

Only domain blocks with suspend severity will block PuSH subscriptions
Silenced accounts should not appear in conversations unless followed
This commit is contained in:
Eugen Rochko 2017-02-19 20:25:54 +01:00
parent 9e99b8c068
commit 4aa5ebe591
12 changed files with 148 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/components/features/public_timeline/index.jsx
View file

@ -7,12 +7,12 @@ import {
updateTimeline,
deleteFromTimelines
} from '../../actions/timelines';
import { defineMessages, injectIntl } from 'react-intl';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
import createStream from '../../stream';
const messages = defineMessages({
title: { id: 'column.public', defaultMessage: 'Public' }
title: { id: 'column.public', defaultMessage: 'Whole Known Network' }
});
const mapStateToProps = state => ({
@ -63,7 +63,7 @@ const PublicTimeline = React.createClass({
return (
<Column icon='globe' heading={intl.formatMessage(messages.title)}>
<ColumnBackButtonSlim />
<StatusListContainer type='public' />
<StatusListContainer type='public' emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />} />
</Column>
);
},