From dd0f238701ce6328402034ba0cb68cea46f243b0 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 22 Jul 2022 15:01:09 +0300 Subject: [PATCH] fixed parseRepostItem fetch bug --- .../ru/vtosters/lite/hooks/JsonInjectors.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java index 1a4288063..6964c2861 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -242,26 +242,30 @@ public class JsonInjectors{ public static boolean parseRepostItem(JSONObject list) throws JSONException{ var item = list.optJSONArray("copy_history"); - if (item == null || !getBoolValue("cringerepost", false)) return false; + if (item == null) return false; for (int j = 0; j < item.length(); j++) { var items = item.optJSONObject(j); var text = items.optString("text"); var type = items.optString("post_type"); + if (isBadNews(text)) { + if (dev()) + Log.d("RepostFilter", "Fetched repost ad (isBadNews), owner id " + items.optString("owner_id") + ", text: " + text); + return true; + } else if (isAds(items, type)) { + if (dev()) + Log.d("RepostFilter", "Fetched repost ad (ads), owner id " + items.optString("owner_id") + ", text: " + text); + return true; + } + + if (!getBoolValue("cringerepost", false)) return false; + for (String linkfilters : mFiltersLinks) { if (text.contains(linkfilters)) { if (dev()) Log.d("RepostFilter", "Fetched repost ad, owner id " + items.optString("owner_id") + ", text: " + text); return true; - } else if (isBadNews(text)) { - if (dev()) - Log.d("RepostFilter", "Fetched repost ad (isBadNews), owner id " + items.optString("owner_id") + ", text: " + text); - return true; - } else if (isAds(items, type)) { - if (dev()) - Log.d("RepostFilter", "Fetched repost ad (ads), owner id " + items.optString("owner_id") + ", text: " + text); - return true; } } }