Mirrors/remote-jobs
2
0
Fork 0
mirror of https://github.com/remoteintech/remote-jobs synced 2025-01-14 05:23:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve URL handling for external links in index.js

Browse source 
Improved URL handling with error checks for malformed links in `getUrlInfo`, refined domain extraction in `extractMainDomainFromUrl`, and ensured external link attributes apply correctly. Enhanced logging for easier debugging.

Signed-off-by: Muhammad Azeem <37941410+AzeemSup@users.noreply.github.com>
This commit is contained in:
Muhammad Azeem 2024-10-31 15:48:27 +05:00 committed by GitHub
parent 9f13291a72
commit 35cb998ae5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 60 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
lib/index.js
View file

@ -141,30 +141,25 @@ exports.parseFromDirectory = contentPath => {
const mainUrl = 'remoteintech.company' const mainUrl = 'remoteintech.company'
function addTargetBlankAndExternalLinkIcons (el) { function addTargetBlankAndExternalLinkIcons(el) {
if (el.type === 'tag') { if (el.type === 'tag') {
const anchorTagElements = el.children.filter(element => element.name === 'a') const anchorTagElements = el.children.filter(element => element.name === 'a');
if (anchorTagElements.length > 0) {
anchorTagElements.forEach(element => { anchorTagElements.forEach(element => {
const url = element.attribs.href const url = element.attribs.href;
const urlInfo = getUrlInfo(url) const urlInfo = getUrlInfo(url);
if (urlInfo.is_email || urlInfo.is_internal) { if (url && !urlInfo.is_email && !urlInfo.is_internal) {
return element.attribs.target = '_blank';
element.attribs.rel = 'noopener noreferrer';
const $element = $(element);
$element.append('<span style="vertical-align: text-top;"> <img src="/assets/external-link.svg" /> </span>');
} }
});
element.attribs.target = '_blank' // Recursively process child elements
el.children.forEach(child => addTargetBlankAndExternalLinkIcons(child));
$element = $( element )
$element.append('<span style="vertical-align: text-top;"> <img src="/assets/external-link.svg" /> </span>')
})
}
if (el.children && el.children.length) {
el.children.forEach(element => {
addTargetBlankAndExternalLinkIcons(element)
})
}
} }
} }
@ -172,43 +167,52 @@ exports.parseFromDirectory = contentPath => {
* Getting info about the url. It includes checking isEmail of isInternal * Getting info about the url. It includes checking isEmail of isInternal
* @param {*} url * @param {*} url
*/ */
function getUrlInfo (url) { function getUrlInfo(url) {
const data = {} const data = {};
if (url.match(/^mailto:/)) { // checking url email or not if (!url || typeof url !== 'string') {
data.is_email = true data.is_email = false;
return data data.is_internal = false;
return data;
} }
const mainDomainFromGivenUrl = extractMainDomainFromUrl(url) if (url.startsWith('mailto:')) {
data.is_email = true;
// checking url is email or not return data;
if (mainDomainFromGivenUrl !== mainUrl) {
data.is_internal = false
return data
} else {
data.is_internal = true
} }
return data try {
const mainDomainFromGivenUrl = extractMainDomainFromUrl(url);
data.is_internal = mainDomainFromGivenUrl === mainUrl;
} catch (error) {
console.error("Error processing URL:", url, error);
data.is_internal = false;
}
return data;
} }
/** /**
* Extracting main domain from the url * Extracting main domain from the url
* @param {*} url * @param {*} url
*/ */
function extractMainDomainFromUrl (url) { function extractMainDomainFromUrl(url) {
const domainRe = /(https?:\/\/){0,1}((?:[\w\d-]+\.)+[\w\d]{2,})/i; // taken example from https://stackoverflow.com/questions/6238351/fastest-way-to-detect-external-urls try {
const domainRe = /(https?:\/\/)?(([\w\d-]+\.)+[\w\d]{2,})/i; // taken example from https://stackoverflow.com/questions/6238351/fastest-way-to-detect-external-urls
const data = domainRe.exec(url);
const data = domainRe.exec(url) if (!data || !data[2]) {
console.warn("Invalid URL format:", url);
const splittedDomain = data[2].split('.') return ''; // Return empty if domain extraction fails
if (splittedDomain.length === 2) { // check extra subdomain is present or not
return data[2]
} }
return splittedDomain[splittedDomain.length - 2] + '.' + splittedDomain[splittedDomain.length - 1] // return only main domain address const domainParts = data[2].split('.');
return domainParts.length === 2 ? data[2] :
domainParts.slice(-2).join('.');
} catch (error) {
console.error("Error extracting main domain:", url, error);
return ''; // Safe fallback for unexpected input
}
} }
let lastCompanyName = null; let lastCompanyName = null;