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

Encode additional special characters

Browse source
This commit is contained in:
Thomas Zarebczan 2021-05-13 15:21:21 -04:00 committed by GitHub
parent 645f8ef452
commit 420f2c957e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/util/url.js
View file

@ -2,10 +2,10 @@
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) { function encodeWithSpecialCharEncode(string) {
// encodeURIComponent doesn't encode `'` // encodeURIComponent doesn't encode `'` and others
// in most cases this is fine, but wordpress doesn't like it // which other services may not like
return encodeURIComponent(string).replace(/'/g, '%27'); return encodeURIComponent(string).replace(/'/g, '%27').replace(/\(/g, '%28').replace(/\)/g, '%29');
} }
export const formatLbryUrlForWeb = (uri) => { export const formatLbryUrlForWeb = (uri) => {
@ -94,7 +94,7 @@ export const generateLbryWebUrl = (lbryUrl) => {
export const generateEncodedLbryURL = (domain, lbryWebUrl, includeStartTime, startTime) => { export const generateEncodedLbryURL = (domain, lbryWebUrl, includeStartTime, startTime) => {
const queryParam = includeStartTime ? `?t=${startTime}` : ''; const queryParam = includeStartTime ? `?t=${startTime}` : '';
const encodedPart = encodeWithApostropheEncode(`${lbryWebUrl}${queryParam}`); const encodedPart = encodeWithSpecialCharEncode(`${lbryWebUrl}${queryParam}`);
return `${domain}/${encodedPart}`; return `${domain}/${encodedPart}`;
}; };
@ -113,9 +113,9 @@ export const generateShareUrl = (domain, lbryUrl, referralCode, rewardsApproved,
const { streamName, streamClaimId, channelName, channelClaimId } = parseURI(lbryUrl); const { streamName, streamClaimId, channelName, channelClaimId } = parseURI(lbryUrl);
let uriParts = { let uriParts = {
...(streamName ? { streamName: encodeWithApostropheEncode(streamName) } : {}), ...(streamName ? { streamName: encodeWithSpecialCharEncode(streamName) } : {}),
...(streamClaimId ? { streamClaimId } : {}), ...(streamClaimId ? { streamClaimId } : {}),
...(channelName ? { channelName: encodeWithApostropheEncode(channelName) } : {}), ...(channelName ? { channelName: encodeWithSpecialCharEncode(channelName) } : {}),
...(channelClaimId ? { channelClaimId } : {}), ...(channelClaimId ? { channelClaimId } : {}),
}; };