namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #206 from glitch-soc/autocollapse-boost

Browse source 
Autocollapse boosts option
This commit is contained in:
David Yip 2017-11-05 21:02:37 -06:00 committed by GitHub
commit a617060dfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/glitch/components/local_settings/page/index.js
View file

@ -124,6 +124,16 @@ export default class LocalSettingsPage extends React.PureComponent {
> >
<FormattedMessage id='settings.auto_collapse_lengthy' defaultMessage='Lengthy toots' /> <FormattedMessage id='settings.auto_collapse_lengthy' defaultMessage='Lengthy toots' />
</LocalSettingsPageItem> </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 <LocalSettingsPageItem
settings={settings} settings={settings}
item={['collapsed', 'auto', 'replies']} item={['collapsed', 'auto', 'replies']}

4
app/javascript/glitch/components/status/index.js
View file

@ -287,6 +287,7 @@ properly and our intersection observer is good to go.
muted, muted,
id, id,
intersectionObserverWrapper, intersectionObserverWrapper,
prepend,
} = this.props; } = this.props;
const autoCollapseSettings = settings.getIn(['collapsed', 'auto']); const autoCollapseSettings = settings.getIn(['collapsed', 'auto']);
@ -299,6 +300,9 @@ properly and our intersection observer is good to go.
node.clientHeight > ( node.clientHeight > (
status.get('media_attachments').size && !muted ? 650 : 400 status.get('media_attachments').size && !muted ? 650 : 400
) )
) || (
autoCollapseSettings.get('reblogs') &&
prepend === 'reblogged_by'
) || ( ) || (
autoCollapseSettings.get('replies') && autoCollapseSettings.get('replies') &&
status.get('in_reply_to_id', null) !== null status.get('in_reply_to_id', null) !== null

1
app/javascript/glitch/locales/en.json
View file

@ -14,6 +14,7 @@
"settings.auto_collapse_lengthy": "Lengthy toots", "settings.auto_collapse_lengthy": "Lengthy toots",
"settings.auto_collapse_media": "Toots with media", "settings.auto_collapse_media": "Toots with media",
"settings.auto_collapse_notifications": "Notifications", "settings.auto_collapse_notifications": "Notifications",
"settings.auto_collapse_reblogs": "Boosts",
"settings.auto_collapse_replies": "Replies", "settings.auto_collapse_replies": "Replies",
"settings.close": "Close", "settings.close": "Close",
"settings.collapsed_statuses": "Collapsed toots", "settings.collapsed_statuses": "Collapsed toots",

1
app/javascript/glitch/reducers/local_settings.js
View file

@ -59,6 +59,7 @@ const initialState = ImmutableMap({
all : false, all : false,
notifications : true, notifications : true,
lengthy : true, lengthy : true,
reblogs : false,
replies : false, replies : false,
media : false, media : false,
}), }),