damontecres · damontecres · Jan 11, 2026 · Nov 25, 2025 · Nov 25, 2025 · Nov 25, 2025
diff --git a/...ompiler/src/main/java/com/github/damontecres/apollo/compiler/StashApolloCompilerPlugin.kt b/...ompiler/src/main/java/com/github/damontecres/apollo/compiler/StashApolloCompilerPlugin.kt
@@ -55,7 +55,13 @@ class StashApolloCompilerPlugin : ApolloCompilerPlugin {
                                                 "SavedFindFilterType",
                                             )
                                     ) ||
-                                    file.name.endsWith("CriterionInput")
+                                    file.name.endsWith("CriterionInput") ||
+                                    file.name in
+                                    setOf(
+                                        "FingerprintFilterInput",
+                                        "VideoFileFilterInput",
+                                        "ImageFileFilterInput",
+                                    )
                                 ) {
                                     // Modify filter or filter input types
                                     handleFilterInput(file, stashFilterInterface)

diff --git a/app/src/main/graphql/Configuration.graphql b/app/src/main/graphql/Configuration.graphql
@@ -30,6 +30,7 @@ query Configuration {
       showStudioAsText
       customLocalesEnabled
       customLocales
+      sfwContentMode
     }
     ui
   }

diff --git a/app/src/main/graphql/FindGroups.graphql b/app/src/main/graphql/FindGroups.graphql
@@ -85,6 +85,7 @@ fragment GroupData on Group {
   }
   scene_count
   performer_count
+  o_counter
   front_image_path
   back_image_path
   created_at @catch(to: NULL)

diff --git a/app/src/main/graphql/FindStudios.graphql b/app/src/main/graphql/FindStudios.graphql
@@ -32,11 +32,11 @@
 fragment StudioData on Studio {
  id
  name
  url
  parent_studio {
    id
    name
    url
    image_path
    __typename
  }
@@ -62,6 +62,7 @@
   #  performer_count_all: performer_count(depth: -1)
   group_count
   #  group_count_all: group_count(depth: -1)
+  o_counter
   details
   rating100
   aliases

diff --git a/app/src/main/java/com/github/damontecres/stashapp/SceneDetailsFragment.kt b/app/src/main/java/com/github/damontecres/stashapp/SceneDetailsFragment.kt
@@ -677,7 +677,7 @@ class SceneDetailsFragment : DetailsSupportFragment() {
                 StashCoroutineExceptionHandler(
                     Toast.makeText(
                         requireContext(),
-                        getString(R.string.failed_o_counter),
+                        getString(R.string.failed_update),
                         Toast.LENGTH_SHORT,
                     ),
                 ),

diff --git a/app/src/main/java/com/github/damontecres/stashapp/data/SortOption.kt b/app/src/main/java/com/github/damontecres/stashapp/data/SortOption.kt
@@ -119,6 +119,9 @@ sealed interface SortOption {
     @Serializable
     data object Path : SortOptionImpl("path", R.string.stashapp_path)
 
+    @Serializable
+    data object PerformerAge : SortOptionImpl("performer_age", R.string.stashapp_performer_age)
+
     @Serializable
     data object PenisLength : SortOptionImpl("penis_length", R.string.stashapp_penis_length)
 
@@ -153,6 +156,10 @@ sealed interface SortOption {
     @Serializable
     data object SceneCode : SortOptionImpl("code", R.string.stashapp_scene_code, Version.V0_28_0)
 
+    @Serializable
+    data object ScenesDuration :
+        SortOptionImpl("scenes_duration", R.string.stashapp_scenes_duration)
+
     @Serializable
     data object SceneId : SortOptionImpl("scene_id", R.string.stashapp_scene_id)
 
@@ -170,6 +177,9 @@ sealed interface SortOption {
     @Serializable
     data object Seconds : SortOptionImpl("seconds", R.string.stashapp_seconds)
 
+    @Serializable
+    data object Studio : SortOptionImpl("studio", R.string.stashapp_studio)
+
     @Serializable
     data object TagCount : SortOptionImpl("tag_count", R.string.stashapp_tag_count)
 
@@ -253,12 +263,14 @@ sealed interface SortOption {
                 Organized,
                 Path,
                 PerceptualSimilarity,
+                PerformerAge,
                 PerformerCount,
                 PlayCount,
                 PlayDuration,
                 Rating,
                 ResumeTime,
                 SceneCode,
+                Studio,
                 TagCount,
                 Title,
             )
@@ -298,6 +310,7 @@ sealed interface SortOption {
                 Date,
                 Duration,
                 Name,
+                OCounter,
                 Rating,
                 ScenesCount,
             )
@@ -317,6 +330,7 @@ sealed interface SortOption {
                 PlayCount,
                 Rating,
                 ScenesCount,
+                ScenesDuration,
                 TagCount,
                 CareerLength,
                 Measurements,
@@ -342,6 +356,7 @@ sealed interface SortOption {
                 Name,
                 Rating,
                 ScenesCount,
+                ScenesDuration,
                 TagCount,
             )
 
@@ -354,6 +369,7 @@ sealed interface SortOption {
                 PerformersCount,
                 SceneMarkersCount,
                 ScenesCount,
+                ScenesDuration,
             )
 
         fun sortByName(dataType: DataType): SortOption =

diff --git a/app/src/main/java/com/github/damontecres/stashapp/filter/FilterOption.kt b/app/src/main/java/com/github/damontecres/stashapp/filter/FilterOption.kt
@@ -174,7 +174,7 @@ private val SceneFilterOptions =
         ),
         FilterOption<SceneFilterType, IntCriterionInput>(
             "o_counter",
-            R.string.stashapp_o_counter,
+            R.string.stashapp_o_count,
             null,
             IntCriterionInput::class,
             { it.o_counter },
@@ -493,7 +493,7 @@ private val PerformerFilterOptions =
         ),
         FilterOption<PerformerFilterType, IntCriterionInput>(
             "o_counter",
-            R.string.stashapp_o_counter,
+            R.string.stashapp_o_count,
             null,
             IntCriterionInput::class,
             { it.o_counter },
@@ -663,7 +663,7 @@ private val ImageFilterOptions =
         ),
         FilterOption<ImageFilterType, IntCriterionInput>(
             "o_counter",
-            R.string.stashapp_o_counter,
+            R.string.stashapp_o_count,
             null,
             IntCriterionInput::class,
             { it.o_counter },
@@ -1217,6 +1217,15 @@ private val GroupFilterOptions =
             { filter, value -> filter.copy(duration = value) },
             TwoValueCriterionModifiers,
         ),
+        FilterOption<GroupFilterType, IntCriterionInput>(
+            "o_counter",
+            R.string.stashapp_o_count,
+            null,
+            IntCriterionInput::class,
+            { it.o_counter },
+            { filter, value -> filter.copy(o_counter = value) },
+            TwoValueCriterionModifiers,
+        ),
         FilterOption<GroupFilterType, StringCriterionInput>(
             "name",
             R.string.stashapp_name,

diff --git a/app/src/main/java/com/github/damontecres/stashapp/image/ImageDetailsFragment.kt b/app/src/main/java/com/github/damontecres/stashapp/image/ImageDetailsFragment.kt
@@ -624,7 +624,7 @@ class ImageDetailsFragment : DetailsSupportFragment() {
                 StashCoroutineExceptionHandler(
                     Toast.makeText(
                         requireContext(),
-                        getString(R.string.failed_o_counter),
+                        getString(R.string.failed_update),
                         Toast.LENGTH_SHORT,
                     ),
                 ),

diff --git a/app/src/main/java/com/github/damontecres/stashapp/presenters/OCounterPresenter.kt b/app/src/main/java/com/github/damontecres/stashapp/presenters/OCounterPresenter.kt
@@ -12,7 +12,7 @@ class OCounterPresenter(
     ) {
         cardView.blackImageBackground = false
 
-        val text = cardView.context.getString(R.string.stashapp_o_counter)
+        val text = cardView.context.getString(R.string.stashapp_o_count)
         cardView.titleText = "$text (${item.count})"
         cardView.setMainImageDimensions(ActionPresenter.CARD_WIDTH, ActionPresenter.CARD_HEIGHT)
         cardView.imageView.setPadding(

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/ComposeUiConfig.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/ComposeUiConfig.kt
@@ -18,6 +18,7 @@ data class ComposeUiConfig(
     val readOnlyModeEnabled: Boolean,
     val showCardProgress: Boolean,
     val playSoundOnFocus: Boolean,
+    val sfwMode: Boolean,
     val persistVideoFilters: Boolean = true,
     val cardSettings: CardUiSettings,
 ) {
@@ -46,6 +47,7 @@ data class ComposeUiConfig(
                 playSoundOnFocus = preferences.interfacePreferences.playMovementSounds,
                 readOnlyModeEnabled = preferences.pinPreferences.readOnlyPin.isNotNullOrBlank(),
                 persistVideoFilters = preferences.playbackPreferences.saveVideoFilters,
+                sfwMode = server.serverPreferences.sfwMode,
             )
     }
 }
diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/PreviewUtils.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/PreviewUtils.kt
@@ -107,6 +107,7 @@ val uiConfigPreview =
         readOnlyModeEnabled = false,
         showCardProgress = true,
         playSoundOnFocus = true,
+        sfwMode = false,
         cardSettings =
             CardUiSettings(
                 maxSearchResults = 25,

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/Cards.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/Cards.kt
@@ -167,6 +167,7 @@ val iconOrder =
 @Suppress("ktlint:standard:function-naming")
 @Composable
 fun IconRowText(
+    sfwMode: Boolean,
     iconMap: EnumMap<DataType, Int>,
     oCounter: Int?,
     modifier: Modifier = Modifier,
@@ -186,7 +187,13 @@ fun IconRowText(
             }
             additionalIcons?.invoke(this)
             if (oCounter != null && oCounter > 0) {
-                appendInlineContent(id = "ocounter", "O")
+                if (sfwMode) {
+                    withStyle(SpanStyle(fontFamily = FontAwesome)) {
+                        append(stringResource(R.string.fa_thumbs_up))
+                    }
+                } else {
+                    appendInlineContent(id = "ocounter", "O")
+                }
                 append(" $oCounter")
             }
         }

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/GalleryCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/GalleryCard.kt
@@ -113,6 +113,7 @@ fun GalleryCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 null,
                 Modifier

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/GroupCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/GroupCard.kt
@@ -76,8 +76,9 @@ fun GroupCard(
         description = { focused ->
             item?.let {
                 IconRowText(
+                    sfwMode = uiConfig.sfwMode,
                     dataTypeMap,
-                    null,
+                    item.o_counter,
                     Modifier
                         .enableMarquee(focused)
                         .align(Alignment.Center),
@@ -102,6 +103,9 @@ fun GroupCard(
                                 append(stringResource(R.string.fa_arrow_down_long))
                             }
                         }
+                        if (item.o_counter != null && item.o_counter > 0) {
+                            append(" ")
+                        }
                     }
                 }
             }

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/ImageCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/ImageCard.kt
@@ -72,6 +72,7 @@ fun ImageCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 item?.o_counter ?: -1,
                 Modifier

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/MarkerCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/MarkerCard.kt
@@ -85,6 +85,7 @@ fun MarkerCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 null,
                 Modifier

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/PerformerCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/PerformerCard.kt
@@ -119,6 +119,7 @@ fun PerformerCard(
         subtitle = { Text(subtitle) },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 item?.o_counter ?: -1,
                 Modifier

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/SceneCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/SceneCard.kt
@@ -89,6 +89,7 @@ fun SceneCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 item?.o_counter ?: -1,
                 Modifier

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/StudioCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/StudioCard.kt
@@ -68,8 +68,9 @@ fun StudioCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
-                null,
+                item?.o_counter,
                 Modifier
                     .enableMarquee(it)
                     .align(Alignment.Center),

diff --git a/app/src/main/java/com/github/damontecres/stashapp/ui/cards/TagCard.kt b/app/src/main/java/com/github/damontecres/stashapp/ui/cards/TagCard.kt
@@ -65,6 +65,7 @@ fun TagCard(
         },
         description = {
             IconRowText(
+                sfwMode = uiConfig.sfwMode,
                 dataTypeMap,
                 null,
                 Modifier