treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 

Fixes #16799
lolsob-rspec
Claire 2021-11-26 22:04:09 +01:00 committed by GitHub
parent 9270b90d38
commit ad3668eb5f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/javascript/mastodon/components/status.js
View File

@ -146,7 +146,11 @@ class Status extends ImmutablePureComponent {
this.handleHotkeyOpen(); this.handleHotkeyOpen();
} }
handleAccountClick = e => { handlePrependAccountClick = e => {
this.handleAccountClick(e, false);
}
handleAccountClick = (e, proper = true) => {
if (e && (e.button !== 0 || e.ctrlKey || e.metaKey)) { if (e && (e.button !== 0 || e.ctrlKey || e.metaKey)) {
return; return;
} }
@ -155,7 +159,7 @@ class Status extends ImmutablePureComponent {
e.preventDefault(); e.preventDefault();
} }
this.handleHotkeyOpenProfile(); this._openProfile(proper);
} }
handleExpandedToggle = () => { handleExpandedToggle = () => {
@ -244,8 +248,12 @@ class Status extends ImmutablePureComponent {
} }
handleHotkeyOpenProfile = () => { handleHotkeyOpenProfile = () => {
this._openProfile();
}
_openProfile = (proper = true) => {
const { router } = this.context; const { router } = this.context;
const status = this._properStatus(); const status = proper ? this._properStatus() : this.props.status;
if (!router) { if (!router) {
return; return;
@ -349,7 +357,7 @@ class Status extends ImmutablePureComponent {
prepend = ( prepend = (
<div className='status__prepend'> <div className='status__prepend'>
<div className='status__prepend-icon-wrapper'><Icon id='retweet' className='status__prepend-icon' fixedWidth /></div> <div className='status__prepend-icon-wrapper'><Icon id='retweet' className='status__prepend-icon' fixedWidth /></div>
<FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} /> <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
</div> </div>
); );