From b60bc9f1b84b580fd025fe58bef037197fc5b4fb Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Tue, 14 May 2024 11:18:26 +0300
Subject: [PATCH] firefox: switch to AMO version of Privacy Badger

---
 etc/firefox/policies/README.md     | 13 +++++++++++++
 etc/firefox/policies/policies.json |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/etc/firefox/policies/README.md b/etc/firefox/policies/README.md
index feb3570d..2c3ff0d6 100644
--- a/etc/firefox/policies/README.md
+++ b/etc/firefox/policies/README.md
@@ -15,6 +15,7 @@ per whatever I am doing.
 - [WARNING TO LIBREWOLF USERS](#warning-to-librewolf-users)
 - [Extensions](#extensions)
   - [Privacy Badger](#privacy-badger)
+    - [Duplicate](#duplicate)
 - [Search engines](#search-engines)
 - [Useful looking things for the future](#useful-looking-things-for-the-future)
   - [Certificate installations](#certificate-installations)
@@ -48,6 +49,18 @@ See also:
 - https://github.com/EFForg/privacybadger/blob/master/doc/admin-deployment.md
 - https://github.com/EFForg/privacybadger/blob/master/src/data/schema.json
 
+#### Duplicate
+
+```diff
+-      "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
+-        "install_url": "https://www.eff.org/files/privacy-badger-latest.xpi",
++      "jid1-MnnxcxisBPnSXQ@jetpack": {
++        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi",
+```
+
+The EFF.org version won't sync and if you sync with unmanaged computer, you
+will have two PrivacyBadgers. Congratulations?
+
 ## Search engines
 
 > Policy SearchEngines is only allowed on ESR.
diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 86c3ab2c..185c7e1f 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -41,7 +41,7 @@
             ]
           }
         },
-        "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
+        "jid1-MnnxcxisBPnSXQ@jetpack": {
           "checkForDNTPolicy": true,
           "disabledSites": [
             "app.element.io",
@@ -139,7 +139,11 @@
         "installation_mode": "normal_installed"
       },
       "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
-        "install_url": "https://www.eff.org/files/privacy-badger-latest.xpi",
+        "blocked_install_message": "Kaksoiskappale samasta lisäosasta.",
+        "installation_mode": "blocked"
+      },
+      "jid1-MnnxcxisBPnSXQ@jetpack": {
+        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi",
         "installation_mode": "force_installed"
       },
       "peertube-companion@booteille": {