Add helper for determining whether to show media

Author: Tak

app/src/main/java/com/keylesspalace/tusky/components/notifications/requests/details/NotificationRequestDetailsRemoteMediator.kt

@@ -70,12 +70,11 @@ class NotificationRequestDetailsRemoteMediator(
         val alwaysShowSensitiveMedia = viewModel.accountManager.activeAccount?.alwaysShowSensitiveMedia == true
         val alwaysOpenSpoiler = viewModel.accountManager.activeAccount?.alwaysOpenSpoiler == false
         val notificationData = notifications.map { notification ->
-            val filter = notification.status?.getApplicableFilter(Filter.Kind.NOTIFICATIONS)
             notification.toViewData(
-                isShowingContent = alwaysShowSensitiveMedia || filter?.action != Filter.Action.BLUR,
+                isShowingContent = notification.status?.shouldShowContent(alwaysShowSensitiveMedia, Filter.Kind.NOTIFICATIONS) ?: true,
                 isExpanded = alwaysOpenSpoiler,
                 isCollapsed = true,
-                filter = filter,
+                filter = notification.status?.getApplicableFilter(Filter.Kind.NOTIFICATIONS),
             )
         }
 

app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt

@@ -70,12 +70,11 @@ class SearchViewModel @Inject constructor(
     private val statusesPagingSourceFactory =
         SearchPagingSourceFactory(mastodonApi, SearchType.Status, loadedStatuses) {
             it.statuses.map { status ->
-                val filter = status.getApplicableFilter(Filter.Kind.PUBLIC)
                 status.toViewData(
-                    isShowingContent = alwaysShowSensitiveMedia || (!status.actionableStatus.sensitive && filter?.action != Filter.Action.BLUR),
+                    isShowingContent = status.shouldShowContent(alwaysShowSensitiveMedia, Filter.Kind.PUBLIC),
                     isExpanded = alwaysOpenSpoiler,
                     isCollapsed = true,
-                    filter = filter,
+                    filter = status.getApplicableFilter(Filter.Kind.PUBLIC),
                 )
             }.apply {
                 loadedStatuses.addAll(this)

app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineRemoteMediator.kt

@@ -29,7 +29,6 @@ import com.keylesspalace.tusky.db.entity.AccountEntity
 import com.keylesspalace.tusky.db.entity.HomeTimelineData
 import com.keylesspalace.tusky.db.entity.HomeTimelineEntity
 import com.keylesspalace.tusky.db.entity.TimelineStatusEntity
-import com.keylesspalace.tusky.entity.Filter
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import retrofit2.HttpException
@@ -161,9 +160,8 @@ class CachedTimelineRemoteMediator(
                 if (oldStatus != null) break
             }
 
-            val filter = status.getApplicableFilter(viewModel.kind.toFilterKind())
             val expanded = oldStatus?.expanded ?: activeAccount.alwaysOpenSpoiler
-            val contentShowing = oldStatus?.contentShowing ?: (activeAccount.alwaysShowSensitiveMedia || (!status.actionableStatus.sensitive && filter?.action != Filter.Action.BLUR))
+            val contentShowing = oldStatus?.contentShowing ?: status.shouldShowContent(activeAccount.alwaysShowSensitiveMedia, viewModel.kind.toFilterKind())
             val contentCollapsed = oldStatus?.contentCollapsed != false
 
             statusDao.insert(

app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt

@@ -207,13 +207,12 @@ class CachedTimelineViewModel @Inject constructor(
                             ?.let { rebloggedAccount ->
                                 accountDao.insert(rebloggedAccount)
                             }
-                        val filter = status.getApplicableFilter(kind.toFilterKind())
                         statusDao.insert(
                             status.actionableStatus.toEntity(
                                 tuskyAccountId = accountId,
                                 expanded = account.alwaysOpenSpoiler,
-                                contentShowing = account.alwaysShowSensitiveMedia || (!status.actionableStatus.sensitive && filter?.action != Filter.Action.BLUR),
-                                contentCollapsed = true
+                                contentShowing = status.shouldShowContent(account.alwaysShowSensitiveMedia, kind.toFilterKind()),
+                                contentCollapsed = true,
                             )
                         )
                         timelineDao.insertHomeTimelineItem(

app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineRemoteMediator.kt

@@ -21,7 +21,6 @@ import androidx.paging.LoadType
 import androidx.paging.PagingState
 import androidx.paging.RemoteMediator
 import com.keylesspalace.tusky.components.timeline.util.ifExpected
-import com.keylesspalace.tusky.entity.Filter
 import com.keylesspalace.tusky.util.HttpHeaderLink
 import com.keylesspalace.tusky.util.toViewData
 import com.keylesspalace.tusky.viewdata.StatusViewData
@@ -76,7 +75,7 @@ class NetworkTimelineRemoteMediator(
                 }?.asStatusOrNull()
 
                 val filter = oldStatus?.filter ?: status.getApplicableFilter(viewModel.kind.toFilterKind())
-                val contentShowing = oldStatus?.isShowingContent ?: (activeAccount.alwaysShowSensitiveMedia || (!status.actionableStatus.sensitive && filter?.action != Filter.Action.BLUR))
+                val contentShowing = oldStatus?.isShowingContent ?: status.shouldShowContent(activeAccount.alwaysShowSensitiveMedia, viewModel.kind.toFilterKind())
                 val expanded = oldStatus?.isExpanded ?: activeAccount.alwaysOpenSpoiler
                 val contentCollapsed = oldStatus?.isCollapsed != false
 

app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineViewModel.kt

@@ -222,12 +222,11 @@ class NetworkTimelineViewModel @Inject constructor(
 
                 val activeAccount = accountManager.activeAccount!!
                 val data: MutableList<StatusViewData> = statuses.map { status ->
-                    val filter = status.getApplicableFilter(kind.toFilterKind())
                     status.toViewData(
-                        isShowingContent = activeAccount.alwaysShowSensitiveMedia || (!status.actionableStatus.sensitive && filter?.action != Filter.Action.BLUR),
+                        isShowingContent = status.shouldShowContent(activeAccount.alwaysShowSensitiveMedia, kind.toFilterKind()),
                         isExpanded = activeAccount.alwaysOpenSpoiler,
                         isCollapsed = true,
-                        filter = filter,
+                        filter = status.getApplicableFilter(kind.toFilterKind()),
                     )
                 }.toMutableList()
 

app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadViewModel.kt

@@ -432,14 +432,12 @@ class ViewThreadViewModel @Inject constructor(
         val oldStatus = (_uiState.value as? ThreadUiState.Success)?.statusViewData?.find {
             it.id == this.id
         }
-        val filter = oldStatus?.filter ?: actionableStatus.getApplicableFilter(Filter.Kind.THREAD)
         return toViewData(
-            isShowingContent = oldStatus?.isShowingContent
-                ?: (alwaysShowSensitiveMedia || (!actionableStatus.sensitive && filter?.action != Filter.Action.BLUR)),
+            isShowingContent = oldStatus?.isShowingContent ?: actionableStatus.shouldShowContent(alwaysShowSensitiveMedia, Filter.Kind.THREAD),
             isExpanded = oldStatus?.isExpanded ?: alwaysOpenSpoiler,
             isCollapsed = oldStatus?.isCollapsed ?: !isDetailed,
             isDetailed = oldStatus?.isDetailed ?: isDetailed,
-            filter = filter,
+            filter = oldStatus?.filter ?: actionableStatus.getApplicableFilter(Filter.Kind.THREAD),
         )
     }
 

app/src/main/java/com/keylesspalace/tusky/entity/Status.kt

@@ -161,6 +161,9 @@ data class Status(
     fun getApplicableFilter(kind: Filter.Kind): Filter? =
         actionableStatus.filtered?.filter { it.filter.context.contains(kind) }?.maxByOrNull { it.filter.action.ordinal }?.filter
 
+    fun shouldShowContent(alwayShowSensitiveContent: Boolean, context: Filter.Kind): Boolean =
+        alwayShowSensitiveContent || (!actionableStatus.sensitive && getApplicableFilter(context)?.action != Filter.Action.BLUR)
+
     @JsonClass(generateAdapter = true)
     data class Mention(
         val id: String,