devol/libredirect
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added wikipedia tor support #32

Browse Source
This commit is contained in:
ManeraKai 2022-02-22 23:52:38 +03:00
parent 0caf899239
commit 2570cd8d32
No known key found for this signature in database
GPG Key ID: 5ABC31FFD562E337
9 changed files with 438 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/assets/javascripts/helpers/instagram.js
View File

@ -9,17 +9,8 @@ const targets = [
];
let redirects = {
"bibliogram": {
"normal": [
"https://bibliogram.art",
"https://bibliogram.snopyta.org",
"https://bibliogram.pussthecat.org",
"https://bibliogram.1d4.us",
"https://insta.trom.tf",
"https://bib.riverside.rocks",
"https://bibliogram.esmailelbob.xyz",
"https://bib.actionsack.com",
"https://biblio.alefvanoon.xyz"
]
"normal": [],
"tor": []
}
};
const getRedirects = () => redirects;
@ -50,6 +41,14 @@ function setBibliogramNormalRedirectsChecks(val) {
console.log("bibliogramNormalRedirectsChecks: ", val)
}
let bibliogramTorRedirectsChecks;
const getBibliogramTorRedirectsChecks = () => bibliogramTorRedirectsChecks;
function setBibliogramTorRedirectsChecks(val) {
bibliogramTorRedirectsChecks = val;
browser.storage.local.set({ bibliogramTorRedirectsChecks })
console.log("bibliogramTorRedirectsChecks: ", val)
}
let bibliogramNormalCustomRedirects = [];
const getBibliogramNormalCustomRedirects = () => bibliogramNormalCustomRedirects;
function setBibliogramNormalCustomRedirects(val) {
@ -58,6 +57,14 @@ function setBibliogramNormalCustomRedirects(val) {
console.log("bibliogramNormalCustomRedirects: ", val)
}
let bibliogramTorCustomRedirects = [];
const getBibliogramTorCustomRedirects = () => bibliogramTorCustomRedirects;
function setBibliogramTorCustomRedirects(val) {
bibliogramTorCustomRedirects = val;
browser.storage.local.set({ bibliogramTorCustomRedirects })
console.log("bibliogramTorCustomRedirects: ", val)
}
const reservedPaths = [
"about",
"explore",
@ -93,6 +100,14 @@ function setDisable(val) {
browser.storage.local.set({ disableInstagram: disable })
}
let protocol;
const getprotocol = () => protocol;
function setProtocol(val) {
protocol = val;
browser.storage.local.set({ nitterProtocol: val })
console.log("nitterProtocol: ", val)
}
function isInstagram(url, initiator) {
if (disable) return false;
if (
@ -107,7 +122,10 @@ function redirect(url, type) {
if (type !== "main_frame" || url.pathname.match(bypassPaths))
return 'CANCEL'; // Do not redirect /accounts, /embeds.js, or anything other than main_frame
let instancesList = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects];
let instancesList;
if (protocol == 'normal') instancesList = [...bibliogramNormalRedirectsChecks, ...bibliogramNormalCustomRedirects];
else if (protocol == 'tor') instancesList = [...bibliogramTorRedirectsChecks, ...bibliogramTorCustomRedirects];
if (instancesList.length === 0) return null;
let randomInstance = commonHelper.getRandomInstance(instancesList)
@ -120,25 +138,40 @@ function redirect(url, type) {
async function init() {
return new Promise((resolve) => {
fetch('/instances/data.json').then(response => response.text()).then(data => {
let dataJson = JSON.parse(data);
browser.storage.local.get(
[
"disableInstagram",
"instagramRedirects",
"bibliogramNormalRedirectsChecks",
"bibliogramTorRedirectsChecks",
"bibliogramNormalCustomRedirects",
"bibliogramTorCustomRedirects",
"bibliogramProtocol"
],
(result) => {
disable = result.disableInstagram ?? false;
redirects.bibliogram = dataJson.bibliogram;
if (result.instagramRedirects) redirects = result.instagramRedirects
bibliogramNormalRedirectsChecks = result.bibliogramNormalRedirectsChecks ?? [...redirects.bibliogram.normal];
bibliogramNormalCustomRedirects = result.bibliogramNormalCustomRedirects ?? [];
bibliogramTorRedirectsChecks = result.bibliogramTorRedirectsChecks ?? [...redirects.bibliogram.tor];
bibliogramTorCustomRedirects = result.bibliogramTorCustomRedirects ?? [];
protocol = result.bibliogramProtocol ?? "normal";
resolve();
}
)
})
})
}
export default {
@ -149,11 +182,18 @@ export default {
getDisable,
setDisable,
getprotocol,
setProtocol,
getBibliogramNormalRedirectsChecks,
setBibliogramNormalRedirectsChecks,
getBibliogramTorRedirectsChecks,
setBibliogramTorRedirectsChecks,
getBibliogramNormalCustomRedirects,
setBibliogramNormalCustomRedirects,
getBibliogramTorCustomRedirects,
setBibliogramTorCustomRedirects,
isInstagram,

4
src/assets/javascripts/helpers/twitter.js
View File

@ -149,6 +149,8 @@ async function init() {
(result) => {
disable = result.disableTwitter ?? false;
protocol = result.nitterProtocol ?? "normal";
redirects.nitter = dataJson.nitter;
if (result.twitterRedirects) redirects = result.twitterRedirects;
@ -158,8 +160,6 @@ async function init() {
nitterTorRedirectsChecks = result.nitterTorRedirectsChecks ?? [...redirects.nitter.tor];
nitterTorCustomRedirects = result.nitterTorCustomRedirects ?? [];
protocol = result.nitterProtocol ?? "normal";
resolve();
}
);

62
src/assets/javascripts/helpers/wikipedia.js
View File

@ -21,10 +21,12 @@ const getRedirects = () => redirects;
const getCustomRedirects = function () {
return {
"wikiless": {
"normal": [...wikilessNormalRedirectsChecks, ...wikilessNormalCustomRedirects]
"normal": [...wikilessNormalRedirectsChecks, ...wikilessNormalCustomRedirects],
"tor": [...wikilessTorRedirectsChecks, ...wikilessTorCustomRedirects]
},
};
};
function setRedirects(val) {
redirects.wikiless = val;
browser.storage.local.set({ wikipediaRedirects: redirects })
@ -35,6 +37,13 @@ function setRedirects(val) {
if (index !== -1) wikilessNormalRedirectsChecks.splice(index, 1);
}
setWikilessNormalRedirectsChecks(wikilessNormalRedirectsChecks);
for (const item of wikilessTorRedirectsChecks)
if (!redirects.wikiless.normal.includes(item)) {
var index = wikilessTorRedirectsChecks.indexOf(item);
if (index !== -1) wikilessTorRedirectsChecks.splice(index, 1);
}
setWikilessTorRedirectsChecks(wikilessTorRedirectsChecks);
}
let disable;
@ -44,6 +53,15 @@ function setDisable(val) {
browser.storage.local.set({ disableWikipedia: disable })
}
let protocol;
const getProtocol = () => protocol;
function setProtocol(val) {
protocol = val;
browser.storage.local.set({ wikilessProtocol: val })
console.log("wikilessProtocol: ", val)
}
let wikilessNormalRedirectsChecks;
const getWikilessNormalRedirectsChecks = () => wikilessNormalRedirectsChecks;
function setWikilessNormalRedirectsChecks(val) {
@ -52,6 +70,15 @@ function setWikilessNormalRedirectsChecks(val) {
console.log("wikilessNormalRedirectsChecks: ", val)
}
let wikilessTorRedirectsChecks;
const getWikilessTorRedirectsChecks = () => wikilessTorRedirectsChecks;
function setWikilessTorRedirectsChecks(val) {
wikilessTorRedirectsChecks = val;
browser.storage.local.set({ wikilessTorRedirectsChecks })
console.log("wikilessTorRedirectsChecks: ", val)
}
let wikilessNormalCustomRedirects = [];
const getWikilessNormalCustomRedirects = () => wikilessNormalCustomRedirects;
function setWikilessNormalCustomRedirects(val) {
@ -60,6 +87,14 @@ function setWikilessNormalCustomRedirects(val) {
console.log("wikilessNormalCustomRedirects: ", val)
}
let wikilessTorCustomRedirects = [];
const getWikilessTorCustomRedirects = () => wikilessTorCustomRedirects;
function setWikilessTorCustomRedirects(val) {
wikilessTorCustomRedirects = val;
browser.storage.local.set({ wikilessTorCustomRedirects })
console.log("wikilessTorCustomRedirects: ", val)
}
function isWikipedia(url, initiator) {
if (disable) return false;
return targets.test(url.href);
@ -75,8 +110,9 @@ function redirect(url) {
GETArguments.push([args[0], args[1]]);
}
}
let instancesList = [...wikilessNormalRedirectsChecks, ...wikilessNormalCustomRedirects];
let instancesList;
if (protocol == 'normal') instancesList = [...wikilessNormalRedirectsChecks, ...wikilessNormalCustomRedirects];
else if (protocol == 'tor') instancesList = [...wikilessTorRedirectsChecks, ...wikilessTorCustomRedirects];
if (instancesList.length === 0) return null;
let randomInstance = commonHelper.getRandomInstance(instancesList)
@ -100,24 +136,37 @@ function redirect(url) {
async function init() {
return new Promise((resolve) => {
fetch('/instances/data.json').then(response => response.text()).then(data => {
let dataJson = JSON.parse(data);
browser.storage.local.get(
[
"disableWikipedia",
"wikipediaRedirects",
"wikilessNormalRedirectsChecks",
"wikilessTorRedirectsChecks",
"wikilessNormalCustomRedirects",
"wikilessTorCustomRedirects",
"wikilessProtocol"
], (result) => {
disable = result.disableWikipedia ?? false;
protocol = result.wikilessProtocol ?? "normal";
redirects.wikiless = dataJson.wikiless;
if (result.wikipediaRedirects) redirects = result.wikipediaRedirects;
wikilessNormalRedirectsChecks = result.wikilessNormalRedirectsChecks ?? [...redirects.wikiless.normal];
wikilessNormalCustomRedirects = result.wikilessNormalCustomRedirects ?? [];
wikilessTorRedirectsChecks = result.wikilessTorRedirectsChecks ?? [...redirects.wikiless.tor];
wikilessTorCustomRedirects = result.wikilessTorCustomRedirects ?? [];
resolve();
}
);
});
});
}
export default {
@ -128,11 +177,18 @@ export default {
setDisable,
getDisable,
getProtocol,
setProtocol,
getWikilessNormalRedirectsChecks,
setWikilessNormalRedirectsChecks,
getWikilessTorRedirectsChecks,
setWikilessTorRedirectsChecks,
getWikilessNormalCustomRedirects,
setWikilessNormalCustomRedirects,
getWikilessTorCustomRedirects,
setWikilessTorCustomRedirects,
redirect,
isWikipedia,

6
src/instances/data.json
View File

@ -73,7 +73,8 @@
"https://tw.artemislena.eu",
"https://de.nttr.stream",
"https://nitter.winscloud.net",
"https://nitter.tiekoetter.com"
"https://nitter.tiekoetter.com",
"https://nitter.spaceint.fr"
],
"tor": [
"http://3nzoldnxplag42gqjs23xvghtzf6t6yzssrtytnntc6ppc7xxuoneoad.onion",
@ -105,7 +106,8 @@
"https://bibliogram.esmailelbob.xyz",
"https://bib.actionsack.com",
"https://biblio.alefvanoon.xyz"
]
],
"tor": []
},
"teddit": {
"normal": [

1
src/instances/get_instances.py
View File

@ -59,6 +59,7 @@ r = requests.get('https://bibliogram.art/api/instances')
rJson = json.loads(r.text)
bibliogramList = {}
bibliogramList['normal'] = []
bibliogramList['tor'] = []
for item in rJson['data']:
bibliogramList['normal'].append(item['address'])
mightyList['bibliogram'] = bibliogramList

37
src/pages/options/instagram/instagram.html
View File

@ -114,8 +114,16 @@
<input id="disable-bibliogram" type="checkbox" checked />
</div>
<hr>
<div class="some-block option-block">
<h4>Protocol</h4>
<select id="protocol">
<option value="normal">Normal</option>
<option value="tor">Tor</option>
</select>
</div>
<hr>
<div id="normal">
<div class="some-block option-block">
<h4>Default Instances</h4>
</div>
@ -128,8 +136,7 @@
<div class="some-block option-block">
<input id="bibliogram-normal-custom-instance" placeholder="https://bibliogram.com" type="url" />
<button type="submit" class="add" id="bibliogram-normal-add-instance">
<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px"
fill="currentColor">
<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
<path d="M0 0h24v24H0V0z" fill="none" />
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</svg>
@ -137,6 +144,30 @@
</div>
</form>
<div class="checklist" id="bibliogram-normal-custom-checklist"></div>
</div>
<div id="tor">
<div class="some-block option-block">
<h4>Default Instances</h4>
</div>
<div class="checklist" id="bibliogram-tor-checklist"></div>
<hr>
<div class="some-block option-block">
<h4>Custom Instances</h4>
</div>
<form id="custom-bibliogram-tor-instance-form">
<div class="some-block option-block">
<input id="bibliogram-tor-custom-instance" placeholder="https://bibliogram.com" type="url" />
<button type="submit" class="add" id="bibliogram-tor-add-instance">
<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px" fill="currentColor">
<path d="M0 0h24v24H0V0z" fill="none" />
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</svg>
</button>
</div>
</form>
<div class="checklist" id="bibliogram-tor-custom-checklist"></div>
</div>
</section>
<script type="module" src="../init.js"></script>

38
src/pages/options/instagram/instagram.js
View File

@ -6,9 +6,36 @@ disableInstagramElement.addEventListener("change",
(event) => instagramHelper.setDisable(!event.target.checked)
);
let protocolElement = document.getElementById("protocol")
protocolElement.addEventListener("change",
(event) => {
let protocol = event.target.options[protocolElement.selectedIndex].value
instagramHelper.setProtocol(protocol);
changeProtocolSettings(protocol);
}
);
function changeProtocolSettings(protocol) {
let normalDiv = document.getElementById("normal");
let torDiv = document.getElementById("tor");
if (protocol == 'normal') {
normalDiv.style.display = 'block';
torDiv.style.display = 'none';
}
else if (protocol == 'tor') {
normalDiv.style.display = 'none';
torDiv.style.display = 'block';
}
}
instagramHelper.init().then(() => {
disableInstagramElement.checked = !instagramHelper.getDisable();
let protocol = instagramHelper.getprotocol();
protocolElement.value = protocol;
changeProtocolSettings(protocol);
commonHelper.processDefaultCustomInstances(
'bibliogram',
'normal',
@ -19,4 +46,15 @@ instagramHelper.init().then(() => {
instagramHelper.getBibliogramNormalCustomRedirects,
instagramHelper.setBibliogramNormalCustomRedirects
)
commonHelper.processDefaultCustomInstances(
'bibliogram',
'tor',
instagramHelper,
document,
instagramHelper.getBibliogramTorRedirectsChecks,
instagramHelper.setBibliogramTorRedirectsChecks,
instagramHelper.getBibliogramTorCustomRedirects,
instagramHelper.setBibliogramTorCustomRedirects
)
})

36
src/pages/options/wikipedia/wikipedia.html
View File

@ -112,8 +112,18 @@
<input id="disable-wikipedia" type="checkbox" checked />
</div>
<div class="some-block option-block">
<h4>Protocol</h4>
<select id="protocol">
<option value="normal">Normal</option>
<option value="tor">Tor</option>
</select>
</div>
<hr>
<div id="normal">
<div class="some-block option-block">
<h4>Default Instances</h4>
</div>
@ -136,7 +146,33 @@
</div>
</form>
<div class="checklist" id="wikiless-normal-custom-checklist"></div>
</div>
<div id="tor">
<div class="some-block option-block">
<h4>Default Instances</h4>
</div>
<div class="checklist" id="wikiless-tor-checklist">
</div>
<hr>
<div class="some-block option-block">
<h4>Custom Instances</h4>
</div>
<form id="custom-wikiless-tor-instance-form">
<div class="some-block option-block">
<input id="wikiless-tor-custom-instance" placeholder="https://wikiless.com" type="url" />
<button type="submit" class="add" id="wikiless-tor-add-instance">
<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 0 24 24" width="20px"
fill="currentColor">
<path d="M0 0h24v24H0V0z" fill="none" />
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</svg>
</button>
</div>
</form>
<div class="checklist" id="wikiless-tor-custom-checklist"></div>
</div>
</section>
<script type="module" src="../init.js"></script>

39
src/pages/options/wikipedia/wikipedia.js
View File

@ -5,9 +5,37 @@ let disableWikipediaElement = document.getElementById("disable-wikipedia");
disableWikipediaElement.addEventListener("change",
(event) => wikipediaHelper.setDisable(!event.target.checked)
);
let protocolElement = document.getElementById("protocol")
protocolElement.addEventListener("change",
(event) => {
let protocol = event.target.options[protocolElement.selectedIndex].value
wikipediaHelper.setProtocol(protocol);
changeProtocolSettings(protocol);
}
);
function changeProtocolSettings(protocol) {
let normalDiv = document.getElementById("normal");
let torDiv = document.getElementById("tor");
if (protocol == 'normal') {
normalDiv.style.display = 'block';
torDiv.style.display = 'none';
}
else if (protocol == 'tor') {
normalDiv.style.display = 'none';
torDiv.style.display = 'block';
}
}
wikipediaHelper.init().then(() => {
disableWikipediaElement.checked = !wikipediaHelper.getDisable();
let protocol = wikipediaHelper.getProtocol();
protocolElement.value = protocol;
changeProtocolSettings(protocol);
commonHelper.processDefaultCustomInstances(
'wikiless',
'normal',
@ -18,4 +46,15 @@ wikipediaHelper.init().then(() => {
wikipediaHelper.getWikilessNormalCustomRedirects,
wikipediaHelper.setWikilessNormalCustomRedirects
)
commonHelper.processDefaultCustomInstances(
'wikiless',
'tor',
wikipediaHelper,
document,
wikipediaHelper.getWikilessTorRedirectsChecks,
wikipediaHelper.setWikilessTorRedirectsChecks,
wikipediaHelper.getWikilessTorCustomRedirects,
wikipediaHelper.setWikilessTorCustomRedirects
)
})