Open source video conferencing app powered by LiveKit. Built with Django and React.
✨(frontend) add raised hands waiting room
lebaudantoine584be7e65b7b
diff --git a/src/frontend/src/features/rooms/livekit/api/lowerHandParticipant.ts b/src/frontend/src/features/rooms/livekit/api/lowerHandParticipant.tsnew file mode 100644index 00000000..e9d91fe4--- /dev/null+++ b/src/frontend/src/features/rooms/livekit/api/lowerHandParticipant.ts@@ -0,0 +1,33 @@+import { Participant } from 'livekit-client'+import { fetchServerApi } from './fetchServerApi'+import { buildServerApiUrl } from './buildServerApiUrl'+import { useRoomData } from '../hooks/useRoomData'++export const useLowerHandParticipant = () => {+ const data = useRoomData()++ const lowerHandParticipant = (participant: Participant) => {+ if (!data || !data?.livekit) {+ throw new Error('Room data is not available')+ }+ const newMetadata = JSON.parse(participant.metadata || '{}')+ newMetadata.raised = !newMetadata.raised+ return fetchServerApi(+ buildServerApiUrl(+ data.livekit.url,+ 'twirp/livekit.RoomService/UpdateParticipant'+ ),+ data.livekit.token,+ {+ method: 'POST',+ body: JSON.stringify({+ room: data.livekit.room,+ identity: participant.identity,+ metadata: JSON.stringify(newMetadata),+ permission: participant.permissions,+ }),+ }+ )+ }+ return { lowerHandParticipant }+}diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Participants/HandRaisedListItem.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Participants/HandRaisedListItem.tsxnew file mode 100644index 00000000..0571d066--- /dev/null+++ b/src/frontend/src/features/rooms/livekit/components/controls/Participants/HandRaisedListItem.tsx@@ -0,0 +1,78 @@+import { css } from '@/styled-system/css'++import { HStack } from '@/styled-system/jsx'+import { Text } from '@/primitives/Text'+import { useTranslation } from 'react-i18next'+import { Avatar } from '@/components/Avatar'+import { getParticipantColor } from '@/features/rooms/utils/getParticipantColor'+import { Participant } from 'livekit-client'+import { isLocal } from '@/utils/livekit'+import { RiHand } from '@remixicon/react'+import { ListItemActionButton } from '@/features/rooms/livekit/components/controls/Participants/ListItemActionButton'+import { useLowerHandParticipant } from '@/features/rooms/livekit/api/lowerHandParticipant.ts'++type HandRaisedListItemProps = {+ participant: Participant+}++export const HandRaisedListItem = ({+ participant,+}: HandRaisedListItemProps) => {+ const { t } = useTranslation('rooms')+ const name = participant.name || participant.identity++ const { lowerHandParticipant } = useLowerHandParticipant()++ return (+ <HStack+ role="listitem"+ justify="space-between"+ key={participant.identity}+ id={participant.identity}+ className={css({+ padding: '0.25rem 0',+ width: 'full',+ })}+ >+ <HStack>+ <Avatar name={name} bgColor={getParticipantColor(participant)} />+ <Text+ variant={'sm'}+ className={css({+ userSelect: 'none',+ cursor: 'default',+ display: 'flex',+ })}+ >+ <span+ className={css({+ whiteSpace: 'nowrap',+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ maxWidth: '120px',+ display: 'block',+ })}+ >+ {name}+ </span>+ {isLocal(participant) && (+ <span+ className={css({+ marginLeft: '.25rem',+ whiteSpace: 'nowrap',+ })}+ >+ ({t('participants.you')})+ </span>+ )}+ </Text>+ </HStack>+ <ListItemActionButton+ onPress={() => lowerHandParticipant(participant)}+ tooltip={t('participants.lowerParticipantHand', { name })}+ >+ <RiHand color="gray" />+ </ListItemActionButton>+ </HStack>+ )+}diff --git a/src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsList.tsx b/src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsList.tsxindex cbcba0c4..16ca082b 100644--- a/src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsList.tsx+++ b/src/frontend/src/features/rooms/livekit/components/controls/Participants/ParticipantsList.tsx@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'import { allParticipantRoomEvents } from '@/features/rooms/livekit/constants/events'import { ParticipantListItem } from '@/features/rooms/livekit/components/controls/Participants/ParticipantListItem'import { ParticipantsCollapsableList } from '@/features/rooms/livekit/components/controls/Participants/ParticipantsCollapsableList'+import { HandRaisedListItem } from '@/features/rooms/livekit/components/controls/Participants/HandRaisedListItem'// TODO: Optimize rendering performance, especially for longer participant lists, even though they are generally short.export const ParticipantsList = () => {@@ -35,6 +36,11 @@ export const ParticipantsList = () => {...sortedRemoteParticipants,]+ const raisedHandParticipants = participants.filter((participant) => {+ const data = JSON.parse(participant.metadata || '{}')+ return data.raised+ })+// TODO - extract inline styling in a centralized styling file, and avoid magic numbersreturn (<Box@@ -83,6 +89,21 @@ export const ParticipantsList = () => {>{t('participants.subheading').toUpperCase()}</H>+ {raisedHandParticipants.length > 0 && (+ <div+ style={{+ marginBottom: '.9375rem',+ }}+ >+ <ParticipantsCollapsableList+ heading={t('participants.raisedHands')}+ participants={raisedHandParticipants}+ renderParticipant={(participant) => (+ <HandRaisedListItem participant={participant} />+ )}+ />+ </div>+ )}<ParticipantsCollapsableListheading={t('participants.contributors')}participants={sortedParticipants}diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.jsonindex da63ccd1..63fb9487 100644--- a/src/frontend/src/locales/de/rooms.json+++ b/src/frontend/src/locales/de/rooms.json@@ -66,6 +66,8 @@"description": "","confirm": "","cancel": ""- }+ },+ "raisedHands": "",+ "lowerParticipantHand": ""}}diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.jsonindex b31a7938..f8bc9039 100644--- a/src/frontend/src/locales/en/rooms.json+++ b/src/frontend/src/locales/en/rooms.json@@ -66,6 +66,8 @@"description": "Mute {{name}} for all participants? {{name}} is the only person who can unmute themselves.","confirm": "Mute","cancel": "Cancel"- }+ },+ "raisedHands": "Raised hands",+ "lowerParticipantHand": "Lower {{name}}'s hand"}}diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.jsonindex 64186e8a..27b79e00 100644--- a/src/frontend/src/locales/fr/rooms.json+++ b/src/frontend/src/locales/fr/rooms.json@@ -66,6 +66,8 @@"description": "Couper le micro de {{name}} pour tous les participants ? {{name}} est la seule personne habilitée à réactiver son micro","confirm": "Couper le micro","cancel": "Annuler"- }+ },+ "raisedHands": "Mains levées",+ "lowerParticipantHand": "Baisser la main de {{name}}"}}