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

Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)

Browse Source
This commit is contained in:
David Yip
2017-12-06 18:23:28 -06:00
parent 061211a1e3
commit 133f5b3b53
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/account/components/action_bar.js
View File

@@ -63,9 +63,8 @@ export default class ActionBar extends React.PureComponent {
if (account.get('id') === me) {
menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
} else {
const following = account.getIn(['relationship', 'following']);
if (following) {
if (following.get('reblogs')) {
if (account.getIn(['relationship', 'following'])) {
if (account.getIn(['relationship', 'showing_reblogs'])) {
menu.push({ text: intl.formatMessage(messages.hideReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
} else {
menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });

2
app/javascript/flavours/glitch/features/account_timeline/containers/header_container.js
View File

@@ -68,7 +68,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onReblogToggle (account) {
if (account.getIn(['relationship', 'following', 'reblogs'])) {
if (account.getIn(['relationship', 'show_reblogs'])) {
dispatch(followAccount(account.get('id'), false));
} else {
dispatch(followAccount(account.get('id'), true));