From b91e23f995632f36abf284df55821ac9c80ec389 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 30 Sep 2023 23:54:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=86=E9=A2=91/=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E8=B4=B4=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/repository/FrsPageRepository.kt   |  9 ++++++---
 .../personalized/PersonalizedViewModel.kt        | 16 ++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/repository/FrsPageRepository.kt b/app/src/main/java/com/huanchengfly/tieba/post/repository/FrsPageRepository.kt
index b15fbf27..734b8a1e 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/repository/FrsPageRepository.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/repository/FrsPageRepository.kt
@@ -55,9 +55,12 @@ object FrsPageRepository {
             .map { response ->
                 if (response.data_ == null) throw TiebaUnknownException
                 val userList = response.data_.user_list
-                val threadList = response.data_.thread_list.map { threadInfo ->
-                    threadInfo.copy(author = userList.find { it.id == threadInfo.authorId })
-                }
+                val threadList = response.data_.thread_list
+                    .map { threadInfo ->
+                        threadInfo.copy(author = userList.find { it.id == threadInfo.authorId })
+                    }
+                    .filter { !App.INSTANCE.appPreferences.blockVideo || it.videoInfo == null }
+                    .filter { it.ala_info == null } // 去他妈的直播
                 response.copy(data_ = response.data_.copy(thread_list = threadList))
             }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedViewModel.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedViewModel.kt
index 8c1aea42..17e707fa 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedViewModel.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/main/explore/personalized/PersonalizedViewModel.kt
@@ -70,9 +70,11 @@ class PersonalizedViewModel @Inject constructor() :
             PersonalizedRepository
                 .personalizedFlow(1, 1)
                 .map<PersonalizedResponse, PersonalizedPartialChange.Refresh> { response ->
-                    val data = response.toData().filter {
-                        !App.INSTANCE.appPreferences.blockVideo || it.get { videoInfo } == null
-                    }
+                    val data = response.toData()
+                        .filter {
+                            !App.INSTANCE.appPreferences.blockVideo || it.get { videoInfo } == null
+                        }
+                        .filter { it.get { ala_info } == null }
                     val threadPersonalizedData = response.data_?.thread_personalized ?: emptyList()
                     PersonalizedPartialChange.Refresh.Success(
                         data = data.map { thread ->
@@ -90,9 +92,11 @@ class PersonalizedViewModel @Inject constructor() :
             PersonalizedRepository
                 .personalizedFlow(2, page)
                 .map<PersonalizedResponse, PersonalizedPartialChange.LoadMore> { response ->
-                    val data = response.toData().filter {
-                        !App.INSTANCE.appPreferences.blockVideo || it.get { videoInfo } == null
-                    }
+                    val data = response.toData()
+                        .filter {
+                            !App.INSTANCE.appPreferences.blockVideo || it.get { videoInfo } == null
+                        }
+                        .filter { it.get { ala_info } == null }
                     val threadPersonalizedData = response.data_?.thread_personalized ?: emptyList()
                     PersonalizedPartialChange.LoadMore.Success(
                         currentPage = page,