acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

gate group chats for under-18 users

Browse Source 
Per the group chats spec, users under 18 cannot be added to or participate in
group chats. This wires up the client-side half:

- expose isUnder18 flag from the AA context (conservative default when
  birthdate is unknown)
- new restrictGroupChatSettings helper that writes
  allowGroupInvites: 'none' to the chat actor declaration, called on signup
  and on birthdate-update when the user is under 18
- hide the 'New group chat' entry in InitiateChatFlow for under-18 users
- lock the 'Allow group chat invites from' toggle to 'none' for under-18 in
  chat settings, with explanatory copy
- pass kind: 'direct' to listConvos for under-18 users so groups don't show
  in the requests inbox or count toward the unread/requests badges
This commit is contained in:
Samuel Newman
2026-05-19 17:06:16 +03:00
parent 709589fa36
commit 652fa5ddcd
9 changed files with 104 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ageAssurance/index.tsx
+7 -2
View File
@@ -41,6 +41,7 @@ const AgeAssuranceStateContext = createContext<{
flags: {
adultContentDisabled: boolean
chatDisabled: boolean
isUnder18: boolean
isOverRegionMinAccessAge: boolean
isOverAppMinAccessAge: boolean
}
@@ -55,6 +56,7 @@ const AgeAssuranceStateContext = createContext<{
flags: {
adultContentDisabled: false,
chatDisabled: false,
isUnder18: false,
isOverRegionMinAccessAge: false,
isOverAppMinAccessAge: false,
},
@@ -106,7 +108,9 @@ function InnerProvider({children}: {children: React.ReactNode}) {
<AgeAssuranceStateContext.Provider
value={useMemo(() => {
const chatDisabled = state.access !== AgeAssuranceAccess.Full
const isUnderAdultAge = data?.birthdate
// Conservative default: if we don't yet know the birthdate, treat as
// under 18 so we don't briefly expose group-chat UI.
const isUnder18 = data?.birthdate
? isUnderAge(data.birthdate, 18)
: true
const isOverRegionMinAccessAge = data?.birthdate
@@ -116,7 +120,7 @@ function InnerProvider({children}: {children: React.ReactNode}) {
? !isUnderAge(data.birthdate, MIN_ACCESS_AGE)
: false
const adultContentDisabled =
state.access !== AgeAssuranceAccess.Full || isUnderAdultAge
state.access !== AgeAssuranceAccess.Full || isUnder18
return {
Access: AgeAssuranceAccess,
Status: AgeAssuranceStatus,
@@ -124,6 +128,7 @@ function InnerProvider({children}: {children: React.ReactNode}) {
flags: {
adultContentDisabled,
chatDisabled,
isUnder18,
isOverRegionMinAccessAge,
isOverAppMinAccessAge,
},
src/components/dms/InitiateChatFlow.tsx
+8 -1
View File
@@ -32,6 +32,7 @@ import {PersonGroup_Stroke2_Corner2_Rounded as PersonGroupIcon} from '#/componen
import {TimesLarge_Stroke2_Corner0_Rounded as XIcon} from '#/components/icons/Times'
import * as ProfileCard from '#/components/ProfileCard'
import {Text} from '#/components/Typography'
import {useAgeAssurance} from '#/ageAssurance'
import {IS_NATIVE, IS_WEB} from '#/env'
import type * as bsky from '#/types/bsky'
import {ChatProfileTabs} from './ChatProfileTabs'
@@ -205,6 +206,7 @@ export function InitiateChatFlow({
const [footerHeight, setFooterHeight] = useState(0)
const listRef = useRef<ListMethods>(null)
const {currentAccount} = useSession()
const aa = useAgeAssurance()
const inputRef = useRef<TextInput>(null)
const [searchText, setSearchText] = useState('')
@@ -320,7 +322,11 @@ export function InitiateChatFlow({
})
}
if (chatState === ChatState.NEW_CHAT && searchText === '') {
if (
chatState === ChatState.NEW_CHAT &&
searchText === '' &&
!aa.flags.isUnder18
) {
_items.unshift({type: 'newGroupChat', key: 'newGroupChat'})
}
@@ -334,6 +340,7 @@ export function InitiateChatFlow({
results,
currentAccount?.did,
follows,
aa.flags.isUnder18,
])
if (searchText && !isFetching && !items.length && !isError) {
src/screens/Messages/ChatList.tsx
+4
View File
@@ -174,6 +174,7 @@ export function ChatList({
}) {
const t = useTheme()
const {t: l} = useLingui()
const aa = useAgeAssurance()
const scrollElRef: ListRef = useAnimatedRef()
const {isWithinSplitView} = useIsWithinSplitView()
@@ -206,6 +207,7 @@ export function ChatList({
const {refetch: refetchInbox} = useListConvosQuery({
status: 'request',
kind: aa.flags.isUnder18 ? 'direct' : 'all',
})
useRefreshOnFocus(refetch)
@@ -408,6 +410,7 @@ export function ChatList({
export function Header({newChatControl}: {newChatControl: DialogControlProps}) {
const {t: l} = useLingui()
const {gtMobile} = useBreakpoints()
const aa = useAgeAssurance()
const requireEmailVerification = useRequireEmailVerification()
const leftConvos = useLeftConvos()
@@ -415,6 +418,7 @@ export function Header({newChatControl}: {newChatControl: DialogControlProps}) {
useListConvosQuery({
status: 'request',
readState: 'unread',
kind: aa.flags.isUnder18 ? 'direct' : 'all',
})
const inboxAllConvos =
src/screens/Messages/Inbox.tsx
+6 -1
View File
@@ -43,6 +43,7 @@ import * as Layout from '#/components/Layout'
import {ListFooter} from '#/components/Lists'
import * as Toast from '#/components/Toast'
import {Text} from '#/components/Typography'
import {useAgeAssurance} from '#/ageAssurance'
import {IS_NATIVE} from '#/env'
import {RequestListItem} from './components/RequestListItem'
import {useIsWithinSplitView} from './components/splitView/context'
@@ -63,8 +64,12 @@ export function MessagesInboxScreen(props: Props) {
export function MessagesInboxScreenInner({}: Props) {
const {gtTablet} = useBreakpoints()
const aa = useAgeAssurance()
const listConvosQuery = useListConvosQuery({status: 'request'})
const listConvosQuery = useListConvosQuery({
status: 'request',
kind: aa.flags.isUnder18 ? 'direct' : 'all',
})
const {data} = listConvosQuery
const leftConvos = useLeftConvos()
src/screens/Messages/Settings.tsx
+18 -6
View File
@@ -20,6 +20,7 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRightIcon} from '#/compon
import * as Layout from '#/components/Layout'
import * as Toast from '#/components/Toast'
import {Text} from '#/components/Typography'
import {useAgeAssurance} from '#/ageAssurance'
import {useAnalytics} from '#/analytics'
import {IS_NATIVE} from '#/env'
import {useBackgroundNotificationPreferences} from '../../../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
@@ -45,6 +46,7 @@ export function MessagesSettingsScreenInner({}: Props) {
const t = useTheme()
const {t: l} = useLingui()
const ax = useAnalytics()
const aa = useAgeAssurance()
const {currentAccount} = useSession()
const {data: profile} = useProfileQuery({
did: currentAccount!.did,
@@ -53,6 +55,7 @@ export function MessagesSettingsScreenInner({}: Props) {
const exportCarControl = Dialog.useDialogControl()
const isGroupChatEnabled = ax.features.enabled(ax.features.GroupChatsEnable)
const groupInvitesLocked = aa.flags.isUnder18
const allowMessagesFromOptions: {name: AllowIncoming; label: string}[] = [
{
@@ -190,17 +193,26 @@ export function MessagesSettingsScreenInner({}: Props) {
a.leading_snug,
t.atoms.text_contrast_high,
]}>
<Trans>
You can continue ongoing conversations regardless of which
setting you choose.
</Trans>
{groupInvitesLocked ? (
<Trans>
Group chats are only available to users 18 and over.
</Trans>
) : (
<Trans>
You can continue ongoing conversations regardless of which
setting you choose.
</Trans>
)}
</Text>
<Toggle.Group
disabled={groupInvitesLocked}
label={l`Allow group chat invites from`}
type="radio"
values={[
(profile?.associated?.chat
?.allowGroupInvites as AllowIncoming) ?? 'following',
groupInvitesLocked
? 'none'
: ((profile?.associated?.chat
?.allowGroupInvites as AllowIncoming) ?? 'following'),
]}
onChange={onSelectGroupInvitesFrom}>
<View>
src/state/birthdate.ts
+5
View File
@@ -1,6 +1,7 @@
import {useMemo} from 'react'
import {useMutation, useQueryClient} from '@tanstack/react-query'
import {restrictGroupChatSettings} from '#/state/queries/messages/restrictChatSettings'
import {preferencesQueryKey} from '#/state/queries/preferences'
import {useAgent, useSession} from '#/state/session'
import {usePatchAgeAssuranceOtherRequiredData} from '#/ageAssurance'
@@ -67,6 +68,10 @@ export function useBirthdateMutation() {
if (isUnderAge(birthDate.toISOString(), 18)) {
maybeRestrictChatSettings({agent})
const did = agent.sessionManager.did
if (did) {
await restrictGroupChatSettings({agent, did})
}
}
/**
src/state/queries/messages/list-conversations.tsx
+3
View File
@@ -19,6 +19,7 @@ import {useMessagesEventBus} from '#/state/messages/events'
import {useModerationOpts} from '#/state/preferences/moderation-opts'
import {useAgent, useSession} from '#/state/session'
import {parseConvoView} from '#/components/dms/util'
import {useAgeAssurance} from '#/ageAssurance'
import {useLeftConvos} from './leave-conversation'
const DEFAULT_LIMIT = 10
@@ -111,10 +112,12 @@ export function ListConvosProviderInner({
}: {
children: React.ReactNode
}) {
const aa = useAgeAssurance()
const {refetch, data} = useListConvosQuery({
readState: 'unread',
limit: UNREAD_LIMIT,
lockStatus: 'unlocked',
kind: aa.flags.isUnder18 ? 'direct' : 'all',
})
const messagesBus = useMessagesEventBus()
const queryClient = useQueryClient()
src/state/queries/messages/restrictChatSettings.ts
+45 -1
View File
@@ -3,7 +3,10 @@ import {type ChatBskyActorDeclaration} from '@atproto/api'
import {networkRetry} from '#/lib/async/retry'
import {logger} from '#/logger'
import {setOtherRequiredDataActorDeclarationCache} from '#/ageAssurance/data'
import {
getOtherRequiredDataFromCache,
setOtherRequiredDataActorDeclarationCache,
} from '#/ageAssurance/data'
/**
* Helper to update the chat settings record.
@@ -37,3 +40,44 @@ export async function restrictChatSettings({
logger.error(`restrictChatSettings: failed to set chat declaration`)
}
}
/**
* Locks the user out of being added to group chats by setting
* `allowGroupInvites: 'none'` on the chat actor declaration. Used for under-18
* users, who per spec cannot participate in group chats.
*
* Preserves the existing `allowIncoming` value if one is cached, otherwise
* defaults to 'following' (the lexicon default) since the field is required.
*/
export async function restrictGroupChatSettings({
agent,
did,
}: {
agent: AtpAgent
did: string
}): Promise<void> {
const cached = getOtherRequiredDataFromCache({did})?.actorDeclaration
if (cached?.allowGroupInvites === 'none') return
try {
const record: ChatBskyActorDeclaration.Main = {
$type: 'chat.bsky.actor.declaration',
allowIncoming: cached?.allowIncoming ?? 'following',
allowGroupInvites: 'none',
}
await networkRetry(3, () =>
agent.com.atproto.repo.putRecord({
repo: did,
collection: 'chat.bsky.actor.declaration',
rkey: 'self',
record,
}),
)
setOtherRequiredDataActorDeclarationCache({
did,
actorDeclaration: record,
})
} catch {
logger.error(`restrictGroupChatSettings: failed to set chat declaration`)
}
}
src/state/session/agent.ts
+8 -1
View File
@@ -19,9 +19,13 @@ import {
PUBLIC_BSKY_SERVICE,
TIMELINE_SAVED_FEED,
} from '#/lib/constants'
import {getAge} from '#/lib/strings/time'
import {logger} from '#/logger'
import {snoozeBirthdateUpdateAllowedForDid} from '#/state/birthdate'
import {restrictChatSettings} from '#/state/queries/messages/restrictChatSettings'
import {
restrictChatSettings,
restrictGroupChatSettings,
} from '#/state/queries/messages/restrictChatSettings'
import {snoozeEmailConfirmationPrompt} from '#/state/shell/reminders'
import {
prefetchAgeAssuranceData,
@@ -223,6 +227,9 @@ export async function createAgentAndCreateAccount(
if (state.access !== AgeAssuranceAccess.Full) {
restrictChatSettings({agent, did: account.did})
}
if (getAge(birthDate) < 18) {
restrictGroupChatSettings({agent, did: account.did})
}
}),
]).then(promises => {
const rejected = promises.filter(p => p.status === 'rejected')