From b3d86a876625734d6fb82ea3512c36d164fb2991 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 8 Jan 2021 09:05:20 +0100
Subject: [PATCH] Cleanup list of predefined adblock subscriptions, update to
 latest upstream URLs.

---
 src/librssguard/definitions/definitions.h     |  2 +-
 .../adblock/adblockaddsubscriptiondialog.cpp  | 30 ++++++-------------
 .../network-web/adblock/adblockmanager.cpp    |  2 +-
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index e504f9af9..3cd6400ce 100755
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -25,7 +25,7 @@
 #define IS_IN_ARRAY(offset, array)            ((offset >= 0) && (offset < array.count()))
 #define ADBLOCK_CUSTOMLIST_NAME               "customlist.txt"
 #define ADBLOCK_LISTS_SUBDIRECTORY            "adblock"
-#define ADBLOCK_EASYLIST_URL                  "https://easylist-downloads.adblockplus.org/easylist.txt"
+#define ADBLOCK_EASYLIST_URL                  "https://easylist.to/easylist/easylist.txt"
 #define DEFAULT_SQL_MESSAGES_FILTER           "0 > 1"
 #define MAX_MULTICOLUMN_SORT_STATES           3
 #define ENCLOSURES_OUTER_SEPARATOR            '#'
diff --git a/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp b/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp
index def052123..a01f03b32 100644
--- a/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp
+++ b/src/librssguard/network-web/adblock/adblockaddsubscriptiondialog.cpp
@@ -27,27 +27,15 @@
 AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent)
   : QDialog(parent), m_ui(new Ui::AdBlockAddSubscriptionDialog) {
   m_ui->setupUi(this);
-  m_knownSubscriptions << Subscription(QSL("EasyList (English)"), ADBLOCK_EASYLIST_URL)
-                       << Subscription(QSL("BSI Lista Polska (Polish)"), QSL("http://www.bsi.info.pl/filtrABP.txt"))
-                       << Subscription(QSL("EasyList Germany (German"), QSL("https://easylist.to/easylistgermany/easylistgermany.txt"))
-                       << Subscription(QSL("EasyList Czech and Slovak (Czech)"),
-                  QSL("https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt"))
-                       << Subscription(QSL("dutchblock (Dutch)"), QSL("http://groenewoudt.net/dutchblock/list.txt"))
-                       << Subscription(QSL("Filtros Nauscopicos (Spanish)"), QSL("http://abp.mozilla-hispano.org/nauscopio/filtros.txt"))
-                       << Subscription(QSL("IsraelList (Hebrew)"), QSL("http://secure.fanboy.co.nz/israelilist/IsraelList.txt"))
-                       << Subscription(QSL("NLBlock (Dutch)"), QSL("http://www.verzijlbergh.com/adblock/nlblock.txt"))
-                       << Subscription(QSL("Peter Lowe's list (English)"),
-                  QSL("http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext"))
-                       << Subscription(QSL("PLgeneral (Polish)"), QSL("http://www.niecko.pl/adblock/adblock.txt"))
-                       << Subscription(QSL("Schacks Adblock Plus liste (Danish)"), QSL("http://adblock.schack.dk/block.txt"))
-                       << Subscription(QSL("Xfiles (Italian)"), QSL("http://mozilla.gfsolone.com/filtri.txt"))
-                       << Subscription(QSL("EasyPrivacy (English)"), QSL("http://easylist-downloads.adblockplus.org/easyprivacy.txt"))
-                       << Subscription(QSL("RU Adlist (Russian)"), QSL("https://easylist-downloads.adblockplus.org/advblock.txt"))
-                       << Subscription(QSL("ABPindo (Indonesian)"),
-                  QSL("https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt"))
-                       << Subscription(QSL("Easylist China (Chinese)"), QSL("https://easylist-downloads.adblockplus.org/easylistchina.txt"))
-                       << Subscription(QSL("Anti-Adblock Killer"),
-                  QSL("https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt"));
+  m_knownSubscriptions
+    << Subscription(QSL("EasyList"),
+                    QSL(ADBLOCK_EASYLIST_URL))
+    << Subscription(QSL("EasyPrivacy"),
+                  QSL("https://easylist.to/easylist/easyprivacy.txt"))
+    << Subscription(QSL("EasyPrivacy Tracking Protection List"),
+                  QSL("https://easylist-downloads.adblockplus.org/easyprivacy.tpl"))
+    << Subscription(QSL("Adblock Warning Removal List"),
+                  QSL("https://easylist-downloads.adblockplus.org/antiadblockfilters.txt"));
 
   for (const Subscription& subscription : m_knownSubscriptions) {
     m_ui->m_cmbPresets->addItem(subscription.m_title);
diff --git a/src/librssguard/network-web/adblock/adblockmanager.cpp b/src/librssguard/network-web/adblock/adblockmanager.cpp
index 8fdc42c82..cdd724ef8 100644
--- a/src/librssguard/network-web/adblock/adblockmanager.cpp
+++ b/src/librssguard/network-web/adblock/adblockmanager.cpp
@@ -59,7 +59,7 @@ const AdBlockRule* AdBlockManager::block(const AdblockRequestInfo& request) {
   QMutexLocker locker(&m_mutex);
 
   if (!isEnabled()) {
-    return false;
+    return nullptr;
   }
 
   const QString url_string = request.requestUrl().toEncoded().toLower();