diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx index d36d46c2..cced34b0 100644 --- a/src/app/components/member-tile/MemberTile.tsx +++ b/src/app/components/member-tile/MemberTile.tsx @@ -1,48 +1,73 @@ import React, { ReactNode } from 'react'; import { as, Avatar, Box, Icon, Icons, Text } from 'folds'; -import { MatrixClient, Room, RoomMember } from 'matrix-js-sdk'; -import { getMemberDisplayName } from '../../utils/room'; -import { getMxIdLocalPart } from '../../utils/matrix'; import { UserAvatar } from '../user-avatar'; import * as css from './style.css'; - -const getName = (room: Room, member: RoomMember) => - getMemberDisplayName(room, member.userId) ?? getMxIdLocalPart(member.userId) ?? member.userId; +import { ClientContext } from '../../../client/context'; +import { JoinRoomMemberObject } from '../../../client/storage/collections'; +import { GetRoomMemberNameCallback, GetRoomMemberAvatarCallback } from '../../hooks/useRoomMembers'; +import { useUserPresence } from '../../hooks/useUserPresence'; +import { mxcToHttp } from '../../../client/mxcToHttp'; +import { getMxIdLocalPart } from '../../utils/matrix'; +import { PresenceBadge, AvatarPresence } from '../presence'; type MemberTileProps = { - mx: MatrixClient; - room: Room; - member: RoomMember; + ct: ClientContext; + member: JoinRoomMemberObject; + getName: GetRoomMemberNameCallback; + getAvatar: GetRoomMemberAvatarCallback; useAuthentication: boolean; after?: ReactNode; }; export const MemberTile = as<'button', MemberTileProps>( - ({ as: AsMemberTile = 'button', mx, room, member, useAuthentication, after, ...props }, ref) => { - const name = getName(room, member); + ( + { + as: AsMemberTile = 'button', + ct, + member, + getName, + getAvatar, + useAuthentication, + after, + ...props + }, + ref + ) => { + const presence = useUserPresence(member.userId); const username = getMxIdLocalPart(member.userId); - const avatarMxcUrl = member.getMxcAvatarUrl(); + const name = getName(member.userId); + const avatarMxcUrl = getAvatar(member.userId); const avatarUrl = avatarMxcUrl - ? mx.mxcUrlToHttp(avatarMxcUrl, 100, 100, 'crop', undefined, false, useAuthentication) + ? mxcToHttp(ct.session.baseUrl, avatarMxcUrl, useAuthentication).thumbnail({ + width: 96, + height: 96, + method: 'crop', + }) : undefined; return ( - - } - /> - + } + > + + } + /> + + + {name} - {username} + @{username} diff --git a/src/app/features/common-settings/members/Members.tsx b/src/app/features/common-settings/members/Members.tsx index 15cd1d08..1e185fcf 100644 --- a/src/app/features/common-settings/members/Members.tsx +++ b/src/app/features/common-settings/members/Members.tsx @@ -22,24 +22,16 @@ import { toRem, } from 'folds'; import { useVirtualizer } from '@tanstack/react-virtual'; -import { RoomMember } from 'matrix-js-sdk'; import { Page, PageContent, PageHeader } from '../../../components/page'; import { useRoom } from '../../../hooks/useRoom'; -import { useRoomMembers } from '../../../hooks/useRoomMembers'; -import { useMatrixClient } from '../../../hooks/useMatrixClient'; -import { useGetMemberPowerLevel, usePowerLevels } from '../../../hooks/usePowerLevels'; +import { useGetMemberPowerLevel, usePowerLevelsContext } from '../../../hooks/usePowerLevels'; import { VirtualTile } from '../../../components/virtualizer'; import { MemberTile } from '../../../components/member-tile'; import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication'; -import { getMxIdLocalPart, getMxIdServer } from '../../../utils/matrix'; +import { getMxIdServer } from '../../../utils/matrix'; import { ServerBadge } from '../../../components/server-badge'; import { useDebounce } from '../../../hooks/useDebounce'; -import { - SearchItemStrGetter, - useAsyncSearch, - UseAsyncSearchOptions, -} from '../../../hooks/useAsyncSearch'; -import { getMemberSearchStr } from '../../../utils/room'; +import { useAsyncSearch, UseAsyncSearchOptions } from '../../../hooks/useAsyncSearch'; import { useMembershipFilter, useMembershipFilterMenu } from '../../../hooks/useMemberFilter'; import { useMemberPowerSort, useMemberSort, useMemberSortMenu } from '../../../hooks/useMemberSort'; import { settingsAtom } from '../../../state/settings'; @@ -56,6 +48,11 @@ import { useSpaceOptionally } from '../../../hooks/useSpace'; import { useFlattenPowerTagMembers, useGetMemberPowerTag } from '../../../hooks/useMemberPowerTag'; import { useRoomCreators } from '../../../hooks/useRoomCreators'; import { getMouseEventCords } from '../../../utils/dom'; +import { useClient } from '../../../hooks/useClient'; +import { usePendingMembers } from '../../../hooks/usePendingMembers'; +import { JoinRoomMemberObject } from '../../../../client/storage/collections'; +import { useRoomMembersAPI } from '../../../hooks/useRoomMembers'; +import { getMemberSearchStr } from '../../../utils/room'; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, @@ -67,58 +64,65 @@ const SEARCH_OPTIONS: UseAsyncSearchOptions = { }, }; -const mxIdToName = (mxId: string) => getMxIdLocalPart(mxId) ?? mxId; -const getRoomMemberStr: SearchItemStrGetter = (m, query) => - getMemberSearchStr(m, query, mxIdToName); - type MembersProps = { requestClose: () => void; }; +const EMPTY_MEMBER_LIST: JoinRoomMemberObject[] = []; export function Members({ requestClose }: MembersProps) { - const mx = useMatrixClient(); + const ct = useClient(); + const roomId = useRoom(); const useAuthentication = useMediaAuthentication(); - const room = useRoom(); - const members = useRoomMembers(mx, room.roomId); - const fetchingMembers = members.length < room.getJoinedMemberCount(); - const openProfile = useOpenUserRoomProfile(); - const profileUser = useUserRoomProfileState(); - const space = useSpaceOptionally(); - const powerLevels = usePowerLevels(room); - const creators = useRoomCreators(room); - const getPowerTag = useGetMemberPowerTag(room, creators, powerLevels); + const powerLevels = usePowerLevelsContext(); + const creators = useRoomCreators(roomId); + const getPowerTag = useGetMemberPowerTag(creators, powerLevels); const getPowerLevel = useGetMemberPowerLevel(powerLevels); - const [membershipFilterIndex, setMembershipFilterIndex] = useState(0); + const membersAPI = useRoomMembersAPI(); + const members = membersAPI.memberEventsResult.value ?? EMPTY_MEMBER_LIST; + const loadingFromMemory = membersAPI.memberEventsResult.pending; + + const fetchingMembers = usePendingMembers(roomId); + + const openProfile = useOpenUserRoomProfile(); + const spaceId = useSpaceOptionally(); + const profileUser = useUserRoomProfileState(); + + const membershipFilterMenu = useMembershipFilterMenu(membersAPI.getMembership); + const sortFilterMenu = useMemberSortMenu(membersAPI.getName); const [sortFilterIndex, setSortFilterIndex] = useSetting(settingsAtom, 'memberSortFilterIndex'); - const membershipFilter = useMembershipFilter(membershipFilterIndex, useMembershipFilterMenu()); - const memberSort = useMemberSort(sortFilterIndex, useMemberSortMenu()); + const [membershipFilterIndex, setMembershipFilterIndex] = useState(0); + + const membershipFilter = useMembershipFilter(membershipFilterIndex, membershipFilterMenu); + const memberSort = useMemberSort(sortFilterIndex, sortFilterMenu); const memberPowerSort = useMemberPowerSort(creators, getPowerLevel); const scrollRef = useRef(null); const searchInputRef = useRef(null); const scrollTopAnchorRef = useRef(null); - const sortedMembers = useMemo( - () => - Array.from(members) - .filter(membershipFilter.filterFn) - .sort(memberSort.sortFn) - .sort(memberPowerSort), + const filteredMembers = useMemo( + () => members.filter(membershipFilter.filterFn).sort(memberSort.sortFn).sort(memberPowerSort), [members, membershipFilter, memberSort, memberPowerSort] ); + const memberCount = filteredMembers.length ?? 0; const [result, search, resetSearch] = useAsyncSearch( - sortedMembers, - getRoomMemberStr, + filteredMembers, + useCallback( + (m, query) => getMemberSearchStr(m, query, membersAPI.getName), + [membersAPI.getName] + ), SEARCH_OPTIONS ); if (!result && searchInputRef.current?.value) search(searchInputRef.current.value); - const flattenTagMembers = useFlattenPowerTagMembers(result?.items ?? sortedMembers, getPowerTag); + const processMembers = result ? result.items : filteredMembers; + + const PLTagOrRoomMember = useFlattenPowerTagMembers(processMembers, getPowerTag); const virtualizer = useVirtualizer({ - count: flattenTagMembers.length, + count: PLTagOrRoomMember.length, getScrollElement: () => scrollRef.current, estimateSize: () => 40, overscan: 10, @@ -147,7 +151,7 @@ export function Members({ requestClose }: MembersProps) { const btn = evt.currentTarget as HTMLButtonElement; const userId = btn.getAttribute('data-user-id'); if (userId) { - openProfile(room.roomId, space?.roomId, userId, getMouseEventCords(evt.nativeEvent)); + openProfile(roomId, spaceId, userId, getMouseEventCords(evt.nativeEvent)); } }; @@ -157,7 +161,7 @@ export function Members({ requestClose }: MembersProps) { - {room.getJoinedMemberCount()} Members + {memberCount} Members @@ -287,13 +291,13 @@ export function Members({ requestClose }: MembersProps) { - {fetchingMembers && ( + {(fetchingMembers || loadingFromMemory) && ( )} - {!fetchingMembers && !result && flattenTagMembers.length === 0 && ( + {!loadingFromMemory && !fetchingMembers && !result && processMembers.length === 0 && ( {`No "${membershipFilter.name}" Members`} @@ -308,7 +312,7 @@ export function Members({ requestClose }: MembersProps) { gap="100" > {virtualizer.getVirtualItems().map((vItem) => { - const tagOrMember = flattenTagMembers[vItem.index]; + const tagOrMember = PLTagOrRoomMember[vItem.index]; if ('userId' in tagOrMember) { const server = getMxIdServer(tagOrMember.userId); @@ -323,9 +327,10 @@ export function Members({ requestClose }: MembersProps) { data-user-id={tagOrMember.userId} onClick={handleMemberClick} aria-pressed={profileUser?.userId === tagOrMember.userId} - mx={mx} - room={room} + ct={ct} member={tagOrMember} + getName={membersAPI.getName} + getAvatar={membersAPI.getAvatar} useAuthentication={useAuthentication} after={ server && ( diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx index 1850d5c8..baa194a9 100644 --- a/src/app/features/room-settings/RoomSettings.tsx +++ b/src/app/features/room-settings/RoomSettings.tsx @@ -27,6 +27,8 @@ import { usePowerLevelTags, usePowerLevelTagsState, } from '../../hooks/usePowerLevelTags'; +import { RoomMembersAPIProvider, useCreateRoomMembersAPI } from '../../hooks/useRoomMembers'; +import { usePendingMemberLoader, usePendingMembers } from '../../hooks/usePendingMembers'; type RoomSettingsMenuItem = { page: RoomSettingsPage; @@ -86,6 +88,10 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) { const powerLevelTagsResult = usePowerLevelTagsState(roomId); const powerLevelTags = usePowerLevelTags(powerLevels, powerLevelTagsResult.value); + const membersAPI = useCreateRoomMembersAPI(roomId); + const membersPending = usePendingMembers(roomId); + usePendingMemberLoader(roomId, membersPending); + const roomToJoinRule = useObservableValue(ct.roomToJoinRule); const avatarUrl = roomAvatar @@ -112,91 +118,93 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) { }; return ( - - - - - - - ( - - )} - /> - - - {roomName} - - - - {screenSize === ScreenSize.Mobile && ( - - - - )} - - - - -
- {menuItems.map((item) => ( - - } - onClick={() => setActivePage(item.page)} - > - + + + + + + + ( + + )} + /> + + + {roomName} + + + + {screenSize === ScreenSize.Mobile && ( + + + + )} + + + + +
+ {menuItems.map((item) => ( + + } + onClick={() => setActivePage(item.page)} > - {item.name} - - - ))} -
-
-
- - ) - } - > - {activePage === RoomSettingsPage.GeneralPage && ( - - )} - {activePage === RoomSettingsPage.MembersPage && ( - - )} - {activePage === RoomSettingsPage.PermissionsPage && ( - - )} - {activePage === RoomSettingsPage.EmojisStickersPage && ( - - )} - {activePage === RoomSettingsPage.DeveloperToolsPage && ( - - )} -
-
-
+ + {item.name} + +
+ ))} +
+
+
+ + ) + } + > + {activePage === RoomSettingsPage.GeneralPage && ( + + )} + {activePage === RoomSettingsPage.MembersPage && ( + + )} + {activePage === RoomSettingsPage.PermissionsPage && ( + + )} + {activePage === RoomSettingsPage.EmojisStickersPage && ( + + )} + {activePage === RoomSettingsPage.DeveloperToolsPage && ( + + )} +
+
+
+ ); } diff --git a/src/app/features/room/MembersDrawer.tsx b/src/app/features/room/MembersDrawer.tsx index d2be4e53..968c4e0e 100644 --- a/src/app/features/room/MembersDrawer.tsx +++ b/src/app/features/room/MembersDrawer.tsx @@ -66,17 +66,17 @@ import { useUserPresence } from '../../hooks/useUserPresence'; import { AvatarPresence, PresenceBadge } from '../../components/presence'; type MemberDrawerHeaderProps = { - joinedMemberCount: number; + memberCount: number; }; -function MemberDrawerHeader({ joinedMemberCount }: MemberDrawerHeaderProps) { +function MemberDrawerHeader({ memberCount }: MemberDrawerHeaderProps) { const setPeopleDrawer = useSetSetting(settingsAtom, 'isPeopleDrawer'); return (
- - {joinedMemberCount > 0 ? `${millify(joinedMemberCount)} Members` : 'Members'} + + {memberCount > 0 ? `${millify(memberCount)} Members` : 'Members'} @@ -229,7 +229,7 @@ export function MembersDrawer() { () => members.filter(membershipFilter.filterFn).sort(memberSort.sortFn).sort(memberPowerSort), [members, membershipFilter, memberSort, memberPowerSort] ); - const joinedMemberCount = filteredMembers.length ?? 0; + const memberCount = filteredMembers.length ?? 0; const [result, search, resetSearch] = useAsyncSearch( filteredMembers, @@ -276,7 +276,7 @@ export function MembersDrawer() { shrink="No" direction="Column" > - + diff --git a/src/app/hooks/useRoomMembers.ts b/src/app/hooks/useRoomMembers.ts index e30d83e5..e7532dd5 100644 --- a/src/app/hooks/useRoomMembers.ts +++ b/src/app/hooks/useRoomMembers.ts @@ -23,9 +23,6 @@ export type RoomMembersAPI = { memberEventsResult: PendingObservableResult; }; -// FIXME: remove after usage over -export const useRoomMembers = () => undefined; - export const useCreateRoomMembersAPI = (roomId: string): RoomMembersAPI => { const ct = useClient(); const memberEventsPromise = useMemo(