Fix URL comparison for mentions in case of empty path (#36613)

pull/36617/head
Claire 7 days ago committed by GitHub
parent d0d09fd3a5
commit 3bf99b8a4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -72,6 +72,17 @@ const mapStateToProps = state => ({
languages: state.getIn(['server', 'translationLanguages', 'items']), languages: state.getIn(['server', 'translationLanguages', 'items']),
}); });
const compareUrls = (href1, href2) => {
try {
const url1 = new URL(href1);
const url2 = new URL(href2);
return url1.origin === url2.origin && url1.path === url2.path && url1.search === url2.search;
} catch {
return false;
}
};
class StatusContent extends PureComponent { class StatusContent extends PureComponent {
static propTypes = { static propTypes = {
identity: identityContextPropShape, identity: identityContextPropShape,
@ -127,7 +138,7 @@ class StatusContent extends PureComponent {
link.classList.add('status-link'); link.classList.add('status-link');
mention = this.props.status.get('mentions').find(item => link.href === item.get('url')); mention = this.props.status.get('mentions').find(item => compareUrls(link, item.get('url')));
if (mention) { if (mention) {
link.addEventListener('click', this.onMentionClick.bind(this, mention), false); link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
@ -206,7 +217,7 @@ class StatusContent extends PureComponent {
handleElement = (element, { key, ...props }, children) => { handleElement = (element, { key, ...props }, children) => {
if (element instanceof HTMLAnchorElement) { if (element instanceof HTMLAnchorElement) {
const mention = this.props.status.get('mentions').find(item => element.href === item.get('url')); const mention = this.props.status.get('mentions').find(item => compareUrls(element.href, item.get('url')));
return ( return (
<HandledLink <HandledLink
{...props} {...props}

Loading…
Cancel
Save