From a32fe35819cdb538bf7178a761fb684ce568ef0b Mon Sep 17 00:00:00 2001 From: Alex Kontos Date: Wed, 24 Apr 2024 11:55:52 +0100 Subject: [PATCH] Add Mojeek as a search engine option. --- .../components/search/SearchService.sys.mjs | 7 +++-- toolkit/components/search/SearchUtils.sys.mjs | 1 + .../search/extensions/mojeek/favicon.ico | Bin 0 -> 4414 bytes .../search/extensions/mojeek/favicon.png | Bin 0 -> 5566 bytes .../search/extensions/mojeek/manifest.json | 29 ++++++++++++++++++ 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 waterfox/browser/components/search/extensions/mojeek/favicon.ico create mode 100644 waterfox/browser/components/search/extensions/mojeek/favicon.png create mode 100644 waterfox/browser/components/search/extensions/mojeek/manifest.json diff --git a/toolkit/components/search/SearchService.sys.mjs b/toolkit/components/search/SearchService.sys.mjs index 4b3cd62954aee..6ae95a7d61d2d 100644 --- a/toolkit/components/search/SearchService.sys.mjs +++ b/toolkit/components/search/SearchService.sys.mjs @@ -2287,11 +2287,12 @@ export class SearchService { const defaultEngines = [ { webExtension: { id: "bing@search.waterfox.net" }, orderHint: 100 }, { webExtension: { id: "startpage@search.waterfox.net" }, orderHint: 90 }, - { webExtension: { id: "yahoo@search.waterfox.net" }, orderHint: 80 }, + { webExtension: { id: "mojeek@search.waterfox.net" }, orderHint: 80 }, { webExtension: { id: "google@search.waterfox.net" }, orderHint: 70 }, - { webExtension: { id: "ddg@search.waterfox.net" }, orderHint: 60 }, - { webExtension: { id: "qwant@search.waterfox.net" }, orderHint: 50 }, + { webExtension: { id: "qwant@search.waterfox.net" }, orderHint: 60 }, + { webExtension: { id: "ddg@search.waterfox.net" }, orderHint: 50 }, { webExtension: { id: "ecosia@search.waterfox.net" }, orderHint: 40 }, + { webExtension: { id: "yahoo@search.waterfox.net" }, orderHint: 30 }, ]; const validEngines = defaultEngines.map(engine => { diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs index bc63841c80857..4f7ed358e8cbe 100644 --- a/toolkit/components/search/SearchUtils.sys.mjs +++ b/toolkit/components/search/SearchUtils.sys.mjs @@ -206,6 +206,7 @@ export var SearchUtils = { "google@search.waterfox.net", "ddg@search.waterfox.net", "ecosia@search.waterfox.net", + "mojeek@search.waterfox.net", ]), /** diff --git a/waterfox/browser/components/search/extensions/mojeek/favicon.ico b/waterfox/browser/components/search/extensions/mojeek/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a89d560d839f755e2fe9bedf5bfbd45b4969d580 GIT binary patch literal 4414 zcmeI0+iz4w9LJA;0xv%EW*QIb|ErGjQJ~)B5u6>2KwHS(sYn#q82`xYOTbofdlxV`o+!rkeQ&5x#Rz3nkK--14sKtl=pRP(aLWO!9QvX3PNPGP+rXilHKuIF zYyK6#13MBvBWFuj=O^?1l@bR-IacP^>y-}1ZJ@mEk{LJ5oz20+4y;P@n!Zss5@wT2 zOjWc6O*zzY+n>iAa@+by z5|5A4!jTTV=>JT~=e_Y(_17xrtZQ$}JvB>mlQ~L;`Is2hnn@KMn9uK=-sxbhGWB!s zUTU5QV~cWi*D*B9zfSp`cMj)fNaxwC@yfU$rx|jL<7I(;Zd)sx%$7TxaiqK6 zmwIq5J9S8vc;kM0p8VWDHe#XFDdsA3hVjO(8LnfkEWB0kx__(K^W)m@lw8)UXXMV~ zethO$`>&OOcPY=qJZ2qbA20JWCGJ>D=@VTO$Z$RVL!Bt+tAzM*QzR%koqyGj?DIck zxzrcd&xY>5O*GIMl6&SbJ`C)|`|`g8bxN!|tOMNZquM;YcV;)TL{`b|22)1zA!&i6 P1^z!4c-Zd(kIVQ2hNN8q literal 0 HcmV?d00001 diff --git a/waterfox/browser/components/search/extensions/mojeek/favicon.png b/waterfox/browser/components/search/extensions/mojeek/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..e4a0aa589ef34b90be1050b3582b772746a019f6 GIT binary patch literal 5566 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 literal 0 HcmV?d00001 diff --git a/waterfox/browser/components/search/extensions/mojeek/manifest.json b/waterfox/browser/components/search/extensions/mojeek/manifest.json new file mode 100644 index 0000000000000..ad7ca90dab1d1 --- /dev/null +++ b/waterfox/browser/components/search/extensions/mojeek/manifest.json @@ -0,0 +1,29 @@ +{ + "name": "Mojeek", + "description": "Search the web using Mojeek", + "manifest_version": 2, + "version": "1.0", + "browser_specific_settings": { + "gecko": { + "id": "mojeek@search.waterfox.net" + } + }, + "hidden": true, + "icons": { + "16": "favicon.ico", + "144": "favicon.png" + }, + "web_accessible_resources": [ + "favicon.ico", + "favicon.png" + ], + "chrome_settings_overrides": { + "search_provider": { + "keyword": "@m", + "name": "Mojeek", + "search_url": "https://www.mojeek.com/search", + "search_form": "https://www.mojeek.com/", + "search_url_get_params": "q={searchTerms}" + } + } +} \ No newline at end of file