Don't overwrite more mod prefs than necessary

(cherry picked from commit 2eed97464b)
This commit is contained in:
Eric Bailey
2025-12-11 09:39:15 -06:00
parent 04d08bebae
commit c2e792867a
2 changed files with 14 additions and 1 deletions
+10
View File
@@ -3,9 +3,11 @@ import {
ageAssuranceRuleIDs as ids,
type AppBskyAgeassuranceDefs,
getAgeAssuranceRegionConfig,
type ModerationPrefs,
} from '@atproto/api'
import {getAge} from '#/lib/strings/time'
import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/moderation'
import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
import {AgeAssuranceAccess} from '#/ageAssurance/types'
import {type Geolocation, useGeolocation} from '#/geolocation'
@@ -95,3 +97,11 @@ export function getBirthdateStringFromAge(age: number) {
today.getDate() - 1, // set to day before to ensure age is reached
).toISOString()
}
export const makeAgeRestrictedModerationPrefs = (
prefs: ModerationPrefs,
): ModerationPrefs => ({
...prefs,
adultContentEnabled: false,
labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
})
+4 -1
View File
@@ -23,6 +23,7 @@ import {
import {useAgent} from '#/state/session'
import {saveLabelers} from '#/state/session/agent-config'
import {useAgeAssurance} from '#/ageAssurance'
import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
export * from '#/state/queries/preferences/const'
export * from '#/state/queries/preferences/moderation'
@@ -81,7 +82,9 @@ export function usePreferencesQuery() {
if (aa.state.access !== aa.Access.Full) {
data = {
...data,
moderationPrefs: DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
moderationPrefs: makeAgeRestrictedModerationPrefs(
data.moderationPrefs,
),
}
}
return data