Don't overwrite more mod prefs than necessary
This commit is contained in:
@@ -3,9 +3,11 @@ import {
|
|||||||
ageAssuranceRuleIDs as ids,
|
ageAssuranceRuleIDs as ids,
|
||||||
type AppBskyAgeassuranceDefs,
|
type AppBskyAgeassuranceDefs,
|
||||||
getAgeAssuranceRegionConfig,
|
getAgeAssuranceRegionConfig,
|
||||||
|
type ModerationPrefs,
|
||||||
} from '@atproto/api'
|
} from '@atproto/api'
|
||||||
|
|
||||||
import {getAge} from '#/lib/strings/time'
|
import {getAge} from '#/lib/strings/time'
|
||||||
|
import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/moderation'
|
||||||
import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
|
import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
|
||||||
import {AgeAssuranceAccess} from '#/ageAssurance/types'
|
import {AgeAssuranceAccess} from '#/ageAssurance/types'
|
||||||
import {type Geolocation, useGeolocation} from '#/geolocation'
|
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
|
today.getDate() - 1, // set to day before to ensure age is reached
|
||||||
).toISOString()
|
).toISOString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const makeAgeRestrictedModerationPrefs = (
|
||||||
|
prefs: ModerationPrefs,
|
||||||
|
): ModerationPrefs => ({
|
||||||
|
...prefs,
|
||||||
|
adultContentEnabled: false,
|
||||||
|
labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
|
||||||
|
})
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import {
|
|||||||
import {useAgent} from '#/state/session'
|
import {useAgent} from '#/state/session'
|
||||||
import {saveLabelers} from '#/state/session/agent-config'
|
import {saveLabelers} from '#/state/session/agent-config'
|
||||||
import {useAgeAssurance} from '#/ageAssurance'
|
import {useAgeAssurance} from '#/ageAssurance'
|
||||||
|
import {makeAgeRestrictedModerationPrefs} from '#/ageAssurance/util'
|
||||||
|
|
||||||
export * from '#/state/queries/preferences/const'
|
export * from '#/state/queries/preferences/const'
|
||||||
export * from '#/state/queries/preferences/moderation'
|
export * from '#/state/queries/preferences/moderation'
|
||||||
@@ -81,7 +82,9 @@ export function usePreferencesQuery() {
|
|||||||
if (aa.state.access !== aa.Access.Full) {
|
if (aa.state.access !== aa.Access.Full) {
|
||||||
data = {
|
data = {
|
||||||
...data,
|
...data,
|
||||||
moderationPrefs: DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
|
moderationPrefs: makeAgeRestrictedModerationPrefs(
|
||||||
|
data.moderationPrefs,
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return data
|
return data
|
||||||
|
|||||||
Reference in New Issue
Block a user