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

manually encode ' because encodeURIComponent doesn't encode it

Browse source
This commit is contained in:
Sean Yesmunt 2021-01-22 15:37:20 -05:00
parent 2adfa8b6b6
commit 26ece81da8
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ui/util/url.js
View file

@ -2,6 +2,12 @@
const PAGES = require('../constants/pages'); const PAGES = require('../constants/pages');
const { parseURI, buildURI } = require('lbry-redux'); const { parseURI, buildURI } = require('lbry-redux');
function encodeWithApostropheEncode(string) {
// encodeURIComponent doesn't encode `'`
// in most cases this is fine, but wordpress doesn't like it
return encodeURIComponent(string).replace(/'/g, '%27');
}
exports.formatLbryUrlForWeb = uri => { exports.formatLbryUrlForWeb = uri => {
let newUrl = uri.replace('lbry://', '/').replace(/#/g, ':'); let newUrl = uri.replace('lbry://', '/').replace(/#/g, ':');
if (newUrl.startsWith('/?')) { if (newUrl.startsWith('/?')) {
@ -88,7 +94,7 @@ exports.generateLbryWebUrl = lbryUrl => {
exports.generateEncodedLbryURL = (domain, lbryWebUrl, includeStartTime, startTime) => { exports.generateEncodedLbryURL = (domain, lbryWebUrl, includeStartTime, startTime) => {
const queryParam = includeStartTime ? `?t=${startTime}` : ''; const queryParam = includeStartTime ? `?t=${startTime}` : '';
const encodedPart = encodeURIComponent(`${lbryWebUrl}${queryParam}`); const encodedPart = encodeWithApostropheEncode(`${lbryWebUrl}${queryParam}`);
return `${domain}/${encodedPart}`; return `${domain}/${encodedPart}`;
}; };
@ -107,9 +113,9 @@ exports.generateShareUrl = (domain, lbryUrl, referralCode, rewardsApproved, incl
const { streamName, streamClaimId, channelName, channelClaimId } = parseURI(lbryUrl); const { streamName, streamClaimId, channelName, channelClaimId } = parseURI(lbryUrl);
let uriParts = { let uriParts = {
...(streamName ? { streamName: encodeURIComponent(streamName) } : {}), ...(streamName ? { streamName: encodeWithApostropheEncode(streamName) } : {}),
...(streamClaimId ? { streamClaimId } : {}), ...(streamClaimId ? { streamClaimId } : {}),
...(channelName ? { channelName: encodeURIComponent(channelName) } : {}), ...(channelName ? { channelName: encodeWithApostropheEncode(channelName) } : {}),
...(channelClaimId ? { channelClaimId } : {}), ...(channelClaimId ? { channelClaimId } : {}),
}; };