Fix #1272

TwidereProject · Apr 24, 2020 · c7f44b4 · c7f44b4
1 parent dcaff8a
commit c7f44b4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/loader/statuses/ConversationLoader.kt
@@ -152,6 +152,14 @@ class ConversationLoader(
         }
         if (loadReplies || noSinceMaxId || sinceId != null && sinceSortId > status.sort_id) {
             // Load replies
+            try {
+                if (details.type == AccountType.TWITTER) {
+                    // try to load thread
+                    statuses.addAll(loadTwitterWebReplies(details, twitter))
+                }
+            } catch (e: MicroBlogException) {
+                // Ignore
+            }
             val query = SearchQuery()
             query.count(100)
             if (details.type == AccountType.TWITTER) {
@@ -171,7 +179,7 @@ class ConversationLoader(
                 // Ignore for now
             }
         }
-        return statuses.mapTo(PaginatedArrayList()) {
+        return statuses.distinctBy { it.id }.mapTo(PaginatedArrayList()) {
             it.toParcelable(details, profileImageSize)
         }.apply {
             this.nextPage = nextPagination