Merge pull request #116 from pistom/feat/115-handle-new-google-serp-r…

…edesign feat: check for dirrect url in results
pistom · Feb 1, 2020 · ba3460b · ba3460b
2 parents 46128bd + bc6af4f
commit ba3460b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/public/manifests/chrome.json b/public/manifests/chrome.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Highlight or Hide Search Engine Results",
   "short_name": "HoHSER",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "description": "Filter search engine results. Block unwanted results and highlight the favorite ones. For Google and other popular search engines.",
   "icons": {
     "19": "images/hohser-19.png",

diff --git a/public/manifests/firefox.json b/public/manifests/firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Highlight or Hide Search Engine Results",
   "short_name": "HoHSER",
-  "version": "3.3.3",
+  "version": "3.4.0",
   "developer": {
     "name": "Tomasz Pisarek",
     "url": "https://github.com/pistom"

diff --git a/src/config/google.ts b/src/config/google.ts
@@ -3,5 +3,6 @@ import { SearchEngineConfig } from '../types';
 export const google: SearchEngineConfig = {
   resultSelector: '.g, .mnr-c, .rg_bx, .rg_di, .rg_el, .ZINbbc, .JP1Bwd',
   domainSelector: '.TbwUpd, .dTe0Ie, .xQ82C, .e8fRJf, .FnqxG, .BNeawe, .pDavDe',
-  observerSelector: '#rcnt, #cnt, #rg, #main'
+  observerSelector: '#rcnt, #cnt, #rg, #main',
+  resultUrlSelector: '.r > a'
 };
diff --git a/src/content.tsx b/src/content.tsx
@@ -95,13 +95,17 @@ function processResult (r: Element, domainList: any, options: any, processResult
   try {
     const result = r as HTMLElement;
     result.classList.add('hohser_result');
-    const domain = result.querySelector(
-      searchEngineConfig.domainSelector
-    ) as HTMLElement;
+    const domain = searchEngineConfig.resultUrlSelector &&
+      result.querySelector(
+        searchEngineConfig.resultUrlSelector
+      ) as HTMLAnchorElement ||
+      result.querySelector(
+        searchEngineConfig.domainSelector
+      ) as HTMLElement;
     // Skip result if no domain selector
     if (!domain) return displayStyle;
 
-    const url = domain.innerText;
+    const url = (domain as HTMLAnchorElement).href || (domain as HTMLElement).innerText;
     if (!url) {
       throw new Error("No domain info");
     }

diff --git a/src/types/index.ts b/src/types/index.ts
@@ -21,6 +21,7 @@ export interface SearchEngineConfig {
   domainSelector: string;
   observerSelector: string;
   ajaxResults?: boolean;
+  resultUrlSelector?: string;
 }
 
 export interface StoreState {