Fix #3022: Update Yandex search engine. (#3050)

brave · Nov 19, 2020 · f819b55 · f819b55
1 parent bb19eb5
commit f819b55
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 122 deletions.
diff --git a/Client/Assets/SearchPlugins/yandex-ru.xml b/Client/Assets/SearchPlugins/yandex-ru.xml
diff --git a/Client/Assets/SearchPlugins/yandex-tr.xml b/Client/Assets/SearchPlugins/yandex-tr.xml
diff --git a/Client/Assets/SearchPlugins/yandex.xml b/Client/Assets/SearchPlugins/yandex.xml
@@ -3,19 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Яндекс</ShortName>
+<ShortName>Yandex</ShortName>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,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</Image>
-<Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.net/suggest-ff.cgi">
+<Url type="application/x-suggestions+json" method="GET" template="https://suggest.yandex.ru/suggest-ff.cgi">
   <Param name="part" value="{searchTerms}"/>
+  <!-- Despite name, this param applies to both desktop and mobile clients. -->
+  <Param name="srv" value="brave_desktop"/>
 </Url>
-<Url type="text/html" method="GET" template="https://yandex.kz/yandsearch">
-  <Param name="clid" value="2186727"/>
-  <Param name="text" value="{searchTerms}"/>
-</Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://yandex.kz/yandsearch">
-  <Param name="clid" value="2186733"/>
+<Url type="text/html" method="GET" template="https://yandex.ru/search">
   <Param name="text" value="{searchTerms}"/>
+  <Param name="clid" value="2423859"/>
 </Url>
 <SearchForm>https://www.yandex.kz/</SearchForm>
 </SearchPlugin>
diff --git a/Client/Frontend/Browser/Search/InitialSearchEngines.swift b/Client/Frontend/Browser/Search/InitialSearchEngines.swift
@@ -41,7 +41,7 @@ class InitialSearchEngines {
 
     static let ddgDefaultRegions = ["DE", "AU", "NZ", "IE"]
     static let qwantDefaultRegions = ["FR"]
-    static let yandexDefaultRegions = ["BY", "KZ", "RU", "TR"]
+    static let yandexDefaultRegions = ["AM", "AZ", "BY", "KG", "KZ", "MD", "RU", "TJ", "TM", "TZ"]
     static let yahooEligibleRegions =
         ["GB", "US", "AR", "AT", "AU", "BR", "CA", "CH", "CL", "CO", "DE", "DK", "ES", "FI", "FR", "HK",
          "ID", "IE", "IN", "IT", "MX", "MY", "NL", "NO", "NZ", "PE", "PH", "SE", "SG", "TH", "TW", "VE", "VN"]
@@ -99,35 +99,10 @@ class InitialSearchEngines {
     // MARK: - Locale overrides
 
     private func languageOverrides() {
-        guard let language = locale.languageCode, let region = locale.regionCode else { return }
+        guard let language = locale.languageCode else { return }
         if language == "ja" {
             replaceOrInsert(engineId: .yahoo, customId: "yahoo-jp")
         }
-
-        if language == "ru" {
-            replaceOrInsert(engineId: .yandex, customId: "yandex-ru")
-
-            if Self.yandexDefaultRegions.contains(region) {
-                defaultSearchEngine = .yandex
-            }
-        }
-
-        if language == "kk" {
-            engines.append(.init(id: .yandex))
-
-            if Self.yandexDefaultRegions.contains(region) {
-                defaultSearchEngine = .yandex
-            }
-        }
-
-        if language == "tr" {
-            replaceOrInsert(engineId: .yandex, customId: "yandex-tr")
-
-            if Self.yandexDefaultRegions.contains(region) {
-                defaultSearchEngine = .yandex
-            }
-        }
-
     }
 
     private func regionOverrides() {
@@ -140,6 +115,10 @@ class InitialSearchEngines {
         if Self.qwantDefaultRegions.contains(region) {
             defaultSearchEngine = .qwant
         }
+
+        if Self.yandexDefaultRegions.contains(region) {
+            defaultSearchEngine = .yandex
+        }
     }
 
     private func priorityOverrides() {

diff --git a/ClientTests/InitialSearchEnginesTests.swift b/ClientTests/InitialSearchEnginesTests.swift
@@ -51,50 +51,11 @@ class InitialSearchEnginesTests: XCTestCase {
         }
     }
 
-    func testYandexLocales() throws {
-
-        for language in ["ru", "kk", "tr"] {
-            for region in InitialSearchEngines.yandexDefaultRegions {
-                let localeSE = SE(locale: Locale(identifier: "\(language)_\(region)"))
-                let engines = localeSE.engines.map { $0.id }
-
-                XCTAssertEqual(engines, [.yandex,
-                                         .google,
-                                         .bing,
-                                         .duckduckgo,
-                                         .qwant,
-                                         .startpage])
-
-                XCTAssertEqual(localeSE.defaultSearchEngine, .yandex)
-
-                // Check for language specific search engines
-                if language == "ru" {
-                    XCTAssertNotNil(localeSE.engines.first(where: { $0.customId == "yandex-ru" }))
-                }
-
-                if language == "tr" {
-                    XCTAssertNotNil(localeSE.engines.first(where: { $0.customId == "yandex-tr" }))
-                }
-
-                if language == "kk" {
-                    XCTAssertNil(localeSE.engines.first(where: { $0.id == .yandex })?.customId)
-                }
-            }
-
-            // non matching region
-            for region in ["XX", "PL"] {
-                let localeSE = SE(locale: Locale(identifier: "\(language)_\(region)"))
-                let engines = localeSE.engines.map { $0.id }
-
-                XCTAssertEqual(engines, [.google,
-                                         .bing,
-                                         .duckduckgo,
-                                         .qwant,
-                                         .startpage,
-                                         .yandex])
-
-                XCTAssertEqual(localeSE.defaultSearchEngine, .google)
-            }
+    func testYandexRegions() throws {
+
+        for region in InitialSearchEngines.yandexDefaultRegions {
+            let localeSE = SE(locale: Locale(identifier: "ru_\(region)"))
+            XCTAssertEqual(localeSE.defaultSearchEngine, .yandex)
         }
     }
 
@@ -189,4 +150,19 @@ class InitialSearchEnginesTests: XCTestCase {
         XCTAssertEqual(unknownLocaleSE.defaultSearchEngine, .google)
         XCTAssertNil(unknownLocaleSE.priorityEngine)
     }
+
+    func testRuRu() throws {
+        let russianLocale = SE(locale: Locale(identifier: "ru_RU"))
+        let engines = russianLocale.engines.map { $0.id }
+
+        XCTAssertEqual(engines, [.yandex,
+                                 .google,
+                                 .bing,
+                                 .duckduckgo,
+                                 .qwant,
+                                 .startpage])
+
+        XCTAssertEqual(russianLocale.defaultSearchEngine, .yandex)
+        XCTAssertNil(russianLocale.priorityEngine)
+    }
 }