From 088b0dd88744c32e4359f3c88675a39aba95648c Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Mon, 18 Apr 2022 20:07:00 +0530
Subject: [PATCH 1/3] add lang and region to youtube request

---
 searx/engines/youtube_noapi.py | 7 +++++--
 searx/settings.yml             | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/searx/engines/youtube_noapi.py b/searx/engines/youtube_noapi.py
index 68b75bc72..7fe12e686 100644
--- a/searx/engines/youtube_noapi.py
+++ b/searx/engines/youtube_noapi.py
@@ -26,7 +26,7 @@ time_range_support = True
 
 # search-url
 base_url = 'https://www.youtube.com/results'
-search_url = base_url + '?search_query={query}&page={page}'
+search_url = base_url + '?search_query={query}&page={page}&gl={region}&hl={lang}'
 time_range_url = '&sp=EgII{time_range}%253D%253D'
 # the key seems to be constant
 next_page_url = 'https://www.youtube.com/youtubei/v1/search?key=AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8'
@@ -44,8 +44,9 @@ base_youtube_url = 'https://www.youtube.com/watch?v='
 
 # do search-request
 def request(query, params):
+    lang, region = params['language'].split('-')
     if not params['engine_data'].get('next_page_token'):
-        params['url'] = search_url.format(query=quote_plus(query), page=params['pageno'])
+        params['url'] = search_url.format(query=quote_plus(query), page=params['pageno'], region=region, lang=lang)
         if params['time_range'] in time_range_dict:
             params['url'] += time_range_url.format(time_range=time_range_dict[params['time_range']])
     else:
@@ -58,6 +59,8 @@ def request(query, params):
         params['headers']['Content-Type'] = 'application/json'
 
     params['headers']['Cookie'] = "CONSENT=YES+cb.%s-17-p0.en+F+941;" % datetime.now().strftime("%Y%m%d")
+    params['headers']['Cookie'] = f"PERF=gl={region}&hl={lang}"
+
     return params
 
 
diff --git a/searx/settings.yml b/searx/settings.yml
index ed3bf48cd..1121251c2 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1585,6 +1585,7 @@ engines:
   - name : mediathekviewweb
     engine : mediathekviewweb
     shortcut : mvw
+    disabled : True
 
   - name : kaufland
     shortcut : kauf
-- 
GitLab


From 52b6ba9f832a8840d8485a5b21c907e8a4dd3baf Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 19 Apr 2022 12:10:05 +0530
Subject: [PATCH 2/3] remove dailymotion as enabled engine

---
 searx/engines/onesearch.py     | 8 ++++++--
 searx/engines/youtube_noapi.py | 5 ++++-
 searx/settings.yml             | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/searx/engines/onesearch.py b/searx/engines/onesearch.py
index dc3cc1af0..fb33ea6e9 100644
--- a/searx/engines/onesearch.py
+++ b/searx/engines/onesearch.py
@@ -27,12 +27,16 @@ categories = ['general']
 paging = True
 
 # search-url
-URL = 'https://www.onesearch.com/yhs/search;?p=%s&b=%d'
+URL = 'https://www.onesearch.com/yhs/search;?p=%s&b=%d&intl=%s'
 
 
 def request(query, params):
+    try:
+        lang, region = params['language'].split('-')
+    except:
+        region = 'us'
     starting_from = (params['pageno'] * 10) - 9
-    params['url'] = URL % (query, starting_from)
+    params['url'] = URL % (query, starting_from, region.lower())
     return params
 
 
diff --git a/searx/engines/youtube_noapi.py b/searx/engines/youtube_noapi.py
index 7fe12e686..fb9d76b65 100644
--- a/searx/engines/youtube_noapi.py
+++ b/searx/engines/youtube_noapi.py
@@ -44,7 +44,10 @@ base_youtube_url = 'https://www.youtube.com/watch?v='
 
 # do search-request
 def request(query, params):
-    lang, region = params['language'].split('-')
+    try:
+        lang, region = params['language'].split('-')
+    except:
+        region = 'us'
     if not params['engine_data'].get('next_page_token'):
         params['url'] = search_url.format(query=quote_plus(query), page=params['pageno'], region=region, lang=lang)
         if params['time_range'] in time_range_dict:
diff --git a/searx/settings.yml b/searx/settings.yml
index 1121251c2..d458d59d6 100644
--- a/searx/settings.yml
+++ b/searx/settings.yml
@@ -1281,6 +1281,7 @@ engines:
   - name : dailymotion
     engine : dailymotion
     shortcut : dm
+    disabled : True
 
   - name : vimeo
     engine : vimeo
-- 
GitLab


From 63a8dfdd7c8ce27732a2e9272a402101a1717ec9 Mon Sep 17 00:00:00 2001
From: Nivesh Krishna <nivesh@e.email>
Date: Tue, 19 Apr 2022 12:14:03 +0530
Subject: [PATCH 3/3] fix pep8

---
 searx/engines/onesearch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/engines/onesearch.py b/searx/engines/onesearch.py
index fb33ea6e9..1f1e0dd15 100644
--- a/searx/engines/onesearch.py
+++ b/searx/engines/onesearch.py
@@ -32,7 +32,7 @@ URL = 'https://www.onesearch.com/yhs/search;?p=%s&b=%d&intl=%s'
 
 def request(query, params):
     try:
-        lang, region = params['language'].split('-')
+        region = params['language'].split('-')[-1]
     except:
         region = 'us'
     starting_from = (params['pageno'] * 10) - 9
-- 
GitLab