Skip to content

armgit / meet

Public Imported from GitHub
0

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

♻️(frontend) derive is_administrable from participant metadata

lebaudantoine82aafa203060
diff --git a/src/backend/core/api/serializers.py b/src/backend/core/api/serializers.py
index d9420ee4..fff4c337 100644
--- a/src/backend/core/api/serializers.py
+++ b/src/backend/core/api/serializers.py
@@ -188,8 +188,6 @@ class RoomSerializer(serializers.ModelSerializer):
else:
del output["pin_code"]
- output["is_administrable"] = is_admin_or_owner
-
return output
diff --git a/src/backend/core/tests/rooms/test_api_rooms_retrieve.py b/src/backend/core/tests/rooms/test_api_rooms_retrieve.py
index e5c3fc46..4a2408b9 100644
--- a/src/backend/core/tests/rooms/test_api_rooms_retrieve.py
+++ b/src/backend/core/tests/rooms/test_api_rooms_retrieve.py
@@ -31,7 +31,6 @@ def test_api_rooms_retrieve_anonymous_private_pk():
"configuration": {},
"access_level": "restricted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -51,7 +50,6 @@ def test_api_rooms_retrieve_anonymous_trusted_pk():
"configuration": {},
"access_level": "trusted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -70,7 +68,6 @@ def test_api_rooms_retrieve_anonymous_private_pk_no_dashes():
"configuration": {},
"access_level": "restricted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -87,7 +84,6 @@ def test_api_rooms_retrieve_anonymous_private_slug():
"configuration": {},
"access_level": "restricted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -104,7 +100,6 @@ def test_api_rooms_retrieve_anonymous_private_slug_not_normalized():
"configuration": {},
"access_level": "restricted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -214,7 +209,6 @@ def test_api_rooms_retrieve_anonymous_public(mock_token):
"configuration": {},
"access_level": str(room.access_level),
"id": str(room.id),
- "is_administrable": False,
"livekit": {
"url": "test_url_value",
"room": expected_name,
@@ -261,7 +255,6 @@ def test_api_rooms_retrieve_authenticated_public(mock_token):
"configuration": {"can_publish_sources": ["camera"]},
"access_level": str(room.access_level),
"id": str(room.id),
- "is_administrable": False,
"livekit": {
"url": "test_url_value",
"room": expected_name,
@@ -313,7 +306,6 @@ def test_api_rooms_retrieve_authenticated_trusted(mock_token):
"configuration": {},
"access_level": str(room.access_level),
"id": str(room.id),
- "is_administrable": False,
"livekit": {
"url": "test_url_value",
"room": expected_name,
@@ -355,7 +347,6 @@ def test_api_rooms_retrieve_authenticated():
"configuration": {},
"access_level": "restricted",
"id": str(room.id),
- "is_administrable": False,
"name": room.name,
"slug": room.slug,
}
@@ -401,7 +392,6 @@ def test_api_rooms_retrieve_members(mock_token, django_assert_num_queries, setti
"configuration": {"can_publish_sources": ["camera"]},
"access_level": str(room.access_level),
"id": str(room.id),
- "is_administrable": False,
"livekit": {
"url": "test_url_value",
"room": expected_name,
@@ -493,7 +483,6 @@ def test_api_rooms_retrieve_administrators(
assert content_dict == {
"access_level": str(room.access_level),
"id": str(room.id),
- "is_administrable": True,
"configuration": {},
"livekit": {
"url": "test_url_value",
diff --git a/src/frontend/src/features/rooms/livekit/hooks/useIsAdminOrOwner.ts b/src/frontend/src/features/rooms/livekit/hooks/useIsAdminOrOwner.ts
index e583a2cd..9dd87ecc 100644
--- a/src/frontend/src/features/rooms/livekit/hooks/useIsAdminOrOwner.ts
+++ b/src/frontend/src/features/rooms/livekit/hooks/useIsAdminOrOwner.ts
@@ -1,6 +1,17 @@
-import { useRoomData } from './useRoomData'
+import {
+ useParticipantAttribute,
+ useRoomContext,
+} from '@livekit/components-react'
+import { ParticipantRole } from '@/features/rooms/api/ApiRoom'
export const useIsAdminOrOwner = () => {
- const apiRoomData = useRoomData()
- return apiRoomData?.is_administrable
+ const room = useRoomContext()
+ const localParticipant = room.localParticipant
+ const role = useParticipantAttribute('room_role', {
+ participant: localParticipant,
+ })
+ return (
+ role !== undefined &&
+ ['administrator', 'owner'].includes(role as ParticipantRole)
+ )
}