Browse Source

Add option to show only local toots in timeline preview (#6292)

* Add option to show only local toots in timeline preview
Right know, toots from all the known fediverse are shown in the main
page of an instance. That however doesn't reflect the instance itself.
With this option the admin may choose to display only local toots so
that users checking the instance get a better idea of internal
conversations.

* Fix issues pointed by codeclimate and eslint

* Add default message for community timeline

* Update pl.yml
pull/4/head
Renato "Lond" Cerqueira 6 years ago
committed by Eugen Rochko
parent
commit
4e4f1b0dcb
11 changed files with 111 additions and 3 deletions
  1. +1
    -1
      app/controllers/about_controller.rb
  2. +2
    -0
      app/controllers/admin/settings_controller.rb
  3. +10
    -2
      app/javascript/mastodon/containers/timeline_container.js
  4. +74
    -0
      app/javascript/mastodon/features/standalone/community_timeline/index.js
  5. +9
    -0
      app/javascript/mastodon/locales/defaultMessages.json
  6. +2
    -0
      app/models/form/admin_settings.rb
  7. +3
    -0
      app/views/admin/settings/edit.html.haml
  8. +3
    -0
      config/locales/en.yml
  9. +3
    -0
      config/locales/pl.yml
  10. +3
    -0
      config/locales/pt-BR.yml
  11. +1
    -0
      config/settings.yml

+ 1
- 1
app/controllers/about_controller.rb View File

@ -31,7 +31,7 @@ class AboutController < ApplicationController
def initial_state_params
{
settings: {},
settings: { known_fediverse: Setting.show_known_fediverse_at_about_page },
token: current_session&.token,
}
end

+ 2
- 0
app/controllers/admin/settings_controller.rb View File

@ -19,6 +19,7 @@ module Admin
min_invite_role
activity_api_enabled
peers_api_enabled
show_known_fediverse_at_about_page
).freeze
BOOLEAN_SETTINGS = %w(
@ -28,6 +29,7 @@ module Admin
show_staff_badge
activity_api_enabled
peers_api_enabled
show_known_fediverse_at_about_page
).freeze
UPLOAD_SETTINGS = %w(

+ 10
- 2
app/javascript/mastodon/containers/timeline_container.js View File

@ -6,6 +6,7 @@ import { hydrateStore } from '../actions/store';
import { IntlProvider, addLocaleData } from 'react-intl';
import { getLocale } from '../locales';
import PublicTimeline from '../features/standalone/public_timeline';
import CommunityTimeline from '../features/standalone/community_timeline';
import HashtagTimeline from '../features/standalone/hashtag_timeline';
import initialState from '../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 (

+ 74
- 0
app/javascript/mastodon/features/standalone/community_timeline/index.js View File

@ -0,0 +1,74 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import StatusListContainer from '../../ui/containers/status_list_container';
import {
refreshCommunityTimeline,
expandCommunityTimeline,
} from '../../../actions/timelines';
import Column from '../../../components/column';
import ColumnHeader from '../../../components/column_header';
import { defineMessages, injectIntl } from 'react-intl';
import { connectCommunityStream } from '../../../actions/streaming';
const messages = defineMessages({
title: { id: 'standalone.public_title', defaultMessage: 'A look inside...' },
});
@connect()
@injectIntl
export default class CommunityTimeline extends React.PureComponent {
static propTypes = {
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
};
handleHeaderClick = () => {
this.column.scrollTop();
}
setRef = c => {
this.column = c;
}
componentDidMount () {
const { dispatch } = this.props;
dispatch(refreshCommunityTimeline());
this.disconnect = dispatch(connectCommunityStream());
}
componentWillUnmount () {
if (this.disconnect) {
this.disconnect();
this.disconnect = null;
}
}
handleLoadMore = () => {
this.props.dispatch(expandCommunityTimeline());
}
render () {
const { intl } = this.props;
return (
<Column ref={this.setRef}>
<ColumnHeader
icon='users'
title={intl.formatMessage(messages.title)}
onClick={this.handleHeaderClick}
/>
<StatusListContainer
timelineId='community'
loadMore={this.handleLoadMore}
scrollKey='standalone_public_timeline'
trackScroll={false}
/>
</Column>
);
}
}

+ 9
- 0
app/javascript/mastodon/locales/defaultMessages.json View File

@ -1230,6 +1230,15 @@
],
"path": "app/javascript/mastodon/features/public_timeline/index.json"
},
{
"descriptors": [
{
"defaultMessage": "A look inside...",
"id": "standalone.public_title"
}
],
"path": "app/javascript/mastodon/features/standalone/community_timeline/index.json"
},
{
"descriptors": [
{

+ 2
- 0
app/models/form/admin_settings.rb View File

@ -34,6 +34,8 @@ class Form::AdminSettings
:activity_api_enabled=,
:peers_api_enabled,
:peers_api_enabled=,
:show_known_fediverse_at_about_page,
:show_known_fediverse_at_about_page=,
to: Setting
)
end

+ 3
- 0
app/views/admin/settings/edit.html.haml View File

@ -18,6 +18,9 @@
.fields-group
= f.input :timeline_preview, as: :boolean, wrapper: :with_label, label: t('admin.settings.timeline_preview.title'), hint: t('admin.settings.timeline_preview.desc_html')
.fields-group
= f.input :show_known_fediverse_at_about_page, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_known_fediverse_at_about_page.title'), hint: t('admin.settings.show_known_fediverse_at_about_page.desc_html')
.fields-group
= f.input :show_staff_badge, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_staff_badge.title'), hint: t('admin.settings.show_staff_badge.desc_html')

+ 3
- 0
config/locales/en.yml View File

@ -290,6 +290,9 @@ en:
open:
desc_html: Allow anyone to create an account
title: Open registration
show_known_fediverse_at_about_page:
desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
title: Show known fediverse on timeline preview
show_staff_badge:
desc_html: Show a staff badge on a user page
title: Show staff badge

+ 3
- 0
config/locales/pl.yml View File

@ -291,6 +291,9 @@ pl:
open:
desc_html: Pozwól każdemu na założenie konta
title: Otwarta rejestracja
show_known_fediverse_at_about_page:
desc_html: Jeśli włączone, podgląd instancji będzie wyświetlał wpisy z całego Fediwersum. W innym przypadku, będą wyświetlane tylko lokalne wpisy.
title: Pokazuj wszystkie znane wpisy na podglądzie instancji
show_staff_badge:
desc_html: Pokazuj odznakę uprawnień na stronie profilu użytkownika
title: Pokazuj odznakę administracji

+ 3
- 0
config/locales/pt-BR.yml View File

@ -290,6 +290,9 @@ pt-BR:
open:
desc_html: Permitir que qualquer um crie uma conta
title: Cadastro aberto
show_known_fediverse_at_about_page:
desc_html: Quando ligado, vai mostrar toots de todo o fediverso conhecido na prévia da timeline. Senão, mostra somente toots locais.
title: Mostrar fediverso conhecido na prévia da timeline
show_staff_badge:
desc_html: Mostrar uma insígnia de Equipe na página de usuário
title: Mostrar insígnia de equipe

+ 1
- 0
config/settings.yml View File

@ -49,6 +49,7 @@ defaults: &defaults
bootstrap_timeline_accounts: ''
activity_api_enabled: true
peers_api_enabled: true
show_known_fediverse_at_about_page: true
development:
<<: *defaults

Loading…
Cancel
Save