diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx index 15a9fe1e..fc774763 100644 --- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx +++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx @@ -84,9 +84,9 @@ export function RoomMentionAutocomplete({ const mDirects = useAtomValue(mDirectAtom); const rooms = useAtomValue(allRoomsAtom); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(rooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const allRooms = useMemo( () => Array.from(rooms).sort(factoryRoomIdByAtoZ(getRoomName)), diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx index 57e8d959..0924df18 100644 --- a/src/app/components/emoji-board/EmojiBoard.tsx +++ b/src/app/components/emoji-board/EmojiBoard.tsx @@ -379,8 +379,8 @@ export function EmojiBoard({ addToRecentEmoji = true, }: EmojiBoardProps) { const ct = useClient(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(imagePackRooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); const emojiTab = tab === EmojiBoardTab.Emoji; const usage = emojiTab ? ImageUsage.Emoticon : ImageUsage.Sticker; diff --git a/src/app/components/user-profile/UserChips.tsx b/src/app/components/user-profile/UserChips.tsx index f09507f7..25dfb3eb 100644 --- a/src/app/components/user-profile/UserChips.tsx +++ b/src/app/components/user-profile/UserChips.tsx @@ -230,7 +230,6 @@ type MutualRoomsData = { directs: string[]; }; -const EMPTY_LIST: string[] = []; export function MutualRoomsChip({ userId }: { userId: string }) { const ct = useClient(); const mutualRoomsState = useMutualRooms(userId); @@ -240,11 +239,9 @@ export function MutualRoomsChip({ userId }: { userId: string }) { const directs = useDirectRooms(); const useAuthentication = useMediaAuthentication(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes( - mutualRoomsState.status === AsyncStatus.Success ? mutualRoomsState.data : EMPTY_LIST - ); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const [cords, setCords] = useState(); diff --git a/src/app/features/add-existing/AddExisting.tsx b/src/app/features/add-existing/AddExisting.tsx index 337b0c62..ce1ae574 100644 --- a/src/app/features/add-existing/AddExisting.tsx +++ b/src/app/features/add-existing/AddExisting.tsx @@ -87,9 +87,9 @@ export function AddExistingModal({ parentId, space, requestClose }: AddExistingM const roomIdToParents = useAtomValue(roomToParentsAtom); const scrollRef = useRef(null); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(ct.rooms.join.read); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const [selected, setSelected] = useState([]); diff --git a/src/app/features/lobby/LobbyHeader.tsx b/src/app/features/lobby/LobbyHeader.tsx index 9e1b514c..3583edd9 100644 --- a/src/app/features/lobby/LobbyHeader.tsx +++ b/src/app/features/lobby/LobbyHeader.tsx @@ -148,9 +148,9 @@ export function LobbyHeader({ showProfile, powerLevels }: LobbyHeaderProps) { const [menuAnchor, setMenuAnchor] = useState(); const screenSize = useScreenSizeContext(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(spaceId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const avatarMxc = getRoomAvatar(spaceId); const avatarUrl = avatarMxc diff --git a/src/app/features/lobby/LobbyHero.tsx b/src/app/features/lobby/LobbyHero.tsx index e6fa24d0..71b7a07e 100644 --- a/src/app/features/lobby/LobbyHero.tsx +++ b/src/app/features/lobby/LobbyHero.tsx @@ -22,9 +22,9 @@ export function LobbyHero() { const useAuthentication = useMediaAuthentication(); const spaceId = useSpace(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(spaceId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const topic = useRoomTopic(spaceId); const avatarMxc = getRoomAvatar(spaceId); diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx index 64a86d44..c1431f89 100644 --- a/src/app/features/lobby/SpaceItem.tsx +++ b/src/app/features/lobby/SpaceItem.tsx @@ -191,9 +191,10 @@ type SpaceProfileProps = { function SpaceProfile({ roomId, suggested, closed, categoryId, handleClose }: SpaceProfileProps) { const ct = useClient(); const useAuthentication = useMediaAuthentication(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const name = getRoomName(roomId) ?? 'Unknown'; const avatar = getRoomAvatar(roomId); diff --git a/src/app/features/message-search/MessageSearch.tsx b/src/app/features/message-search/MessageSearch.tsx index 161c0d20..2ca88e0f 100644 --- a/src/app/features/message-search/MessageSearch.tsx +++ b/src/app/features/message-search/MessageSearch.tsx @@ -191,11 +191,10 @@ export function MessageSearch({ }, [lastVItemIndex, lastGroupIndex, fetchNextPage, isFetchingNextPage, hasNextPage]); const roomToTimeline = useObservableValue(ct.roomToTimeline); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes( - searchPathSearchParams.global === 'true' ? allRooms : rooms - ); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); return ( diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx index baa194a9..b7428002 100644 --- a/src/app/features/room-settings/RoomSettings.tsx +++ b/src/app/features/room-settings/RoomSettings.tsx @@ -77,9 +77,10 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) { const ct = useClient(); const useAuthentication = useMediaAuthentication(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); + const roomAvatar = getRoomAvatar(roomId); const roomName = getRoomName(roomId); diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx index 824d8ba1..df0bbc70 100644 --- a/src/app/features/room/RoomTimeline.tsx +++ b/src/app/features/room/RoomTimeline.tsx @@ -112,9 +112,10 @@ export function RoomTimeline({ eventId, roomInputRef, editor, timeline }: RoomTi const powerLevels = usePowerLevelsContext(); const creators = useRoomCreators(roomId); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const membersAPI = useRoomMembersAPI(); const creatorsTag = useRoomCreatorsTag(); diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx index 69d65dca..26dacb10 100644 --- a/src/app/features/room/RoomViewHeader.tsx +++ b/src/app/features/room/RoomViewHeader.tsx @@ -271,9 +271,10 @@ export function RoomViewHeader({ callView }: { callView?: boolean }) { const roomToJoinRule = useObservableValue(ct.roomToJoinRule); const pinnedEvents = useRoomPinnedEvents(roomId); - const [getRoomHeroes, roomToHeroMemberResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMemberResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMemberResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const avatarMxc = getRoomAvatar(roomId); const name = getRoomName(roomId) ?? 'Unknown'; diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx index 8106eafb..ea14356f 100644 --- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx +++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx @@ -181,8 +181,9 @@ export const RoomPinMenu = forwardRef(({ reque const redactedSet = useObservableValueOptionally(timeline?.relations.redacted); const edits = useObservableValueOptionally(timeline?.relations.edits.eventToRelations); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const membersAPI = useRoomMembersAPI(); const { linkifyOpts, htmlReactParserOptions } = useMessageParserOptions( roomId, diff --git a/src/app/features/room/thread-view/TimelineView.tsx b/src/app/features/room/thread-view/TimelineView.tsx index 61da69f8..aed83486 100644 --- a/src/app/features/room/thread-view/TimelineView.tsx +++ b/src/app/features/room/thread-view/TimelineView.tsx @@ -108,8 +108,9 @@ export function TimelineView({ threadTimeline, threadInputRef }: TimelineViewPro const powerLevels = usePowerLevelsContext(); const creators = useRoomCreators(roomId); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); const membersAPI = useRoomMembersAPI(); const creatorsTag = useRoomCreatorsTag(); diff --git a/src/app/features/search/Search.tsx b/src/app/features/search/Search.tsx index fe6c5db8..221aa084 100644 --- a/src/app/features/search/Search.tsx +++ b/src/app/features/search/Search.tsx @@ -153,9 +153,9 @@ export function Search({ requestClose }: SearchProps) { const topActiveRooms = useTopActiveRooms(searchRoomType, rooms, directs, spaces); const targetRooms = useSearchTargetRooms(searchRoomType, rooms, directs, spaces); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(directs); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const getTargetStr: SearchItemStrGetter = useCallback( (roomId: string) => { diff --git a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx index 5f5670f0..f1ad33c2 100644 --- a/src/app/features/settings/emojis-stickers/GlobalPacks.tsx +++ b/src/app/features/settings/emojis-stickers/GlobalPacks.tsx @@ -58,12 +58,8 @@ function GlobalPackSelector({ }) { const ct = useClient(); - const imagePackRooms = useMemo( - () => packs.map((pack) => pack.address?.roomId).filter((rId) => typeof rId === 'string'), - [packs] - ); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(imagePackRooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); const roomToPacks = useMemo(() => { const rToP = new Map(); diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx index fb3dab07..38fbd6c7 100644 --- a/src/app/features/space-settings/SpaceSettings.tsx +++ b/src/app/features/space-settings/SpaceSettings.tsx @@ -77,9 +77,10 @@ export function SpaceSettings({ initialPage, requestClose }: SpaceSettingsProps) const roomId = useRoom(); const useAuthentication = useMediaAuthentication(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); + const roomAvatar = getRoomAvatar(roomId); const roomName = getRoomName(roomId); diff --git a/src/app/hooks/storage/useGetRoomAvatar.ts b/src/app/hooks/storage/useGetRoomAvatar.ts index b2fe8716..e50dda8c 100644 --- a/src/app/hooks/storage/useGetRoomAvatar.ts +++ b/src/app/hooks/storage/useGetRoomAvatar.ts @@ -1,17 +1,17 @@ import { useCallback } from 'react'; +import { useAtomValue } from 'jotai'; import { useClient } from '../useClient'; import { useObservableValue } from '../useObservableValue'; -import { GetRoomHeroesCallback, RoomToHeroMembers } from './useRoomHeros'; +import { GetRoomHeroesCallback } from './useRoomHeros'; import { roomMemberContentAvatarUrl } from '../../utils/room'; +import { roomToHeroMembersAtom } from '../../state/room/roomToHeroMembers'; export type GetRoomAvatarCallback = (roomId: string) => string | undefined; -export const useGetRoomAvatar = ( - getRoomHeroes: GetRoomHeroesCallback, - roomToHeroMembers: RoomToHeroMembers | undefined -): GetRoomAvatarCallback => { +export const useGetRoomAvatar = (getRoomHeroes: GetRoomHeroesCallback): GetRoomAvatarCallback => { const ct = useClient(); const roomToAvatar = useObservableValue(ct.roomToAvatar); + const roomToHeroMembers = useAtomValue(roomToHeroMembersAtom); const getRoomAvatar: GetRoomAvatarCallback = useCallback( (roomId: string) => { diff --git a/src/app/hooks/storage/useGetRoomName.ts b/src/app/hooks/storage/useGetRoomName.ts index ca083daa..5c6c6fba 100644 --- a/src/app/hooks/storage/useGetRoomName.ts +++ b/src/app/hooks/storage/useGetRoomName.ts @@ -1,19 +1,19 @@ import { useCallback } from 'react'; +import { useAtomValue } from 'jotai'; import { useClient } from '../useClient'; import { useObservableValue } from '../useObservableValue'; -import { GetRoomHeroesCallback, RoomToHeroMembers } from './useRoomHeros'; +import { GetRoomHeroesCallback } from './useRoomHeros'; import { getMxIdLocalPart } from '../../utils/matrix'; import { roomMemberContentDisplayname } from '../../utils/room'; +import { roomToHeroMembersAtom } from '../../state/room/roomToHeroMembers'; export type GetRoomNameCallback = (roomId: string) => string | undefined; -export const useGetRoomName = ( - getRoomHeroes: GetRoomHeroesCallback, - roomToHeroMembers: RoomToHeroMembers | undefined -): GetRoomNameCallback => { +export const useGetRoomName = (getRoomHeroes: GetRoomHeroesCallback): GetRoomNameCallback => { const ct = useClient(); const roomToName = useObservableValue(ct.roomToName); const roomToAlias = useObservableValue(ct.roomToAlias); + const roomToHeroMembers = useAtomValue(roomToHeroMembersAtom); const getRoomName: GetRoomNameCallback = useCallback( (roomId: string) => { @@ -25,7 +25,7 @@ export const useGetRoomName = ( const members = roomToHeroMembers?.get(roomId); - const heroesName: string[] = getRoomHeroes(roomId).map((userId) => { + const heroNames: string[] = getRoomHeroes(roomId).map((userId) => { const member = members?.get(userId); if (!member) return getMxIdLocalPart(userId) ?? userId; const { content } = member; @@ -34,9 +34,19 @@ export const useGetRoomName = ( return username; }); - if (heroesName) return heroesName.join(', '); + if (heroNames.length === 0) { + return undefined; + } - return undefined; + if (heroNames.length === 1) { + return heroNames[0]; + } + + if (heroNames.length === 2) { + return `${heroNames[0]} & ${heroNames[1]}`; + } + + return `${heroNames.slice(0, -1).join(', ')} & ${heroNames.at(-1)}`; }, [roomToName, roomToAlias, getRoomHeroes, roomToHeroMembers] ); diff --git a/src/app/hooks/storage/useRoomHeros.ts b/src/app/hooks/storage/useRoomHeros.ts index 7d18b316..ab5357de 100644 --- a/src/app/hooks/storage/useRoomHeros.ts +++ b/src/app/hooks/storage/useRoomHeros.ts @@ -1,22 +1,10 @@ -import { useCallback, useMemo } from 'react'; -import { PendingObservableResult } from 'neurone/lib/utils/observable'; -import { StateEventWithoutRoomId } from 'neurone/lib/api/types'; +import { useCallback } from 'react'; import { useClient } from '../useClient'; -import { - useComputedPendingObservableResult, - useObservableValue, - useObservableValuePromise, -} from '../useObservableValue'; -import { getJoinRoomMemberId } from '../../../client/storage/collections'; - -export type UserIdToRoomMember = Map; -export type RoomToHeroMembers = Map; +import { useObservableValue } from '../useObservableValue'; export type GetRoomHeroesCallback = (roomId: string) => string[]; -export const useRoomHeroes = ( - roomOrRooms: string | string[] -): [GetRoomHeroesCallback, PendingObservableResult] => { +export const useRoomHeroes = (): GetRoomHeroesCallback => { const ct = useClient(); const roomToSummary = useObservableValue(ct.roomToSummary); const directRoomToUser = useObservableValue(ct.directRoomToUser); @@ -31,34 +19,5 @@ export const useRoomHeroes = ( }, [roomToSummary, directRoomToUser] ); - - const membersResult = useObservableValuePromise( - useMemo(() => { - const ids = Array.isArray(roomOrRooms) - ? roomOrRooms.flatMap((roomId) => - getHeroes(roomId).map((userId) => getJoinRoomMemberId(roomId, userId)) - ) - : getHeroes(roomOrRooms).map((userId) => getJoinRoomMemberId(roomOrRooms, userId)); - - return ct.storage.joinRoomMember.observableRead.getMultiple(ids); - }, [roomOrRooms, getHeroes, ct]) - ); - - const roomToHeroesResult: PendingObservableResult = - useComputedPendingObservableResult( - membersResult, - useCallback((members) => { - const roomToHeroes = new Map(); - members.forEach((member) => { - if (!member) return; - const { roomId, userId, event } = member; - const userToEvent: UserIdToRoomMember = roomToHeroes.get(roomId) ?? new Map(); - userToEvent.set(userId, event); - roomToHeroes.set(roomId, userToEvent); - }); - return roomToHeroes; - }, []) - ); - - return [getHeroes, roomToHeroesResult]; + return getHeroes; }; diff --git a/src/app/hooks/useLocalRoomSummary.ts b/src/app/hooks/useLocalRoomSummary.ts index 9f105cff..b1359d5e 100644 --- a/src/app/hooks/useLocalRoomSummary.ts +++ b/src/app/hooks/useLocalRoomSummary.ts @@ -18,9 +18,10 @@ export type LocalRoomSummary = { }; export const useLocalRoomSummary = (roomId: string): LocalRoomSummary => { const ct = useClient(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(roomId); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); const roomTopic = useRoomTopic(roomId); const roomToAlias = useObservableValue(ct.roomToAlias); const roomToJoinRule = useObservableValue(ct.roomToJoinRule); diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx index 9463692d..1541c11f 100644 --- a/src/app/pages/client/direct/Direct.tsx +++ b/src/app/pages/client/direct/Direct.tsx @@ -183,9 +183,10 @@ export function Direct() { const scrollRef = useRef(null); const directs = useDirectRooms(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(directs); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); + const roomToJoinRule = useObservableValue(ct.roomToJoinRule); const roomToNotifications = useRoomsNotifications(directs, roomToNotificationsAtom); const unreadRooms = useRoomsUnread(directs, unreadRoomsAtom); diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx index cc1b8fe0..2447a9ac 100644 --- a/src/app/pages/client/home/Home.tsx +++ b/src/app/pages/client/home/Home.tsx @@ -207,9 +207,10 @@ export function Home() { const scrollRef = useRef(null); const rooms = useHomeRooms(); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(rooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); + const roomToJoinRule = useObservableValue(ct.roomToJoinRule); const roomToNotifications = useRoomsNotifications(rooms, roomToNotificationsAtom); const unreadRooms = useRoomsUnread(rooms, unreadRoomsAtom); diff --git a/src/app/pages/client/inbox/Notifications.tsx b/src/app/pages/client/inbox/Notifications.tsx index 09763ef5..25409374 100644 --- a/src/app/pages/client/inbox/Notifications.tsx +++ b/src/app/pages/client/inbox/Notifications.tsx @@ -596,15 +596,11 @@ export function Notifications() { } }, [timelineState, notificationTimeline, lastVItemIndex, loadTimeline]); - const notificationRooms = useMemo( - () => Array.from(new Set(notificationTimeline.groups.map((g) => g.roomId))), - [notificationTimeline] - ); - const roomToTimeline = useObservableValue(ct.roomToTimeline); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(notificationRooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); return ( diff --git a/src/app/pages/client/sidebar/SpaceTabs.tsx b/src/app/pages/client/sidebar/SpaceTabs.tsx index 93c3f1a5..488b18e2 100644 --- a/src/app/pages/client/sidebar/SpaceTabs.tsx +++ b/src/app/pages/client/sidebar/SpaceTabs.tsx @@ -72,7 +72,6 @@ import { parseSidebar, sidebarItemWithout, useSidebarItems, - useSidebarRooms, } from '../../../hooks/useSidebarItems'; import { AccountDataType } from '../../../../types/matrix/accountData'; import { ScreenSize, useScreenSizeContext } from '../../../hooks/useScreenSize'; @@ -667,11 +666,9 @@ export function SpaceTabs({ scrollRef }: SpaceTabsProps) { const [openedFolder, setOpenedFolder] = useAtom(useOpenedSidebarFolderAtom()); const [draggingItem, setDraggingItem] = useState(); - const sidebarRooms = useSidebarRooms(originalSidebarItems); - const [getRoomHeroes, roomToHeroResult] = useRoomHeroes(sidebarRooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroResult.value); - - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroResult.value); + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); useEffect(() => { localEchoSidebarItem(originalSidebarItems); diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index bbd5d489..62672627 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -401,9 +401,11 @@ export function Space() { const hierarchy = useSpaceJoinedHierarchy(spaceId); const rooms = useMemo(() => hierarchy.map((item) => item.roomId), [hierarchy]); - const [getRoomHeroes, roomToHeroMembersResult] = useRoomHeroes(rooms); - const getRoomName = useGetRoomName(getRoomHeroes, roomToHeroMembersResult.value); - const getRoomAvatar = useGetRoomAvatar(getRoomHeroes, roomToHeroMembersResult.value); + + const getRoomHeroes = useRoomHeroes(); + const getRoomName = useGetRoomName(getRoomHeroes); + const getRoomAvatar = useGetRoomAvatar(getRoomHeroes); + const roomToJoinRule = useObservableValue(ct.roomToJoinRule); const roomToNotifications = useRoomsNotifications(rooms, roomToNotificationsAtom); const unreadRooms = useRoomsUnread(rooms, unreadRoomsAtom); diff --git a/src/app/state/hooks/useBindAtoms.ts b/src/app/state/hooks/useBindAtoms.ts index c6a95449..254453f3 100644 --- a/src/app/state/hooks/useBindAtoms.ts +++ b/src/app/state/hooks/useBindAtoms.ts @@ -8,12 +8,14 @@ import { } from '../room/roomToNotifications'; import { ClientContext } from '../../../client/context'; import { unreadRoomsAtom, useBindUnreadRoomsAtom } from '../room/roomToUnread'; +import { roomToHeroMembersAtom, useBindRoomToHeroMembers } from '../room/roomToHeroMembers'; export const useBindAtoms = (ct: ClientContext) => { useBindMDirectAtom(ct, mDirectAtom); useBindAllRoomsAtom(ct, allRoomsAtom); useBindRoomToParentsAtom(ct, roomToParentsAtom); useBindRoomToNotificationsAtom(ct, roomToNotificationsAtom); + useBindRoomToHeroMembers(ct, roomToHeroMembersAtom); useBindUnreadRoomsAtom(ct, unreadRoomsAtom); useBindRoomIdToTypingMembersAtom(ct, roomIdToTypingMembersAtom); diff --git a/src/app/state/room/roomToHeroMembers.ts b/src/app/state/room/roomToHeroMembers.ts new file mode 100644 index 00000000..6c805516 --- /dev/null +++ b/src/app/state/room/roomToHeroMembers.ts @@ -0,0 +1,75 @@ +import { useCallback, useEffect } from 'react'; +import { StateEventWithoutRoomId } from 'neurone/lib/api/types'; +import { atom, useSetAtom } from 'jotai'; +import { ClientContext } from '../../../client/context'; +import { useObservableValue } from '../../hooks/useObservableValue'; +import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback'; +import { getJoinRoomMemberId } from '../../../client/storage/collections'; + +export type UserIdToRoomMember = Map; +export type RoomToHeroMembers = Map; + +export const roomToHeroMembersAtom = atom(new Map()); + +export const useBindRoomToHeroMembers = ( + ct: ClientContext, + heroMembersAtom: typeof roomToHeroMembersAtom +) => { + const setHeroMembersAtom = useSetAtom(heroMembersAtom); + + const rooms = useObservableValue(ct.rooms.join); + const roomToSummary = useObservableValue(ct.roomToSummary); + const directRoomToUser = useObservableValue(ct.directRoomToUser); + + const [heroMembersState, loadHeroMembers] = useAsyncCallback( + useCallback(async () => { + const getHeroes = (roomId: string): string[] => { + const heroes = roomToSummary.get(roomId)?.['m.heroes']; + if (heroes && heroes.length > 0) return heroes; + + const dmUserId = directRoomToUser.get(roomId); + return dmUserId ? [dmUserId] : []; + }; + + const ids = rooms.flatMap((roomId) => + getHeroes(roomId).map((userId) => getJoinRoomMemberId(roomId, userId)) + ); + + return ct.storage.joinRoomMember.observableRead.getMultiple(ids); + }, [ct, rooms, roomToSummary, directRoomToUser]) + ); + + useEffect(() => { + loadHeroMembers(); + }, [loadHeroMembers]); + + const heroMembers = + heroMembersState.status === AsyncStatus.Success ? heroMembersState.data : undefined; + + // dispose + useEffect(() => () => heroMembers?.dispose(), [heroMembers]); + + useEffect(() => { + const processHeroMembers = () => { + const roomToHeroes = new Map(); + + heroMembers?.read.forEach((member) => { + if (!member) return; + const { roomId, userId, event } = member; + const userToEvent: UserIdToRoomMember = roomToHeroes.get(roomId) ?? new Map(); + userToEvent.set(userId, event); + roomToHeroes.set(roomId, userToEvent); + }); + + setHeroMembersAtom(roomToHeroes); + }; + + if (heroMembers) { + processHeroMembers(); + } + const unsubscribe = heroMembers?.subscribe(processHeroMembers); + return () => { + unsubscribe?.(); + }; + }, [heroMembers, setHeroMembersAtom]); +};