From 7baaf0816712a33e0d8bda7287fa293e8c23eb9d Mon Sep 17 00:00:00 2001 From: Erik Kiznov <46452865+k1zn@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:08:30 +0500 Subject: [PATCH] Add filter for source name --- .../lite/utils/NewsFeedFiltersUtils.java | 17 ++++++++++++++--- smali/res/xml/preferences_feed.xml | 5 +++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java b/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java index 322a399f7..8720e1591 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java @@ -27,10 +27,12 @@ import ru.vtosters.lite.hooks.JsonInjectors; public class NewsFeedFiltersUtils { public static List mFilters; + public static List mFiltersNames; public static List mFiltersLinks; public static void setupFilters() { mFilters = new ArrayList<>(); + mFiltersNames = new ArrayList<>(); mFiltersLinks = new ArrayList<>(); getFilter("refsfilter", "Referals.txt", mFilters); @@ -44,6 +46,11 @@ public class NewsFeedFiltersUtils { mFilters.addAll(Arrays.asList(customFilters.split(", "))); } + var sourceNameFilter = getPrefsValue("sourcenamefilter"); + if (!sourceNameFilter.isEmpty()) { + mFiltersNames.addAll(Arrays.asList(sourceNameFilter.toLowerCase().split(", "))); + } + var linkFilter = getPrefsValue("linkfilter"); if (!linkFilter.isEmpty()) { mFiltersLinks.addAll(Arrays.asList(linkFilter.split(", "))); @@ -99,11 +106,15 @@ public class NewsFeedFiltersUtils { if (copyright_post()) return true; var copyright = json.optJSONObject("copyright"); + var copyrightName = copyright.getString("name").toLowerCase(); var copyrightLink = copyright.getString("link").toLowerCase(); + + for (String filter : mFiltersNames) { + if (copyrightName.contains(filter)) return true; + } + for (String filter : mFiltersLinks) { - if (copyrightLink.contains(filter)) { - return true; - } + if (copyrightLink.contains(filter)) return true; } } return false; diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 24a0c994c..c687004ff 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -56,6 +56,11 @@ android:key="cringecopyright" android:summary="Блокировать посты с источником где есть ссылка на вк/телеграм (группу, страницу или посты) или на другие возможные ресурсы" android:title="Посты с возможной рекламой" /> +