Merge b273c85e51 into 2d46e8895e

We now have on loop that checks which results we want to re-order, and then a second loop that actually does the re-ordering.

data/sitesEN.json

@@ -1738,8 +1738,8 @@
     "destination_platform": "mediawiki",
     "destination_icon": "liquipediadota2wiki.png",
     "destination_main_page": "Main_Page",
-    "destination_search_path": "/dota2/index.php",
-    "destination_content_path": "/dota2/"
+    "destination_search_path": "/dota2game/index.php",
+    "destination_content_path": "/dota2game/"
   },
   {
     "id": "en-dotflow",
@@ -3901,6 +3901,12 @@
         "origin_base_url": "minecraftdungeons.wiki.fextralife.com",
         "origin_content_path": "/",
         "origin_main_page": "Minecraft+Dungeons+Wiki"
+      },
+      {
+        "origin": "Minecraft Story Mode Fandom Wiki",
+        "origin_base_url": "minecraftstorymode.fandom.com",
+        "origin_content_path": "/wiki/",
+        "origin_main_page": "Minecraft_Story_Mode_Wiki"
       }
     ],
     "destination": "Minecraft Wiki",
@@ -5153,7 +5159,7 @@
     "destination_icon": "scpslwiki.png",
     "destination_main_page": "Main_Page",
     "destination_search_path": "/index.php",
-    "destination_content_path": "/index.php?title="
+    "destination_content_path": "/index.php?title=",
     "tags": [
       "official"
     ]
@@ -6745,7 +6751,7 @@
     "destination_base_url": "wiki.wesnoth.org",
     "destination_platform": "mediawiki",
     "destination_icon": "thebattleforwesnothwiki.png",
-    "destination_main_page": "Main_Page",
+    "destination_main_page": "StartingPoints",
     "destination_search_path": "/index.php",
     "destination_content_path": "/",
     "tags": [
@@ -6986,6 +6992,25 @@
     "destination_search_path": "/index.php",
     "destination_content_path": "/w/"
   },
+  {
+    "id": "en-xkcd",
+    "origins_label": "xkcd Fandom Wiki",
+    "origins": [
+      {
+        "origin": "xkcd Fandom Wiki",
+        "origin_base_url": "xkcd.fandom.com",
+        "origin_content_path": "/wiki/",
+        "origin_main_page": "Xkcd_Wiki"
+      }
+    ],
+    "destination": "explain xkcd",
+    "destination_base_url": "www.explainxkcd.com",
+    "destination_platform": "mediawiki",
+    "destination_icon": "explainxkcd.png",
+    "destination_main_page": "Main_Page",
+    "destination_search_path": "/wiki/index.php",
+    "destination_content_path": "/wiki/index.php/"
+  },
   {
     "id": "en-yugioh",
     "origins_label": "Yu-Gi-Oh! Fandom & Neoseeker Wikis",

scripts/content-search-filtering.js

@@ -548,11 +548,8 @@ async function reorderSearchResults(searchResults, searchEngine, storage) {
     if (!resultsFirstChild) return;
 
     let crossLanguageSetting = storage.crossLanguage || 'off';
+    let resultsToSort = [];
 
-    // Re-order search results
-    // This is so that higher results are re-ordered to the top last
-    searchResults = searchResults.reverse();
-    
     for (const searchResult of searchResults) {
       try {
         if (searchResult.closest('.iwb-detected')) {
@@ -573,8 +570,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.');
               break;
             } else {
-              await reorderDestinationSearchResult(resultsFirstChild, searchResult);
-              reorderedHrefs.push(searchResultLink);
+              resultsToSort.push(searchResult);
             }
           }
         }
@@ -582,6 +578,19 @@ async function reorderSearchResults(searchResults, searchEngine, storage) {
         console.log('Indie Wiki Buddy failed to properly re-order search results with error: ' + e);
       }
     }
+
+    // Reverse order of resultsToSort,
+    // to restore top-down order.
+    resultsToSort = resultsToSort.reverse();
+
+    for (const searchResult of resultsToSort) {
+      try {
+        await reorderDestinationSearchResult(resultsFirstChild, searchResult);
+        reorderedHrefs.push(searchResultLink);
+      } catch (e) {
+        console.log('Indie Wiki Buddy failed to properly re-order search results with error: ' + e);
+      }
+    }
   }
 
   return reorderedHrefs;
@@ -664,7 +673,7 @@ function startFiltering(searchEngine, storage, mutations = null, observer = null
           let searchResults = document.querySelectorAll("div[data-hveid] a:first-of-type:not([role='button']):not([target='_self'])");
 
           // Remove any matches that are not "standard" search results - this could've been done with :has() but limited browser support right now
-          searchResults = Array.from(searchResults).filter((e) => !e.closest('g-section-with-header'));
+          searchResults = Array.from(searchResults).filter((e) => !e.closest('g-section-with-header, div[jsname]'));
 
           return await reorderSearchResults(searchResults, 'google', storage);
         }