diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-11-05 15:05:12 -0800 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-11-05 15:05:12 -0800 |
| commit | e0298d66f8f807efe80cb01097b46e0ef33bd154 (patch) | |
| tree | 4e8b6f7b2959bd627852367b21d28bbcc4a80d6e /app/javascript/glitch | |
| parent | 73bf0ea7d1675b46eb778c2d8a6129e1f7a0650e (diff) | |
Autocollapse boosts option
Diffstat (limited to 'app/javascript/glitch')
4 files changed, 16 insertions, 0 deletions
diff --git a/app/javascript/glitch/components/local_settings/page/index.js b/app/javascript/glitch/components/local_settings/page/index.js index 366c113c0..498230f7b 100644 --- a/app/javascript/glitch/components/local_settings/page/index.js +++ b/app/javascript/glitch/components/local_settings/page/index.js @@ -126,6 +126,16 @@ export default class LocalSettingsPage extends React.PureComponent { </LocalSettingsPageItem> <LocalSettingsPageItem settings={settings} + item={['collapsed', 'auto', 'reblogs']} + id='mastodon-settings--collapsed-auto-reblogs' + onChange={onChange} + dependsOn={[['collapsed', 'enabled']]} + dependsOnNot={[['collapsed', 'auto', 'all']]} + > + <FormattedMessage id='settings.auto_collapse_reblogs' defaultMessage='Boosts' /> + </LocalSettingsPageItem> + <LocalSettingsPageItem + settings={settings} item={['collapsed', 'auto', 'replies']} id='mastodon-settings--collapsed-auto-replies' onChange={onChange} diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js index 9e758793c..6bd95b051 100644 --- a/app/javascript/glitch/components/status/index.js +++ b/app/javascript/glitch/components/status/index.js @@ -287,6 +287,7 @@ properly and our intersection observer is good to go. muted, id, intersectionObserverWrapper, + prepend, } = this.props; const autoCollapseSettings = settings.getIn(['collapsed', 'auto']); @@ -300,6 +301,9 @@ properly and our intersection observer is good to go. status.get('media_attachments').size && !muted ? 650 : 400 ) ) || ( + autoCollapseSettings.get('reblogs') && + prepend === 'reblogged_by' + ) || ( autoCollapseSettings.get('replies') && status.get('in_reply_to_id', null) !== null ) || ( diff --git a/app/javascript/glitch/locales/en.json b/app/javascript/glitch/locales/en.json index 18e412356..69aa29108 100644 --- a/app/javascript/glitch/locales/en.json +++ b/app/javascript/glitch/locales/en.json @@ -14,6 +14,7 @@ "settings.auto_collapse_lengthy": "Lengthy toots", "settings.auto_collapse_media": "Toots with media", "settings.auto_collapse_notifications": "Notifications", + "settings.auto_collapse_reblogs": "Boosts", "settings.auto_collapse_replies": "Replies", "settings.close": "Close", "settings.collapsed_statuses": "Collapsed toots", diff --git a/app/javascript/glitch/reducers/local_settings.js b/app/javascript/glitch/reducers/local_settings.js index 813e130ca..03654fbe2 100644 --- a/app/javascript/glitch/reducers/local_settings.js +++ b/app/javascript/glitch/reducers/local_settings.js @@ -59,6 +59,7 @@ const initialState = ImmutableMap({ all : false, notifications : true, lengthy : true, + reblogs : false, replies : false, media : false, }), |