kouhais-mirrors
/
safer-indie-wiki-buddy
mirror of https://github.com/KevinPayravi/indie-wiki-buddy.git
1
0
Fork 0
Code

Improvements and fixes for link matching

pull/400/head
Kevin Payravi 2023-12-19 04:06:14 -05:00
parent fa268d5f94
commit 472c05317f
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
background.js
View File

@ -347,7 +347,7 @@ async function main(url, tabId) {
// Get article name from the end of the URL;
// We can't just take the last part of the path due to subpages;
// Instead, we take everything after the wiki's base URL + content path
let article = decodeURIComponent(url.split(site['origin_base_url'] + site['origin_content_path'])[1]);
let article = decodeURIComponent(url.split(site['origin_base_url'] + site['origin_content_path'])[1] || '');
// Set up URL to redirect user to based on wiki platform
let newURL = '';
if (article) {

2
content-banners.js
View File

@ -285,7 +285,7 @@ function main() {
// Get article name from the end of the URL;
// We can't just take the last part of the path due to subpages;
// Instead, we take everything after the wiki's base URL + content path:
let article = decodeURIComponent(String(origin).split(site['origin_content_path'])[1]);
let article = decodeURIComponent(String(origin).split(site['origin_base_url'] + site['origin_content_path'])[1] || '');
// Set up URL to redirect user to based on wiki platform:
let newURL = '';
if (article) {

5
content-search-filtering.js
View File

@ -195,7 +195,7 @@ function escapeRegex(string) {
function replaceSearchResults(searchResultContainer, site, link) {
// Build new URL:
let article = decodeURIComponent(link.split(site['origin_content_path'])[1]?.split('#')[0].split('?')[0].split('&')[0]);
let article = decodeURIComponent((link.split(site['origin_base_url'] + site['origin_content_path'])[1] || '').split('#')[0].split('?')[0].split('&')[0]);
let newURL = '';
if (article) {
// Check if main page
@ -423,7 +423,8 @@ function filterSearchResults(searchResults, searchEngine, storage) {
if (crossLanguageSetting === 'on') {
matchingSites = sites.filter(el => link.replace(/.*https?:\/\//, '').startsWith(el.origin_base_url));
} else {
matchingSites = sites.filter(el => link.replace(/.*https?:\/\//, '').startsWith(el.origin_base_url + el.origin_content_path));
matchingSites = sites.filter(el => link.replace(/.*https?:\/\//, '') === (el.origin_base_url));
matchingSites = matchingSites.concat(sites.filter(el => link.replace(/.*https?:\/\//, '').startsWith(el.origin_base_url + el.origin_content_path)));
}
if (matchingSites.length > 0) {
// Select match with longest base URL