Use single restrictChatSettings util, use new flags

src/ageAssurance/util.ts

@@ -2,19 +2,13 @@ import {useMemo} from 'react'
 import {
   ageAssuranceRuleIDs as ids,
   type AppBskyAgeassuranceDefs,
-  type AtpAgent,
   getAgeAssuranceRegionConfig,
   type ModerationPrefs,
 } from '@atproto/api'
 
 import {getAge} from '#/lib/strings/time'
-import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
 import {DEFAULT_LOGGED_OUT_LABEL_PREFERENCES} from '#/state/queries/preferences/moderation'
-import {
-  getDidFromAgentSession,
-  getOtherRequiredDataFromCache,
-  useAgeAssuranceServerDataContext,
-} from '#/ageAssurance/data'
+import {useAgeAssuranceServerDataContext} from '#/ageAssurance/data'
 import {
   AgeAssuranceAccess,
   type AgeAssuranceFlags,
@@ -121,19 +115,6 @@ export const makeAgeRestrictedModerationPrefs = (
   labels: DEFAULT_LOGGED_OUT_LABEL_PREFERENCES,
 })
 
-/**
- * Checks our cache of the actor's chat declaration record, and if it's not
- * already restricted, restricts it.
- */
-export function maybeRestrictChatSettings({agent}: {agent: AtpAgent}) {
-  const did = getDidFromAgentSession(agent)
-  if (!did) return
-  const data = getOtherRequiredDataFromCache({did})
-  // ...update the chat setting record if allowIncoming is not already 'none'.
-  if (data?.actorDeclaration?.allowIncoming === 'none') return
-  restrictChatSettings({agent, did})
-}
-
 export function computeAgeAssuranceFlags({
   state,
   regionConfig,
@@ -143,10 +124,12 @@ export function computeAgeAssuranceFlags({
   regionConfig: AppBskyAgeassuranceDefs.ConfigRegion
   metadata?: AgeAssuranceMetadata
 }): AgeAssuranceFlags {
-  const chatDisabled = state.access !== AgeAssuranceAccess.Full
+  const isAgeRestricted = state.access !== AgeAssuranceAccess.Full
+  const chatDisabled = isAgeRestricted
   const isDeclaredUnderAdultAge = metadata?.declaredAge
     ? metadata.declaredAge < 18
     : true
+  const groupChatDisabled = chatDisabled || isDeclaredUnderAdultAge
   const isOverRegionMinAccessAge = metadata?.declaredAge
     ? metadata.declaredAge >= regionConfig.minAccessAge
     : false
@@ -157,8 +140,10 @@ export function computeAgeAssuranceFlags({
     state.access !== AgeAssuranceAccess.Full || isDeclaredUnderAdultAge
 
   return {
+    isAgeRestricted,
     adultContentDisabled,
     chatDisabled,
+    groupChatDisabled,
     isDeclaredUnderAdultAge,
     isOverRegionMinAccessAge,
     isOverAppMinAccessAge,