g4borg/cinny
1
0
Fork 0
forked from github/cinny
Code Pull Requests Packages Wiki Activity

swap userId to callMembership as a prop and add a nullchecked userId that uses the membership sender

Browse Source
This commit is contained in:
Gigiaj
2025-07-04 22:21:31 -05:00
parent ca2c868624
commit 92e24e5281
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/features/room-nav/RoomNavUser.tsx
View File

@@ -12,6 +12,7 @@ import {
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Room } from 'matrix-js-sdk'; import { Room } from 'matrix-js-sdk';
import { useFocusWithin, useHover } from 'react-aria'; import { useFocusWithin, useHover } from 'react-aria';
import { CallMembership } from 'matrix-js-sdk/lib/matrixrtc/CallMembership';
import { NavItem, NavItemContent, NavItemOptions } from '../../components/nav'; import { NavItem, NavItemContent, NavItemOptions } from '../../components/nav';
import { UserAvatar } from '../../components/user-avatar'; import { UserAvatar } from '../../components/user-avatar';
import { useMatrixClient } from '../../hooks/useMatrixClient'; import { useMatrixClient } from '../../hooks/useMatrixClient';
@@ -23,9 +24,9 @@ import { openProfileViewer } from '../../../client/action/navigation';
type RoomNavUserProps = { type RoomNavUserProps = {
room: Room; room: Room;
userId: string; callMembership: CallMembership;
}; };
export function RoomNavUser({ room, userId }: RoomNavUserProps) { export function RoomNavUser({ room, callMembership }: RoomNavUserProps) {
const mx = useMatrixClient(); const mx = useMatrixClient();
const useAuthentication = useMediaAuthentication(); const useAuthentication = useMediaAuthentication();
const [navUserExpanded, setNavUserExpanded] = useState(false); const [navUserExpanded, setNavUserExpanded] = useState(false);
@@ -39,11 +40,12 @@ export function RoomNavUser({ room, userId }: RoomNavUserProps) {
}); });
const { isCallActive, activeCallRoomId } = useCallState(); const { isCallActive, activeCallRoomId } = useCallState();
const isActiveCall = isCallActive && activeCallRoomId === room.roomId; const isActiveCall = isCallActive && activeCallRoomId === room.roomId;
const userId = callMembership.sender ?? '';
const avatarMxcUrl = getMemberAvatarMxc(room, userId); const avatarMxcUrl = getMemberAvatarMxc(room, userId);
const avatarUrl = avatarMxcUrl const avatarUrl = avatarMxcUrl
? mx.mxcUrlToHttp(avatarMxcUrl, 32, 32, 'crop', undefined, false, useAuthentication) ? mx.mxcUrlToHttp(avatarMxcUrl, 32, 32, 'crop', undefined, false, useAuthentication)
: undefined; : undefined;
const getName = getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId) ?? userId; const getName = getMemberDisplayName(room, userId) ?? getMxIdLocalPart(userId);
const isCallParticipant = isActiveCall && userId !== mx.getUserId(); const isCallParticipant = isActiveCall && userId !== mx.getUserId();
const handleNavUserClick = () => { const handleNavUserClick = () => {