[tbb-commits] [tor-browser/tor-browser-91.2.0esr-11.0-1] squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

[sysrqb at torproject.org]

commit 20b3201a603f8e891b413f5ba4528811b64e0916
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Sep 3 17:40:27 2021 +0000

    squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
    
    Bug 40438: Add Blockchair as a search engine
---
 .../search/extensions/blockchair-onion/favicon.png | Bin 0 -> 947 bytes
 .../extensions/blockchair-onion/manifest.json      |  26 +++++++++++++++++++++
 .../search/extensions/blockchair/favicon.png       | Bin 0 -> 947 bytes
 .../search/extensions/blockchair/manifest.json     |  26 +++++++++++++++++++++
 toolkit/components/search/SearchService.jsm        |  12 ++++++----
 5 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/browser/components/search/extensions/blockchair-onion/favicon.png b/browser/components/search/extensions/blockchair-onion/favicon.png
new file mode 100644
index 000000000000..1d1ccabdbc94
Binary files /dev/null and b/browser/components/search/extensions/blockchair-onion/favicon.png differ
diff --git a/browser/components/search/extensions/blockchair-onion/manifest.json b/browser/components/search/extensions/blockchair-onion/manifest.json
new file mode 100644
index 000000000000..e7d15ee50247
--- /dev/null
+++ b/browser/components/search/extensions/blockchair-onion/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "BlockchairOnion",
+  "description": "Blockchair Onion",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "blockchair-onion at search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "BlockchairOnion",
+      "search_url": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search",
+      "search_form": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search/?q={searchTerms}",
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/blockchair/favicon.png b/browser/components/search/extensions/blockchair/favicon.png
new file mode 100644
index 000000000000..1d1ccabdbc94
Binary files /dev/null and b/browser/components/search/extensions/blockchair/favicon.png differ
diff --git a/browser/components/search/extensions/blockchair/manifest.json b/browser/components/search/extensions/blockchair/manifest.json
new file mode 100644
index 000000000000..27f320f80b16
--- /dev/null
+++ b/browser/components/search/extensions/blockchair/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Blockchair",
+  "description": "Blockchair",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "blockchair at search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Blockchair",
+      "search_url": "https://blockchair.com/search",
+      "search_form": "https://blockchair.com/search/?q={searchTerms}",
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm
index d111690894b0..d46e1531c133 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -1053,11 +1053,13 @@ SearchService.prototype = {
       { webExtension: { id: "ddg at search.mozilla.org" }, orderHint: 100 },
       { webExtension: { id: "youtube at search.mozilla.org" }, orderHint: 90 },
       { webExtension: { id: "google at search.mozilla.org" }, orderHint: 80 },
-      { webExtension: { id: "ddg-onion at search.mozilla.org" }, orderHint: 70 },
-      { webExtension: { id: "startpage at search.mozilla.org" }, orderHint: 60 },
-      { webExtension: { id: "twitter at search.mozilla.org" }, orderHint: 50 },
-      { webExtension: { id: "wikipedia at search.mozilla.org" }, orderHint: 40 },
-      { webExtension: { id: "yahoo at search.mozilla.org" }, orderHint: 30 },
+      { webExtension: { id: "blockchair at search.mozilla.org" }, orderHint: 70 },
+      { webExtension: { id: "ddg-onion at search.mozilla.org" }, orderHint: 60 },
+      { webExtension: { id: "blockchair-onion at search.mozilla.org" }, orderHint: 50 },
+      { webExtension: { id: "startpage at search.mozilla.org" }, orderHint: 40 },
+      { webExtension: { id: "twitter at search.mozilla.org" }, orderHint: 30 },
+      { webExtension: { id: "wikipedia at search.mozilla.org" }, orderHint: 20 },
+      { webExtension: { id: "yahoo at search.mozilla.org" }, orderHint: 10 },
     ];
 
     for (let e of engines) {