fix moderation preferences for non-AA'd users (#8712)

src/state/ageAssurance/const.ts

@@ -2,10 +2,10 @@ import {type ModerationPrefs} from '@atproto/api'
 
 import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/moderation'
 
-export const AGE_RESTRICTED_MODERATION_PREFS: ModerationPrefs = {
+export const makeAgeRestrictedModerationPrefs = (
+  prefs: ModerationPrefs,
+): ModerationPrefs => ({
+  ...prefs,
   adultContentEnabled: false,
   labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
-  labelers: [],
-  mutedWords: [],
-  hiddenPosts: [],
-}
+})

src/state/queries/preferences/index.ts

@@ -11,7 +11,7 @@ import {replaceEqualDeep} from '#/lib/functions'
 import {getAge} from '#/lib/strings/time'
 import {logger} from '#/logger'
 import {useAgeAssuranceContext} from '#/state/ageAssurance'
-import {AGE_RESTRICTED_MODERATION_PREFS} from '#/state/ageAssurance/const'
+import {makeAgeRestrictedModerationPrefs} from '#/state/ageAssurance/const'
 import {STALE} from '#/state/queries'
 import {
   DEFAULT_HOME_FEED_PREFS,
@@ -77,7 +77,9 @@ export function usePreferencesQuery() {
       (data: UsePreferencesQueryResponse) => {
         const isUnderage = (data.userAge || 0) < 18
         if (isUnderage || isAgeRestricted) {
-          data.moderationPrefs = AGE_RESTRICTED_MODERATION_PREFS
+          data.moderationPrefs = makeAgeRestrictedModerationPrefs(
+            data.moderationPrefs,
+          )
         }
         return data
       },