From ed3941ff7281254ddb9a7cb8acef3bbf4c1d5d0f Mon Sep 17 00:00:00 2001 From: SimonBrazell Date: Sat, 1 Feb 2020 14:17:51 +1100 Subject: [PATCH] Add support for Bibliogram redirects --- README.md | 9 ++++--- background.js | 53 ++++++++++++++++++++++++++++++++------ manifest.json | 4 +-- pages/options/options.html | 11 ++++++++ pages/options/options.js | 27 ++++++++++++++----- pages/popup/popup.html | 13 +++++++++- pages/popup/popup.js | 31 ++++++++++++++++++---- 7 files changed, 122 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index a270372..515e0eb 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,14 @@ - [Chrome Extension](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb) - [Firefox Add-on](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) -A simple browser extension that redirects Twitter & Youtube requests to privacy friendly alternatives - [Nitter](https://github.com/zedeus/nitter) & [Invidious](https://github.com/omarroth/invidious). +A simple browser extension that redirects Twitter, Youtube & Instagram requests to privacy friendly alternatives - [Nitter](https://github.com/zedeus/nitter), [Invidious](https://github.com/omarroth/invidious) & [Bibliogram](https://github.com/cloudrac3r/bibliogram). -Listens for and redirects requests made to `twitter.com`, `www.twitter.com`, `mobile.twitter.com`, `youtube.com`, `www.youtube.com`, `youtube-nocookie.com`, `www.youtube-nocookie.com`, and `m.youtube.com`. +Listens for and redirects requests made to the following: + - **Twitter -** `twitter.com`, `www.twitter.com`, `mobile.twitter.com` + - **Youtube -** `youtube.com`, `www.youtube.com`, `youtube-nocookie.com`, `www.youtube-nocookie.com`, `m.youtube.com` + - **Instagram -** `instagram.com`, `www.instagram.com`, `help.instagram.com`, `about.instagram.com`. -Allows for setting custom [Nitter](https://github.com/zedeus/nitter/wiki/Instances) & [Invidious](https://github.com/omarroth/invidious/wiki/Invidious-Instances) instances and toggling 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) instances and toggling redirects on & off. ## Build diff --git a/background.js b/background.js index 8d6c6b3..a328488 100644 --- a/background.js +++ b/background.js @@ -1,23 +1,36 @@ 'use strict'; const nitterDefault = 'https://nitter.net'; +const twitterRegex = /((www|mobile)\.)?twitter\.com/; const invidiousDefault = 'https://invidio.us'; const youtubeRegex = /((www|m)\.)?youtube(-nocookie)?\.com/; -const twitterRegex = /((www|mobile)\.)?twitter\.com/; -const pathRegex = /^https?:\/\/[^\/]+([\S\s]*)/; +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)/; let nitterInstance; let invidiousInstance; +let bibliogramInstance; let disableNitter; let disableInvidious; +let disableBibliogram; chrome.storage.sync.get( - ['disableNitter', 'disableInvidious', 'nitterInstance', 'invidiousInstance'], + [ + 'nitterInstance', + 'invidiousInstance', + 'bibliogramInstance', + 'disableNitter', + 'disableInvidious', + 'disableBibliogram' + ], result => { disableNitter = result.disableNitter; disableInvidious = result.disableInvidious; + disableBibliogram = result.disableBibliogram; nitterInstance = result.nitterInstance || nitterDefault; invidiousInstance = result.invidiousInstance || invidiousDefault; + bibliogramInstance = result.bibliogramInstance || bibliogramDefault; } ); @@ -28,32 +41,56 @@ chrome.storage.onChanged.addListener(changes => { if ('invidiousInstance' in changes) { invidiousInstance = changes.invidiousInstance.newValue || invidiousDefault; } + if ('bibliogramInstance' in changes) { + bibliogramInstance = changes.bibliogramInstance.newValue || bibliogramDefault; + } if ('disableNitter' in changes) { disableNitter = changes.disableNitter.newValue; } if ('disableInvidious' in changes) { disableInvidious = changes.disableInvidious.newValue; } + if ('disableBibliogram' in changes) { + disableBibliogram = changes.disableBibliogram.newValue; + } }); +function redirectBibliogram(url) { + if (url.pathname === '/' || url.pathname.match(instagramPathsRegex)) { + return bibliogramInstance + url.pathname; + } else { + // Redirect user profile requests to '/u/...' + return `${bibliogramInstance}/u${url.pathname}`; + } +} + chrome.webRequest.onBeforeRequest.addListener( details => { + const url = new URL(details.url); let redirect; - if (details.url.match(youtubeRegex)) { + if (url.host.match(youtubeRegex)) { if (!disableInvidious) { redirect = { - redirectUrl: invidiousInstance + details.url.match(pathRegex)[1] + redirectUrl: invidiousInstance + url.pathname }; } - } else if (details.url.match(twitterRegex)) { + } else if (url.host.match(twitterRegex)) { if (!disableNitter) { redirect = { - redirectUrl: nitterInstance + details.url.match(pathRegex)[1] + redirectUrl: nitterInstance + url.pathname + }; + } + } else if (url.host.match(instagramRegex)) { + if (!disableBibliogram) { + redirect = { + redirectUrl: redirectBibliogram(url) }; } } if (redirect) { - console.log('Redirecting', `"${details.url}"`, '=>', `"${redirect.redirectUrl}"`); + console.log( + 'Redirecting', `"${url.host}"`, '=>', `"${redirect.redirectUrl}"` + ); console.log('Details', details); } return redirect; diff --git a/manifest.json b/manifest.json index 90c8691..315ec5e 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Privacy Redirect", - "description": "Redirects Twitter & Youtube requests to privacy friendly alternatives (Nitter & Invidious).", - "version": "1.1.3", + "description": "Redirects Twitter, Youtube & Instagram requests to privacy friendly alternatives - Nitter, Invidious, & Bibliogram.", + "version": "1.1.4", "manifest_version": 2, "background": { "scripts": [ diff --git a/pages/options/options.html b/pages/options/options.html index 124aa4b..4dde26f 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -29,11 +29,22 @@ +
+
+

Bibliogram Redirects

+   + +
+
+

Nitter Instance

Invidious Instance

+

Bibliogram Instance

+