diff options
| -rw-r--r-- | pug/options/search/search.pug | 1 | ||||
| -rw-r--r-- | src/assets/javascripts/helpers/search.js | 13 | ||||
| -rw-r--r-- | src/pages/options/search/search.html | 1 | ||||
| -rw-r--r-- | src/pages/options/search/search.js | 2 |
4 files changed, 2 insertions, 15 deletions
diff --git a/pug/options/search/search.pug b/pug/options/search/search.pug index 79c30e2e..61664b9c 100644 --- a/pug/options/search/search.pug +++ b/pug/options/search/search.pug @@ -19,7 +19,6 @@ body.option(dir="auto") option(value="searxng") SearXNG option(value="whoogle") Whoogle option(value="startpage") Startpage - option(value="ecosia") Ecosia #searx-whoogle diff --git a/src/assets/javascripts/helpers/search.js b/src/assets/javascripts/helpers/search.js index 2aa6ff57..c6f1500e 100644 --- a/src/assets/javascripts/helpers/search.js +++ b/src/assets/javascripts/helpers/search.js @@ -4,9 +4,7 @@ import commonHelper from './common.js' const targets = [ /^https?:\/{2}(www\.|search\.|)google(\.[a-z]{2,3}){1,2}(\/search(\?.*|$)|\/$)/, - /^https?:\/{2}(www\.|)bing\.com/, - - /^https?:\/{2}search\.yahoo(\.[a-z]{2,3}){1,2}/, + /^https?:\/{2}(www\.|www2\.|)bing\.com/, /^https?:\/{2}yandex(\.[a-z]{2,3}){1,2}/, @@ -31,9 +29,6 @@ let redirects = { "startpage": { "normal": "https://www.startpage.com", }, - "ecosia": { - "normal": "https://www.ecosia.org", - } }; const getRedirects = () => redirects; const getCustomRedirects = () => { @@ -439,20 +434,14 @@ function redirect(url) { randomInstance = redirects.startpage.normal; path = "/do/search"; } - else if (frontend == 'ecosia') { - randomInstance = redirects.ecosia.normal; - path = '/search'; - } if ( ((url.hostname.includes('google') || url.hostname.includes('bing')) && !url.searchParams.has('q')) || - (url.hostname.includes('yahoo') && !url.searchParams.has('p')) || (url.hostname.includes('yandex') && !url.searchParams.has('text')) ) path = '/'; let searchQuery = ""; if ((url.hostname.includes('google') || url.hostname.includes('bing') || url.hostname.includes('libredirect.invalid')) && url.searchParams.has('q')) searchQuery = `?q=${url.searchParams.get('q')}`; - if (url.hostname.includes('yahoo') && url.searchParams.has('p')) searchQuery = `?q=${url.searchParams.get('p')}`; if (url.hostname.includes('yandex') && url.searchParams.has('text')) searchQuery = `?q=${url.searchParams.get('text')}`; return `${randomInstance}${path}${searchQuery}`; diff --git a/src/pages/options/search/search.html b/src/pages/options/search/search.html index facb0209..01e8511e 100644 --- a/src/pages/options/search/search.html +++ b/src/pages/options/search/search.html @@ -69,7 +69,6 @@ <option value="searxng">SearXNG</option> <option value="whoogle">Whoogle</option> <option value="startpage">Startpage</option> - <option value="ecosia">Ecosia</option> </select> </div> <div id="searx-whoogle"> diff --git a/src/pages/options/search/search.js b/src/pages/options/search/search.js index 3946695b..14834309 100644 --- a/src/pages/options/search/search.js +++ b/src/pages/options/search/search.js @@ -34,7 +34,7 @@ function changeFrontendsSettings(frontend) { whoogleDivElement.style.display = 'block'; SearxWhoogleElement.style.display = 'block'; } - else if (frontend == 'startpage' || frontend == 'ecosia') { + else if (frontend == 'startpage') { frontendElement.innerHTML = `Frontend: <span style="color:red;">This is a centralized service</span>`; searxDivElement.style.display = 'none'; searxngDivElement.style.display = 'none'; |