Commit cb768e61 authored by Mike Perry's avatar Mike Perry Committed by Matthew Finkel
Browse files

Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.

Also:
Bug 16322: Update DuckDuckGo search engine

We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.

Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.

Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.

Also regression tests.
parent b4fed129
{
"name": "DuckDuckGoOnion",
"description": "Duck Duck Go Onion",
"manifest_version": 2,
"version": "1.0",
"applications": {
"gecko": {
"id": "ddg-onion@search.mozilla.org"
}
},
"hidden": true,
"icons": {
"16": "favicon.ico"
},
"web_accessible_resources": [
"favicon.ico"
],
"chrome_settings_overrides": {
"search_provider": {
"name": "DuckDuckGoOnion",
"search_url": "https://3g2upl4pq6kufc4m.onion",
"search_form": "https://3g2upl4pq6kufc4m.onion",
"search_url_post_params": "q={searchTerms}"
}
}
}
\ No newline at end of file
......@@ -10,50 +10,18 @@
},
"hidden": true,
"icons": {
"16": "favicon.ico"
"16": "favicon.png"
},
"web_accessible_resources": [
"favicon.ico"
"favicon.png"
],
"chrome_settings_overrides": {
"search_provider": {
"keyword": ["@duckduckgo", "@ddg"],
"name": "DuckDuckGo",
"search_url": "https://duckduckgo.com/",
"search_form": "https://duckduckgo.com/?q={searchTerms}",
"search_url_get_params": "q={searchTerms}",
"params": [
{
"name": "t",
"condition": "purpose",
"purpose": "contextmenu",
"value": "ffcm"
},
{
"name": "t",
"condition": "purpose",
"purpose": "keyword",
"value": "ffab"
},
{
"name": "t",
"condition": "purpose",
"purpose": "searchbar",
"value": "ffsb"
},
{
"name": "t",
"condition": "purpose",
"purpose": "homepage",
"value": "ffhp"
},
{
"name": "t",
"condition": "purpose",
"purpose": "newtab",
"value": "ffnt"
}
],
"search_url": "https://duckduckgo.com",
"search_form": "https://duckduckgo.com",
"search_url_post_params": "q={searchTerms}",
"suggest_url": "https://ac.duckduckgo.com/ac/",
"suggest_url_get_params": "q={searchTerms}&type=list"
}
......
{
"extensionName": {
"message": "Google"
},
"extensionDescription": {
"message": "Google Search"
},
"searchUrl": {
"message": "https://www.google.com/search"
},
"searchForm": {
"message": "https://www.google.com/search?client=firefox-b-1-d&q={searchTerms}"
},
"suggestUrl": {
"message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
},
"searchUrlGetParams": {
"message": "client=firefox-b-1-d&q={searchTerms}"
},
"channelPref": {
"message": "google_channel_us"
}
}
{
"extensionName": {
"message": "Google"
},
"extensionDescription": {
"message": "Google Search"
},
"searchUrl": {
"message": "https://www.google.com/search"
},
"searchForm": {
"message": "https://www.google.com/search?client=firefox-b-1-e&q={searchTerms}"
},
"suggestUrl": {
"message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
},
"searchUrlGetParams": {
"message": "client=firefox-b-1-e&q={searchTerms}"
},
"channelPref": {
"message": "google_channel_us"
}
}
{
"extensionName": {
"message": "Google"
},
"extensionDescription": {
"message": "Google Search"
},
"searchUrl": {
"message": "https://www.google.com/search"
},
"searchForm": {
"message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
},
"suggestUrl": {
"message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
},
"searchUrlGetParams": {
"message": "client=firefox-b-d&q={searchTerms}"
},
"channelPref": {
"message": "google_channel_row"
}
}
{
"extensionName": {
"message": "Google"
},
"extensionDescription": {
"message": "Google Search"
},
"searchUrl": {
"message": "https://www.google.com/search"
},
"searchForm": {
"message": "https://www.google.com/search?client=firefox-b-e&q={searchTerms}"
},
"suggestUrl": {
"message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
},
"searchUrlGetParams": {
"message": "client=firefox-b-e&q={searchTerms}"
},
"channelPref": {
"message": "google_channel_row"
}
}
{
"extensionName": {
"message": "Google"
},
"extensionDescription": {
"message": "Google Search"
},
"searchUrl": {
"message": "https://www.google.com/search"
},
"searchForm": {
"message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
},
"suggestUrl": {
"message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
},
"searchUrlGetParams": {
"message": "client=firefox-b-d&q={searchTerms}"
},
"channelPref": {
"message": "google_channel_row"
}
}
{
"name": "__MSG_extensionName__",
"description": "__MSG_extensionDescription__",
"name": "Google",
"description": "Google Search",
"manifest_version": 2,
"version": "1.1",
"applications": {
......@@ -9,7 +9,6 @@
}
},
"hidden": true,
"default_locale": "en",
"icons": {
"16": "favicon.ico"
},
......@@ -19,18 +18,18 @@
"chrome_settings_overrides": {
"search_provider": {
"keyword": "@google",
"name": "__MSG_extensionName__",
"search_url": "__MSG_searchUrl__",
"search_form": "__MSG_searchForm__",
"suggest_url": "__MSG_suggestUrl__",
"name": "Google",
"search_url": "https://www.google.com/search",
"search_form": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}",
"suggest_url": "https://www.google.com/complete/search?client=firefox&q={searchTerms}",
"params": [
{
"name": "channel",
"condition": "pref",
"pref": "__MSG_channelPref__"
"pref": "google_channel_row"
}
],
"search_url_get_params": "__MSG_searchUrlGetParams__"
"search_url_get_params": "client=firefox-b-d&q={searchTerms}"
}
}
}
{
"name": "Startpage",
"description": "Start Page",
"manifest_version": 2,
"version": "1.0",
"applications": {
"gecko": {
"id": "startpage@search.mozilla.org"
}
},
"hidden": true,
"icons": {
"16": "favicon.png"
},
"web_accessible_resources": [
"favicon.png"
],
"chrome_settings_overrides": {
"search_provider": {
"name": "Startpage",
"search_url": "https://startpage.com/rto/search",
"search_form": "https://startpage.com/rto/search/",
"search_url_post_params": "q={searchTerms}"
}
}
}
\ No newline at end of file
{
"name": "Twitter",
"description": "Realtime Twitter Search",
"manifest_version": 2,
"version": "1.0",
"applications": {
"gecko": {
"id": "twitter@search.mozilla.org"
}
},
"hidden": true,
"icons": {
"16": "favicon.ico"
},
"web_accessible_resources": [
"favicon.ico"
],
"chrome_settings_overrides": {
"search_provider": {
"name": "Twitter",
"search_url": "https://twitter.com/search",
"search_form": "https://twitter.com/search?q={searchTerms}&partner=Firefox&source=desktop-search",
"search_url_get_params": "q={searchTerms}&partner=Firefox&source=desktop-search"
}
}
}
\ No newline at end of file
{
"extensionName": {
"message": "Wikipedia (nn)"
},
"extensionDescription": {
"message": "Wikipedia, det frie oppslagsverket"
},
"searchUrl": {
"message": "https://nn.wikipedia.org/wiki/Spesial:Søk"
},
"searchForm": {
"message": "https://nn.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://nn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
},
"searchUrlGetParams": {
"message": "search={searchTerms}&sourceid=Mozilla-search"
}
}
\ No newline at end of file
{
"extensionName": {
"message": "Wikipedia (no)"
},
"extensionDescription": {
"message": "Wikipedia, den frie encyklopedi"
},
"searchUrl": {
"message": "https://no.wikipedia.org/wiki/Spesial:Søk"
},
"searchForm": {
"message": "https://no.wikipedia.org/wiki/Spesial:Søk?search={searchTerms}&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://no.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
},
"searchUrlGetParams": {
"message": "search={searchTerms}&sourceid=Mozilla-search"
}
}
\ No newline at end of file
{
"extensionName": {
"message": "Wikipedia (af)"
},
"extensionDescription": {
"message": "Wikipedia, die vrye ensiklopedie"
},
"searchUrl": {
"message": "https://af.wikipedia.org/wiki/Spesiaal:Soek"
},
"searchForm": {
"message": "https://af.wikipedia.org/wiki/Spesiaal:Soek?search={searchTerms}&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://af.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
},
"searchUrlGetParams": {
"message": "search={searchTerms}&sourceid=Mozilla-search"
}
}
\ No newline at end of file
{
"extensionName": {
"message": "Biquipedia (an)"
},
"extensionDescription": {
"message": "A enciclopedia Libre"
},
"searchUrl": {
"message": "https://an.wikipedia.org/wiki/Especial:Mirar"
},
"searchForm": {
"message": "https://an.wikipedia.org/wiki/Especial:Mirar?search={searchTerms}&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://an.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
},
"searchUrlGetParams": {
"message": "search={searchTerms}&sourceid=Mozilla-search"
}
}
\ No newline at end of file
{
"extensionName": {
"message": "ويكيبيديا (ar)"
},
"extensionDescription": {
"message": "ويكيبيديا (ar)"
},
"searchUrl": {
"message": "https://ar.wikipedia.org/wiki/خاص:بحث"
},
"searchForm": {
"message": "https://ar.wikipedia.org/wiki/خاص:بحث?search={searchTerms}&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://ar.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
},
"searchUrlGetParams": {
"message": "search={searchTerms}&sourceid=Mozilla-search"
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment