diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-06 22:34:42 -0600 |
| commit | ddb61deccefeda2346e64002528764841bcb7315 (patch) | |
| tree | 0ee86119b8260661d85e5e41a1342c30802f620b /app/javascript | |
| parent | 935c1944e27be4df9ba821a0f38fd599d1877a31 (diff) | |
| parent | 744447b3c04d7806e383f0d1ad7a10c73bd667ef (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/account_timeline/containers/header_container.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/status/components/card.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js index 775610032..b5e0e9a3f 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js @@ -68,7 +68,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, onReblogToggle (account) { - if (account.getIn(['relationship', 'show_reblogs'])) { + if (account.getIn(['relationship', 'showing_reblogs'])) { dispatch(followAccount(account.get('id'), false)); } else { dispatch(followAccount(account.get('id'), true)); diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js index 680bf63ab..d3e322c36 100644 --- a/app/javascript/mastodon/features/status/components/card.js +++ b/app/javascript/mastodon/features/status/components/card.js @@ -101,7 +101,7 @@ export default class Card extends React.PureComponent { onClick={this.handlePhotoClick} role='button' tabIndex='0' - src={card.get('url')} + src={card.get('embed_url')} alt={card.get('title')} width={card.get('width')} height={card.get('height')} |