From d98c25c4536674a829138cddff5c0eac253aa27b Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Sat, 7 Oct 2017 12:40:37 +0800
Subject: [PATCH] prepare for big change

---
 .../java/org/mariotaku/twidere/model/ParcelableStatus.java | 7 +++++++
 .../twidere/loader/statuses/AbsRequestStatusesLoader.kt    | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
index 3c35fd995..f25152a9b 100644
--- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
+++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java
@@ -327,24 +327,31 @@ public class ParcelableStatus implements Parcelable, Comparable<ParcelableStatus
     public long inserted_date;
 
     @FilterFlags
+    @JsonField(name = "filter_flags")
     @CursorField(Statuses.FILTER_FLAGS)
     public long filter_flags;
 
+    @JsonField(name = "filter_users")
     @CursorField(value = Statuses.FILTER_USERS, converter = FilterUserKeysFieldConverter.class)
     public UserKey[] filter_users;
 
+    @JsonField(name = "filter_sources")
     @CursorField(value = Statuses.FILTER_SOURCES, converter = FilterStringsFieldConverter.class)
     public String[] filter_sources;
 
+    @JsonField(name = "filter_links")
     @CursorField(value = Statuses.FILTER_LINKS, converter = FilterStringsFieldConverter.class)
     public String[] filter_links;
 
+    @JsonField(name = "filter_names")
     @CursorField(value = Statuses.FILTER_NAMES, converter = FilterStringsFieldConverter.class)
     public String[] filter_names;
 
+    @JsonField(name = "filter_texts")
     @CursorField(value = Statuses.FILTER_TEXTS)
     public String filter_texts;
 
+    @JsonField(name = "filter_descriptions")
     @CursorField(value = Statuses.FILTER_DESCRIPTIONS)
     public String filter_descriptions;
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt
index ae5b1873b..1d4184edb 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/AbsRequestStatusesLoader.kt
@@ -118,10 +118,14 @@ abstract class AbsRequestStatusesLoader(
                 } else {
                     data.sort()
                 }
+                data.forEach { it.is_filtered = shouldFilterStatus(it) }
                 return ListResponse.getListInstance(data)
             }
         }
-        if (!fromUser) return ListResponse.getListInstance(data)
+        if (!fromUser) {
+            data.forEach { it.is_filtered = shouldFilterStatus(it) }
+            return ListResponse.getListInstance(data)
+        }
         val noItemsBefore = data.isEmpty()
         val loadItemLimit = preferences[loadItemLimitKey]
         val statuses = try {