Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-13 02:00:39 +01:00
Code Issues Releases Wiki Activity

fixed timeline filter for mastodon

Browse Source
This commit is contained in:
Mariotaku Lee 2017-05-12 19:23:28 +08:00
parent e48a39979a
commit af53e88b72
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
twidere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/model/TimelineOption.java
View File

@ -26,7 +26,11 @@ import org.mariotaku.restfu.http.SimpleValueMap;
public class TimelineOption extends SimpleValueMap { public class TimelineOption extends SimpleValueMap {
public TimelineOption excludeReplies(boolean excludeReplies) { public TimelineOption excludeReplies(boolean excludeReplies) {
put("exclude_replies", excludeReplies); if (excludeReplies) {
put("exclude_replies", true);
} else {
remove("exclude_replies");
}
return this; return this;
} }

6
twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/UserTimelineLoader.kt
View File

@ -92,6 +92,11 @@ class UserTimelineLoader(
@WorkerThread @WorkerThread
override fun shouldFilterStatus(database: SQLiteDatabase, status: ParcelableStatus): Boolean { override fun shouldFilterStatus(database: SQLiteDatabase, status: ParcelableStatus): Boolean {
if (timelineFilter != null) {
if (status.is_retweet && !timelineFilter.isIncludeRetweets) {
return true
}
}
if (accountKey != null && userKey != null && TextUtils.equals(accountKey.id, userKey.id)) if (accountKey != null && userKey != null && TextUtils.equals(accountKey.id, userKey.id))
return false return false
val retweetUserKey = status.user_key.takeIf { status.is_retweet } val retweetUserKey = status.user_key.takeIf { status.is_retweet }
@ -107,6 +112,7 @@ class UserTimelineLoader(
if (timelineFilter != null) { if (timelineFilter != null) {
option.excludeReplies(!timelineFilter.isIncludeReplies) option.excludeReplies(!timelineFilter.isIncludeReplies)
} }
return mastodon.getStatuses(id, paging, option) return mastodon.getStatuses(id, paging, option)
} }