Small refractoring

Put all the "SearX" related stuff in the same alphebetical order as the rest
iorate · iorate · Jan 7, 2023 · Nov 11, 2022 · Nov 11, 2022 · Nov 12, 2022
commit b7e473da048c3dbf181c56cfaafe1eb21ac1f2a8
diff --git a/README.md b/README.md
@@ -26,14 +26,15 @@ This extension is available in the below search engines.
 | Brave        | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | DuckDuckGo   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Ecosia       | :heavy_check_mark: |                    |                    |                    |
-| SearX        | :heavy_check_mark: |                    |                    |                    |
 | Qwant        | :heavy_check_mark: | :heavy_check_mark: | \*2                | :heavy_check_mark: |
+| SearX        | \*3                |                    |                    |                    |
 | Startpage    | :heavy_check_mark: |                    | :heavy_check_mark: | :heavy_check_mark: |
 | Yahoo! JAPAN | :heavy_check_mark: |                    |                    |                    |
 | Yandex       | :heavy_check_mark: |                    |                    | :heavy_check_mark: |
 
 \*1 In Firefox, only if "Open links in new tab" is turned off<br>
-\*2 Only if "Always play videos on Qwant.com" is turned off
+\*2 Only if "Always play videos on Qwant.com" is turned off<br>
+\*3 Only certain public instances are supported
 
 ## For subscription providers
 

diff --git a/src/common/locales.ts b/src/common/locales.ts
@@ -138,9 +138,9 @@ export type MessageName =
   | 'searchEngines_braveName'
   | 'searchEngines_duckduckgoName'
   | 'searchEngines_ecosiaName'
-  | 'searchEngines_searxName'
   | 'searchEngines_qwantName'
   | 'searchEngines_qwantDescription'
+  | 'searchEngines_searxName'
   | 'searchEngines_startpageName'
   | 'searchEngines_yahooJapanName'
   | 'searchEngines_yandexName';

diff --git a/src/common/search-engines.ts b/src/common/search-engines.ts
@@ -6,8 +6,8 @@ export type SearchEngineId =
   | 'brave'
   | 'duckduckgo'
   | 'ecosia'
-  | 'searx'
   | 'qwant'
+  | 'searx'
   | 'startpage'
   | 'yahooJapan'
   | 'yandex';
@@ -310,6 +310,23 @@ export const SEARCH_ENGINES: Readonly<Record<SearchEngineId, Readonly<SearchEngi
       name: 'searchEngines_ecosiaName',
     },
   },
+  qwant: {
+    contentScripts: [
+      {
+        matches: ['https://www.qwant.com/?*'],
+        // https://github.com/iorate/ublacklist/pull/179
+        runAt: 'document_idle',
+      },
+      {
+        matches: ['https://lite.qwant.com/?*'],
+        runAt: 'document_start',
+      },
+    ],
+    messageNames: {
+      name: 'searchEngines_qwantName',
+      description: 'searchEngines_qwantDescription',
+    },
+  },
   searx: {
     contentScripts: [
       {
@@ -355,23 +372,6 @@ export const SEARCH_ENGINES: Readonly<Record<SearchEngineId, Readonly<SearchEngi
       name: 'searchEngines_searxName',
     },
   },
-  qwant: {
-    contentScripts: [
-      {
-        matches: ['https://www.qwant.com/?*'],
-        // https://github.com/iorate/ublacklist/pull/179
-        runAt: 'document_idle',
-      },
-      {
-        matches: ['https://lite.qwant.com/?*'],
-        runAt: 'document_start',
-      },
-    ],
-    messageNames: {
-      name: 'searchEngines_qwantName',
-      description: 'searchEngines_qwantDescription',
-    },
-  },
   startpage: {
     contentScripts: [
       {

diff --git a/src/locales/de.json.ts b/src/locales/de.json.ts
@@ -152,8 +152,8 @@ exportAsMessages('_locales/de/messages.json', {
   searchEngines_braveName: 'Brave',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_qwantDescription: '"Immer Videos auf Qwant.com abspielen" deaktivieren.',
   searchEngines_startpageName: 'Startpage.com',
   searchEngines_yahooJapanName: 'Yahoo! JAPAN',

diff --git a/src/locales/en.json.ts b/src/locales/en.json.ts
@@ -433,12 +433,12 @@ exportAsMessages('_locales/en/messages.json', {
   // The localized name of Ecosia.
   searchEngines_ecosiaName: 'Ecosia',
 
-  // The localized name of SearX.
-  searchEngines_searxName: 'SearX',
-
   // The localized name of Qwant.
   searchEngines_qwantName: 'Qwant',
 
+  // The localized name of SearX.
+  searchEngines_searxName: 'SearX',
+
   // The description for Qwant.
   searchEngines_qwantDescription: 'Turn off "Always play videos on Qwant.com".',
 

diff --git a/src/locales/es.json.ts b/src/locales/es.json.ts
@@ -134,7 +134,7 @@ exportAsMessages('_locales/es/messages.json', {
   searchEngines_braveName: 'Brave',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_startpageName: 'Startpage.com',
 });
diff --git a/src/locales/fr.json.ts b/src/locales/fr.json.ts
@@ -134,7 +134,7 @@ exportAsMessages('_locales/fr/messages.json', {
   searchEngines_bingName: 'Bing',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_startpageName: 'Startpage.com',
 });
diff --git a/src/locales/ru.json.ts b/src/locales/ru.json.ts
@@ -138,8 +138,8 @@ exportAsMessages('_locales/ru/messages.json', {
   searchEngines_braveName: 'Brave',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_startpageName: 'Startpage.com',
   searchEngines_yandexName: 'Яндекс',
 });
diff --git a/src/locales/uk.json.ts b/src/locales/uk.json.ts
@@ -139,8 +139,8 @@ exportAsMessages('_locales/uk/messages.json', {
   searchEngines_braveName: 'Brave',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_startpageName: 'Startpage.com',
   searchEngines_yahooJapanName: 'Yahoo! JAPAN',
 });
diff --git a/src/locales/zh-cn.json.ts b/src/locales/zh-cn.json.ts
@@ -142,7 +142,7 @@ exportAsMessages('_locales/zh_CN/messages.json', {
   searchEngines_braveName: 'Brave',
   searchEngines_duckduckgoName: 'DuckDuckGo',
   searchEngines_ecosiaName: 'Ecosia',
-  searchEngines_searxName: 'SearX',
   searchEngines_qwantName: 'Qwant',
+  searchEngines_searxName: 'SearX',
   searchEngines_startpageName: 'Startpage.com',
 });
diff --git a/src/scripts/search-engines.ts b/src/scripts/search-engines.ts
@@ -16,8 +16,8 @@ export const SEARCH_ENGINES: Readonly<Record<SearchEngineId, Readonly<SearchEngi
   brave,
   duckduckgo,
   ecosia,
-  searx,
   qwant,
+  searx,
   startpage,
   yahooJapan,
   yandex,

diff --git a/website/docs/advanced-features.md b/website/docs/advanced-features.md
@@ -88,7 +88,7 @@ Comments begin with `#`. Although any line that cannot be interpreted as a rule
 
 ## Other search engines {#other-search-engines}
 
-This extension supports [Bing](#bing), [Brave](#brave) (partially), [DuckDuckGo](#duckduckgo), [Ecosia](#ecosia) (partially), [SearX](#searx) (partially), [Qwant](#qwant), [Startpage.com](#startpagecom), [Yahoo! JAPAN](#yahoo-japan) (partially) and [Yandex](#yandex) (partially). This feature is disabled by default and can be enabled in the options page.
+This extension supports [Bing](#bing), [Brave](#brave) (partially), [DuckDuckGo](#duckduckgo), [Ecosia](#ecosia) (partially), [Qwant](#qwant), [SearX](#searx) (partially), [Startpage.com](#startpagecom), [Yahoo! JAPAN](#yahoo-japan) (partially) and [Yandex](#yandex) (partially). This feature is disabled by default and can be enabled in the options page.
 
 ![other search engines](/img/advanced-features/other-search-engines-1.png)
 
@@ -110,16 +110,16 @@ You can also enable it by clicking the toolbar icon when a search result page is
 
 ![ecosia](/img/advanced-features/ecosia.png)
 
-### Searx {#searx}
-
-![searx](/img/advanced-features/searx.png)
-
 ### Qwant {#qwant}
 
 "Videos" search will only work if you disable qwant custom links by clicking on "Always read on Qwant.com".
 
 With the lite version of Qwant, the extension only work with "Web" search.
 
+### SearX {#searx}
+
+![searx](/img/advanced-features/searx.png)
+
 ### Startpage.com {#startpagecom}
 
 ![startpage](/img/advanced-features/startpage.png)

diff --git a/website/docs/introduction.md b/website/docs/introduction.md
@@ -21,6 +21,6 @@ uBlacklist is a Google Search filter for Chrome, Firefox and Safari.
 - Block sites with specific URLs using match patterns or regular expressions
 - Block sites with specific titles using regular expressions
 - Highlight sites
-- Support Bing, Brave, DuckDuckGo, Ecosia, Searx, Qwant, Startpage.com, Yahoo! JAPAN and Yandex
+- Support Bing, Brave, DuckDuckGo, Ecosia, Qwant, Searx, Startpage.com, Yahoo! JAPAN and Yandex
 - Synchronize block rules among devices using Google Drive or Dropbox
 - Subscribe to public block rules
diff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/advanced-features.md b/website/i18n/ja/docusaurus-plugin-content-docs/current/advanced-features.md
@@ -88,7 +88,7 @@ sidebar_position: 2
 
 ## Google 以外の検索エンジン {#other-search-engines}
 
-[Bing](#bing)、[Brave](#brave)、[DuckDuckGo](#duckduckgo)、[Ecosia](#ecosia)、[SearX](#searx)、[Qwant](#qwant)、[Startpage.com](#startpagecom)、[Yahoo! JAPAN](#yahoo-japan)、[Yandex](#yandex) がサポートされています。この機能はデフォルトで無効ですが、オプションページで有効にすることができます。
+[Bing](#bing)、[Brave](#brave)、[DuckDuckGo](#duckduckgo)、[Ecosia](#ecosia)、[Qwant](#qwant)、[SearX](#searx)、[Startpage.com](#startpagecom)、[Yahoo! JAPAN](#yahoo-japan)、[Yandex](#yandex) がサポートされています。この機能はデフォルトで無効ですが、オプションページで有効にすることができます。
 
 ![その他の検索エンジン](/img/advanced-features/other-search-engines-1.png)
 
@@ -110,16 +110,16 @@ sidebar_position: 2
 
 ![ecosia](/img/advanced-features/ecosia.png)
 
-### SearX {#searx}
-
-![searx](/img/advanced-features/searx.png)
-
 ### Qwant {#qwant}
 
 動画検索上では、"Always read on Qwant.com" を無効にする必要があります。
 
 Lite バージョンでは、Web 検索のみがサポートされています。
 
+### SearX {#searx}
+
+![searx](/img/advanced-features/searx.png)
+
 ### Startpage.com {#startpagecom}
 
 ![startpage](/img/advanced-features/startpage.png)

diff --git a/website/i18n/ja/docusaurus-plugin-content-docs/current/introduction.md b/website/i18n/ja/docusaurus-plugin-content-docs/current/introduction.md
@@ -21,6 +21,6 @@ uBlacklist は Google の検索結果をフィルタリングするブラウザ
 - マッチパターンまたは正規表現でブロックするサイトの URL を指定できます
 - 正規表現でブロックするサイトのタイトルを指定できます
 - サイトをハイライトできます
-- Bing、Brave、DuckDuckGo、Ecosia、SearX、Qwant、Startpage.com、Yahoo! JAPAN、Yandex でも使用できます
+- Bing、Brave、DuckDuckGo、Ecosia、Qwant、SearX、Startpage.com、Yahoo! JAPAN、Yandex でも使用できます
 - ルールを Google ドライブまたは Dropbox で同期できます
 - 公開されたルールを購読できます
-Original file line number
+Diff line change
@@ Expand Up @@
       brave,
       duckduckgo,
       ecosia,
-      searx,
       qwant,
+      searx,
       startpage,
       yahooJapan,
       yandex,
@@ Expand Down @@