Merge pull request #7895 from Bnyro/master

fix: featured content section on home page doesn't respect all feed filters

Author: Bnyro

app/src/main/java/com/github/libretube/db/DatabaseHelper.kt

@@ -105,13 +105,15 @@ object DatabaseHelper {
         return unfinished xor isVideoWatched(watchHistoryItem.videoId, watchHistoryItem.duration ?: 0)
     }
 
-    suspend fun filterByStatusAndWatchPosition(
+    suspend fun filterByStreamTypeAndWatchPosition(
         streams: List<StreamItem>,
-        hideWatched: Boolean
+        hideWatched: Boolean,
+        showUpcoming: Boolean
     ): List<StreamItem> {
         val streamItems = streams.filter {
-            val isVideo = !it.isShort && !it.isLive
+            if (!showUpcoming && it.isUpcoming) return@filter false
 
+            val isVideo = !it.isShort && !it.isLive
             return@filter when {
                 !ContentFilter.SHORTS.isEnabled && it.isShort -> false
                 !ContentFilter.VIDEOS.isEnabled && isVideo -> false

app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt

@@ -17,7 +17,6 @@ import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.constants.PreferenceKeys.HOME_TAB_CONTENT
 import com.github.libretube.databinding.FragmentHomeBinding
-import com.github.libretube.db.DatabaseHelper
 import com.github.libretube.db.obj.PlaylistBookmark
 import com.github.libretube.helpers.PreferenceHelper
 import com.github.libretube.ui.activities.SettingsActivity
@@ -32,7 +31,6 @@ import com.google.android.material.carousel.CarouselSnapHelper
 import com.google.android.material.carousel.UncontainedCarouselStrategy
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.coroutines.runBlocking
 
 
 class HomeFragment : Fragment(R.layout.fragment_home) {
@@ -211,10 +209,7 @@ class HomeFragment : Fragment(R.layout.fragment_home) {
         if (streamItems == null) return
 
         makeVisible(binding.featuredRV, binding.featuredTV)
-        val hideWatched = PreferenceHelper.getBoolean(PreferenceKeys.HIDE_WATCHED_FROM_FEED, false)
-        val feedVideos = streamItems
-            .let { runBlocking { DatabaseHelper.filterByStatusAndWatchPosition(it, hideWatched) } }
-            .take(20)
+        val feedVideos = streamItems.take(20)
 
         feedAdapter.submitList(feedVideos)
     }

app/src/main/java/com/github/libretube/ui/fragments/SubscriptionsFragment.kt

@@ -214,7 +214,9 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
     private suspend fun playByGroup(groupIndex: Int) {
         val streams = viewModel.videoFeed.value.orEmpty()
             .filterByGroup(groupIndex)
-            .let { DatabaseHelper.filterByStatusAndWatchPosition(it, hideWatched) }
+            .let {
+                DatabaseHelper.filterByStreamTypeAndWatchPosition(it, hideWatched, showUpcoming)
+            }
             .sortedBySelectedOrder()
 
         if (streams.isEmpty()) return
@@ -286,9 +288,8 @@ class SubscriptionsFragment : DynamicLayoutManagerFragment(R.layout.fragment_sub
 
         val feed = videoFeed
             .filterByGroup(selectedFilterGroup)
-            .filter { showUpcoming || !it.isUpcoming }
             .let {
-                DatabaseHelper.filterByStatusAndWatchPosition(it, hideWatched)
+                DatabaseHelper.filterByStreamTypeAndWatchPosition(it, hideWatched, showUpcoming)
             }
 
         val sortedFeed = feed

app/src/main/java/com/github/libretube/ui/models/HomeViewModel.kt

@@ -11,11 +11,9 @@ import com.github.libretube.api.TrendingCategory
 import com.github.libretube.api.obj.Playlists
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.constants.PreferenceKeys
-import com.github.libretube.constants.PreferenceKeys.HIDE_WATCHED_FROM_FEED
 import com.github.libretube.db.DatabaseHelper
 import com.github.libretube.db.DatabaseHolder
 import com.github.libretube.db.obj.PlaylistBookmark
-import com.github.libretube.enums.ContentFilter
 import com.github.libretube.extensions.runSafely
 import com.github.libretube.extensions.updateIfChanged
 import com.github.libretube.helpers.PlayerHelper
@@ -29,7 +27,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class HomeViewModel : ViewModel() {
-    private val hideWatched get() = PreferenceHelper.getBoolean(HIDE_WATCHED_FROM_FEED, false)
+    private val hideWatched get() = PreferenceHelper.getBoolean(PreferenceKeys.HIDE_WATCHED_FROM_FEED, false)
+    private val showUpcoming get() = PreferenceHelper.getBoolean(PreferenceKeys.SHOW_UPCOMING_IN_FEED, true)
 
     val trending: MutableLiveData<Pair<TrendingCategory, TrendsViewModel.TrendingStreams>> =
         MutableLiveData(null)
@@ -138,18 +137,7 @@ class HomeViewModel : ViewModel() {
         val feed = SubscriptionHelper.getFeed(forceRefresh = false)
         subscriptionsViewModel.videoFeed.postValue(feed)
 
-        return if (hideWatched) feed.filterWatched() else feed
-    }
-
-    private suspend fun List<StreamItem>.filterWatched(): List<StreamItem> {
-        val allowShorts = ContentFilter.SHORTS.isEnabled
-        val allowVideos = ContentFilter.VIDEOS.isEnabled
-        val allowAll = (!allowShorts && !allowVideos)
-
-        val filteredFeed = this.filter {
-            allowAll || (allowShorts && it.isShort) || (allowVideos && !it.isShort)
-        }
-        return DatabaseHelper.filterUnwatched(filteredFeed)
+        return DatabaseHelper.filterByStreamTypeAndWatchPosition(feed, hideWatched, showUpcoming)
     }
 
     companion object {