Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🚸(frontend) explain to a user her was ejected

lebaudantoined7f1b7b94c22
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3829d1bb..200a8d06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to
- ✨(summary) add dutch and german languages
- 🔧(agents) make Silero VAD optional
+- 🚸(frontend) explain to a user they were ejected
### Changed
diff --git a/src/frontend/src/features/rooms/components/Conference.tsx b/src/frontend/src/features/rooms/components/Conference.tsx
index 56a1a447..496cce6d 100644
--- a/src/frontend/src/features/rooms/components/Conference.tsx
+++ b/src/frontend/src/features/rooms/components/Conference.tsx
@@ -233,11 +233,12 @@ export const Conference = ({
navigateTo('feedback')
return
case DisconnectReason.DUPLICATE_IDENTITY:
+ case DisconnectReason.PARTICIPANT_REMOVED:
navigateTo(
'feedback',
{},
{
- state: { reason: 'duplicateIdentity' },
+ state: { reason: e },
}
)
return
diff --git a/src/frontend/src/features/rooms/routes/Feedback.tsx b/src/frontend/src/features/rooms/routes/Feedback.tsx
index 7f760260..b96bfe5c 100644
--- a/src/frontend/src/features/rooms/routes/Feedback.tsx
+++ b/src/frontend/src/features/rooms/routes/Feedback.tsx
@@ -4,6 +4,8 @@ import { Screen } from '@/layout/Screen'
import { Center, HStack, styled, VStack } from '@/styled-system/jsx'
import { Rating } from '@/features/rooms/components/Rating.tsx'
import { useLocation } from 'wouter'
+import { useMemo } from 'react'
+import { DisconnectReason } from 'livekit-client'
// fixme - duplicated with home, refactor in a proper style
const Heading = styled('h1', {
@@ -24,15 +26,23 @@ export const FeedbackRoute = () => {
const { t } = useTranslation('rooms')
const [, setLocation] = useLocation()
- const state = window.history.state
+ const reasonKey = useMemo(() => {
+ const state = window.history.state
+
+ if (!state?.reason) return
+ switch (state.reason) {
+ case DisconnectReason.DUPLICATE_IDENTITY:
+ return 'duplicateIdentity'
+ case DisconnectReason.PARTICIPANT_REMOVED:
+ return 'participantRemoved'
+ }
+ }, [])
return (
<Screen layout="centered" footer={false}>
<Center>
<VStack>
- <Heading>
- {t(`feedback.heading.${state?.reason || 'normal'}`)}
- </Heading>
+ <Heading>{t(`feedback.heading.${reasonKey || 'normal'}`)}</Heading>
<HStack>
<Button variant="secondary" onPress={() => window.history.back()}>
{t('feedback.back')}
diff --git a/src/frontend/src/locales/de/rooms.json b/src/frontend/src/locales/de/rooms.json
index ee23a6da..09409669 100644
--- a/src/frontend/src/locales/de/rooms.json
+++ b/src/frontend/src/locales/de/rooms.json
@@ -2,7 +2,8 @@
"feedback": {
"heading": {
"normal": "Sie haben das Meeting verlassen",
- "duplicateIdentity": "Sie haben dem Meeting von einem anderen Gerät aus beigetreten"
+ "duplicateIdentity": "Sie haben dem Meeting von einem anderen Gerät aus beigetreten",
+ "participantRemoved": "Sie wurden von einem Administrator aus dem Anruf entfernt"
},
"home": "Zur Startseite zurückkehren",
"back": "Dem Meeting erneut beitreten"
diff --git a/src/frontend/src/locales/en/rooms.json b/src/frontend/src/locales/en/rooms.json
index dc614a59..c2b9b247 100644
--- a/src/frontend/src/locales/en/rooms.json
+++ b/src/frontend/src/locales/en/rooms.json
@@ -2,7 +2,8 @@
"feedback": {
"heading": {
"normal": "You have left the meeting",
- "duplicateIdentity": "You have joined the meeting from another device"
+ "duplicateIdentity": "You have joined the meeting from another device",
+ "participantRemoved": "You have been removed from the meeting by an administrator"
},
"home": "Return to home",
"back": "Rejoin the meeting"
diff --git a/src/frontend/src/locales/fr/rooms.json b/src/frontend/src/locales/fr/rooms.json
index 4846bfa3..b03a148a 100644
--- a/src/frontend/src/locales/fr/rooms.json
+++ b/src/frontend/src/locales/fr/rooms.json
@@ -2,7 +2,8 @@
"feedback": {
"heading": {
"normal": "Vous avez quitté la réunion",
- "duplicateIdentity": "Vous avez rejoint la réunion depuis un autre appareil"
+ "duplicateIdentity": "Vous avez rejoint la réunion depuis un autre appareil",
+ "participantRemoved": "Vous avez été exclu de l'appel par un administrateur"
},
"home": "Retourner à l'accueil",
"back": "Réintégrer la réunion"
diff --git a/src/frontend/src/locales/nl/rooms.json b/src/frontend/src/locales/nl/rooms.json
index 609294d2..1a74da3b 100644
--- a/src/frontend/src/locales/nl/rooms.json
+++ b/src/frontend/src/locales/nl/rooms.json
@@ -2,7 +2,8 @@
"feedback": {
"heading": {
"normal": "Je hebt de vergadering verlaten",
- "duplicateIdentity": "U heeft de vergadering via een ander apparaat geopend"
+ "duplicateIdentity": "U heeft de vergadering via een ander apparaat geopend",
+ "participantRemoved": "U bent door een beheerder uit het gesprek verwijderd"
},
"home": "Keer terug naar het hoofdscherm",
"back": "Sluit weer bij de vergadering aan"