From d91adfb032bc287c0a0d17fa1070a2d0e582d65a Mon Sep 17 00:00:00 2001 From: Rye Date: Tue, 17 Mar 2026 20:13:17 +0100 Subject: [PATCH] refactor: animalCosmetics --- .../settings/account/AnimalCosmetics.tsx | 75 +++++++++++++++++++ src/app/features/settings/account/Profile.tsx | 68 +---------------- 2 files changed, 76 insertions(+), 67 deletions(-) create mode 100644 src/app/features/settings/account/AnimalCosmetics.tsx diff --git a/src/app/features/settings/account/AnimalCosmetics.tsx b/src/app/features/settings/account/AnimalCosmetics.tsx new file mode 100644 index 000000000..ada07ef99 --- /dev/null +++ b/src/app/features/settings/account/AnimalCosmetics.tsx @@ -0,0 +1,75 @@ +import { SequenceCard } from '$components/sequence-card'; +import { SettingTile } from '$components/setting-tile'; +import { useMatrixClient } from '$hooks/useMatrixClient'; +import { UserProfile } from '$hooks/useUserProfile'; +import { useSetting } from '$state/hooks/settings'; +import { settingsAtom } from '$state/settings'; +import { profilesCacheAtom } from '$state/userRoomProfile'; +import { Box, Switch, Text } from 'folds'; +import { useSetAtom } from 'jotai'; +import { useCallback } from 'react'; +import { SequenceCardStyle } from '../styles.css'; + +type AnimalCosmeticsProps = { + profile: UserProfile; + userId: string; +}; +export function AnimalCosmetics({ profile, userId }: Readonly) { + const mx = useMatrixClient(); + const setGlobalProfiles = useSetAtom(profilesCacheAtom); + const [renderAnimals, setRenderAnimals] = useSetting(settingsAtom, 'renderAnimals'); + + const isCat = profile.isCat || profile.extended?.['kitty.meow.is_cat'] === true; + const hasCats = profile.hasCats || profile.extended?.['kitty.meow.has_cats'] === true; + + const handleSaveField = useCallback( + async (key: string, value: boolean) => { + await mx.setExtendedProfileProperty?.(key, value); + setGlobalProfiles((prev) => { + const newCache = { ...prev }; + delete newCache[userId]; + return newCache; + }); + }, + [mx, userId, setGlobalProfiles] + ); + + return ( + + Animal Identity + + } + /> + + + handleSaveField('kitty.meow.is_cat', !isCat)} + /> + } + /> + + + handleSaveField('kitty.meow.has_cats', !hasCats)} + /> + } + /> + + + ); +} diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx index 68daf9bf8..45c66effb 100644 --- a/src/app/features/settings/account/Profile.tsx +++ b/src/app/features/settings/account/Profile.tsx @@ -23,7 +23,6 @@ import { Header, config, Spinner, - Switch, } from 'folds'; import FocusTrap from 'focus-trap-react'; import { useSetAtom } from 'jotai'; @@ -47,13 +46,12 @@ import { useCapabilities } from '$hooks/useCapabilities'; import { profilesCacheAtom } from '$state/userRoomProfile'; import { SequenceCardStyle } from '$features/settings/styles.css'; import { useUserPresence } from '$hooks/useUserPresence'; -import { useSetting } from '$state/hooks/settings'; -import { settingsAtom } from '$state/settings'; import { TimezoneEditor } from './TimezoneEditor'; import { PronounEditor } from './PronounEditor'; import { BioEditor } from './BioEditor'; import { NameColorEditor } from './NameColorEditor'; import { StatusEditor } from './StatusEditor'; +import { AnimalCosmetics } from './AnimalCosmetics'; type PronounSet = { summary: string; @@ -638,70 +636,6 @@ function ProfileExtended({ profile, userId }: Readonly) { ); } -type AnimalCosmeticsProps = { - profile: UserProfile; - userId: string; -}; -function AnimalCosmetics({ profile, userId }: Readonly) { - const mx = useMatrixClient(); - const setGlobalProfiles = useSetAtom(profilesCacheAtom); - const [renderAnimals, setRenderAnimals] = useSetting(settingsAtom, 'renderAnimals'); - - const isCat = profile.isCat || profile.extended?.['kitty.meow.is_cat'] === true; - const hasCats = profile.hasCats || profile.extended?.['kitty.meow.has_cats'] === true; - - const handleSaveField = useCallback( - async (key: string, value: boolean) => { - await mx.setExtendedProfileProperty?.(key, value); - setGlobalProfiles((prev) => { - const newCache = { ...prev }; - delete newCache[userId]; - return newCache; - }); - }, - [mx, userId, setGlobalProfiles] - ); - - return ( - - Animal Identity - - } - /> - - - handleSaveField('kitty.meow.is_cat', !isCat)} - /> - } - /> - - - handleSaveField('kitty.meow.has_cats', !hasCats)} - /> - } - /> - - - ); -} - export function Profile() { const mx = useMatrixClient(); const userId = mx.getUserId()!;