diff options
Diffstat (limited to '')
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | background.js | 68 | ||||
| -rw-r--r-- | manifest.json | 2 |
3 files changed, 60 insertions, 12 deletions
@@ -5,7 +5,7 @@ A simple web extension that redirects Twitter, YouTube, Instagram & Google Maps requests to privacy friendly alternatives - [Nitter](https://github.com/zedeus/nitter), [Invidious](https://github.com/omarroth/invidious), [Bibliogram](https://github.com/cloudrac3r/bibliogram) & [OpenStreetMap](https://www.openstreetmap.org/). -Allows for setting custom [Nitter](https://github.com/zedeus/nitter/wiki/Instances), [Invidious](https://github.com/omarroth/invidious/wiki/Invidious-Instances), [Bibliogram](https://github.com/cloudrac3r/bibliogram/wiki/Instances) & OpenStreetMap instances and toggling all redirects on & off. +Allows for setting custom [Nitter](https://github.com/zedeus/nitter/wiki/Instances), [Invidious](https://github.com/omarroth/invidious/wiki/Invidious-Instances), [Bibliogram](https://github.com/cloudrac3r/bibliogram/wiki/Instances) & [OpenStreetMap](https://wiki.openstreetmap.org/wiki/Tile_servers) instances and toggling all redirects on & off. ## Build diff --git a/background.js b/background.js index b6575f6..4bd2f52 100644 --- a/background.js +++ b/background.js @@ -6,11 +6,18 @@ const nitterDefault = 'https://nitter.net'; const twitterRegex = /((www|mobile)\.)?twitter\.com/; const bibliogramDefault = 'https://bibliogram.art'; const instagramRegex = /((www|about|help)\.)?instagram\.com/; -const instagramPathsRegex = /(\/a|\/admin|\/api|\/favicon.ico|\/static|\/imageproxy|\/p|\/u|\/developer|\/about|\/legal|\/explore|\/director)/; +const instagramPathsRegex = /\/(a|admin|api|favicon.ico|static|imageproxy|p|u|developer|about|legal|explore|director)/; const osmDefault = 'https://openstreetmap.org'; const googleMapsRegex = /https?:\/\/(((www|maps)\.)?(google).*(\/maps)|maps\.(google).*)/; const latLngZoomRegex = /@(-?\d[0-9.]*),(-?\d[0-9.]*),(\d{1,2})[.z]/; const dataLatLngRegex = /(!3d|!4d)(-?[0-9]{1,10}.[0-9]{1,10})/g; +const latLngRegex = /-?[0-9]{1,10}.[0-9]{1,10}/; +const travelModes = { + 'driving': 'fossgis_osrm_car', + 'walking': 'fossgis_osrm_foot', + 'bicycling': 'fossgis_osrm_bike', + 'transit': 'fossgis_osrm_car' // not implemented on OSM, default to car. +}; let nitterInstance; let invidiousInstance; @@ -73,6 +80,29 @@ browser.storage.onChanged.addListener(changes => { } }); +function addressToLatLon(address, callback) { + const xmlhttp = new XMLHttpRequest(); + xmlhttp.onreadystatechange = () => { + if (xmlhttp.readyState === XMLHttpRequest.DONE) { + if (xmlhttp.status === 200) { + const json = JSON.parse(xmlhttp.responseText)[0]; + if (json) { + callback(`${json.lat}%2C${json.lon}`, json.boundingbox.join('%2C')); + } + } + else { + console.info("Error: Status is " + xmlhttp.status); + } + } + }; + xmlhttp.open( + 'GET', + `https://nominatim.openstreetmap.org/search/${address}?format=json&limit=1`, + false + ); + xmlhttp.send(); +} + function redirectYouTube(url) { if (url.host.split('.')[0] === 'studio') { // Avoid redirecting `studio.youtube.com` @@ -109,16 +139,34 @@ function redirectInstagram(url) { } function redirectGoogleMaps(url) { - // Do not redirect embedded maps - if (url.pathname.includes('/embed')) { - return; - } let mapCentre = ''; if (url.pathname.match(latLngZoomRegex)) { - [, lat, lon, zoom] = url.pathname.match(latLngZoomRegex); + const [, lat, lon, zoom] = url.pathname.match(latLngZoomRegex); mapCentre = `#map=${zoom}/${lat}/${lon}`; + } else if (url.search.includes('center=')) { + const [lat, lon] = url.searchParams.get('center').split(','); + mapCentre = `#map=${url.searchParams.get('zoom')}/${lat}/${lon}`; } - if (url.pathname.includes('data=')) { + if (url.pathname.includes('/embed')) { + const query = url.searchParams.get('q') || url.searchParams.get('query') || url.pathname.split('/')[3]; + let marker, bbox; + addressToLatLon(query, (coords, boundingbox) => { + marker = coords; + bbox = boundingbox; + }); + return `${osmInstance}/export/embed.html?bbox=${bbox}&layer=mapnik&marker=${marker}`; + } else if (url.pathname.includes('/dir')) { + const travelMode = travelModes[url.searchParams.get('travelmode')] || travelModes['driving']; + let origin; + addressToLatLon(url.searchParams.get('origin'), coords => { + origin = coords; + }); + let destination; + addressToLatLon(url.searchParams.get('destination'), coords => { + destination = coords; + }); + return `${osmInstance}/directions?engine=${travelMode}&route=${origin}%3B${destination}${mapCentre}`; + } else if (url.pathname.includes('data=')) { const [mlat, mlon] = url.pathname.match(dataLatLngRegex); return `${osmInstance}/?mlat=${mlat.replace('!3d', '')}&mlon=${mlon.replace('!4d', '')}${mapCentre}`; } else if (url.search.includes('ll=')) { @@ -126,7 +174,7 @@ function redirectGoogleMaps(url) { return `${osmInstance}/?mlat=${mlat}&mlon=${mlon}${mapCentre}`; } else { const query = url.searchParams.get('q') || url.searchParams.get('query') || url.pathname.split('/')[3]; - return `${osmInstance}/search?query=${encodeURI(query)}${mapCentre}`; + return `${osmInstance}/${query ? 'search?query=' + query : ''}${mapCentre || '#'}`; } } @@ -160,10 +208,10 @@ browser.webRequest.onBeforeRequest.addListener( } } if (redirect && redirect.redirectUrl) { - console.log( + console.info( 'Redirecting', `"${url.href}"`, '=>', `"${redirect.redirectUrl}"` ); - console.log('Details', details); + console.info('Details', details); } return redirect; }, diff --git a/manifest.json b/manifest.json index 62d482e..6ce4602 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Privacy Redirect", "description": "Redirects Twitter, YouTube, Instagram & Google Maps requests to privacy friendly alternatives.", - "version": "1.1.11", + "version": "1.1.12", "manifest_version": 2, "background": { "scripts": [ |