LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Avoid persistent lone question mark on url

Browse source
This commit is contained in:
Rafael 2022-02-01 09:59:30 -03:00 committed by Thomas Zarebczan
parent df360f7ccc
commit e9a003328d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ui/page/show/view.jsx
View file

@ -63,7 +63,7 @@ function ShowPage(props: Props) {
doAnalyticsView, doAnalyticsView,
} = props; } = props;
const { search } = location; const { search, pathname } = location;
const signingChannel = claim && claim.signing_channel; const signingChannel = claim && claim.signing_channel;
const canonicalUrl = claim && claim.canonical_url; const canonicalUrl = claim && claim.canonical_url;
@ -91,7 +91,8 @@ function ShowPage(props: Props) {
// Only redirect if we are in lbry.tv land // Only redirect if we are in lbry.tv land
// replaceState will fail if on a different domain (like webcache.googleusercontent.com) // replaceState will fail if on a different domain (like webcache.googleusercontent.com)
const hostname = isDev ? 'localhost' : DOMAIN; const hostname = isDev ? 'localhost' : DOMAIN;
if (canonicalUrlPath !== window.location.pathname && hostname === window.location.hostname) {
if (canonicalUrlPath !== pathname && hostname === window.location.hostname) {
const urlParams = new URLSearchParams(search); const urlParams = new URLSearchParams(search);
let replaceUrl = canonicalUrlPath; let replaceUrl = canonicalUrlPath;
if (urlParams.get(COLLECTIONS_CONSTS.COLLECTION_ID)) { if (urlParams.get(COLLECTIONS_CONSTS.COLLECTION_ID)) {
@ -101,6 +102,12 @@ function ShowPage(props: Props) {
} }
history.replaceState(history.state, '', replaceUrl); history.replaceState(history.state, '', replaceUrl);
} }
const windowHref = window.location.href;
const noUrlParams = search.length === 0;
if (windowHref.includes('?') && noUrlParams) {
history.replaceState(history.state, '', windowHref.substring(0, windowHref.length - 1));
}
} }
// @endif // @endif