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

More reliable element detection for search result re-ordering

pull/623/head
Kevin Payravi 2024-03-22 03:23:50 -05:00 committed by GitHub
parent 8f1bf366e7
commit 1c4ae5ff8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/content-search-filtering.js
View File

@ -492,15 +492,32 @@ async function _filterSearchResult(matchingSite, searchResult, searchEngine, cou
return countFiltered; return countFiltered;
} }
async function _reorderDestinationSearchResult(resultsFirstChild, matchingDest, searchResult) { async function _reorderDestinationSearchResult(resultsFirstChild, searchResult) {
const searchContainer = searchResult.closest('#rso > div, #main > div'); // Find containing element for the search result
const closestJsController = searchResult.closest('div[jscontroller]');
const closestDataDiv = searchResult.closest('div[data-hveid].g') || searchResult.closest('div[data-hveid]');
searchResultContainer = findClosestElement(searchResult, [closestJsController, closestDataDiv]);
if (!resultsFirstChild || !searchContainer || searchContainer.classList.contains('iwb-reordered')) { // Find the element holding the search results,
// to prepend the destination wiki result
let searchResultsList = document.querySelector('#search') || document.querySelector('#topstuff');
if (!searchResultsList) {
if (document.querySelector('#main')) {
var el = document.querySelector('#main');
if (el.querySelector('#main > div[data-hveid]')) {
searchResultsList = el.querySelector('div[data-hveid]');
} else {
searchResultsList = el.querySelector('div div[data-hveid]').parentElement;
}
};
}
if (!resultsFirstChild || !searchResultContainer || searchResultContainer.classList.contains('iwb-reordered')) {
return; return;
} }
searchContainer.classList.add('iwb-reordered'); searchResultContainer.classList.add('iwb-reordered');
resultsFirstChild.insertAdjacentElement('beforebegin', searchContainer); searchResultsList.prepend(searchResultContainer);
} }
async function reorderSearchResults(searchResults, searchEngine, storage) { async function reorderSearchResults(searchResults, searchEngine, storage) {
@ -516,8 +533,11 @@ async function reorderSearchResults(searchResults, searchEngine, storage) {
if (searchEngine !== 'google') return; if (searchEngine !== 'google') return;
// Get the first element in the results container // Get the first element in the results container
let resultsFirstChild = document.querySelector('#rso > div'); // desktop let resultsFirstChild = document.querySelector('#rso div[data-hveid].g') ||
if (!resultsFirstChild) resultsFirstChild = document.querySelector('#main > div:has(div[data-hveid])'); // FF mobile document.querySelector('#main div[data-hveid].g') ||
document.querySelector('#rso div[data-hveid]') ||
document.querySelector('#main div[data-hveid]');
if (!resultsFirstChild) return; if (!resultsFirstChild) return;
let crossLanguageSetting = storage.crossLanguage || 'off'; let crossLanguageSetting = storage.crossLanguage || 'off';
@ -540,7 +560,7 @@ async function reorderSearchResults(searchResults, searchEngine, storage) {
console.debug('Indie Wiki Buddy is not re-ordering results, as an indie wiki is already the first result.'); console.debug('Indie Wiki Buddy is not re-ordering results, as an indie wiki is already the first result.');
break; break;
} else { } else {
await _reorderDestinationSearchResult(resultsFirstChild, matchingDest, searchResult); await _reorderDestinationSearchResult(resultsFirstChild, searchResult);
reorderedHrefs.push(searchResultLink); reorderedHrefs.push(searchResultLink);
} }
} }