Show SFU participants who are not Matrix members
So that we can load SFU with the virtual participants and get them displayed in the grid layout. Before that only participants who are part of the Matrix were displayed (i.e. participants who have published m.call.member event to declare their participation).
This commit is contained in:
parent
e8a2421962
commit
cada6e624e
3 changed files with 60 additions and 108 deletions
|
|
@ -15,14 +15,18 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
import React from "react";
|
||||
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
|
||||
import {
|
||||
RoomMember,
|
||||
RoomMemberEvent,
|
||||
} from "matrix-js-sdk/src/models/room-member";
|
||||
import { LocalParticipant, RemoteParticipant } from "livekit-client";
|
||||
|
||||
import { useRoomMemberName } from "./useRoomMemberName";
|
||||
import { TileContent, VideoTile } from "./VideoTile";
|
||||
import { Avatar } from "../Avatar";
|
||||
import Styles from "../room/InCallView.module.css";
|
||||
|
||||
export interface ItemData {
|
||||
member: RoomMember;
|
||||
member?: RoomMember;
|
||||
sfuParticipant: LocalParticipant | RemoteParticipant;
|
||||
content: TileContent;
|
||||
}
|
||||
|
|
@ -31,29 +35,45 @@ interface Props {
|
|||
item: ItemData;
|
||||
width?: number;
|
||||
height?: number;
|
||||
getAvatar: (
|
||||
roomMember: RoomMember,
|
||||
width: number,
|
||||
height: number
|
||||
) => JSX.Element;
|
||||
}
|
||||
|
||||
export function VideoTileContainer({
|
||||
item,
|
||||
width,
|
||||
height,
|
||||
getAvatar,
|
||||
...rest
|
||||
}: Props) {
|
||||
const { rawDisplayName } = useRoomMemberName(item.member);
|
||||
export function VideoTileContainer({ item, width, height, ...rest }: Props) {
|
||||
const [displayName, setDisplayName] = React.useState<string>("[👻]");
|
||||
|
||||
React.useEffect(() => {
|
||||
const member = item.member;
|
||||
|
||||
if (member) {
|
||||
setDisplayName(member.rawDisplayName);
|
||||
|
||||
const updateName = () => {
|
||||
setDisplayName(member.rawDisplayName);
|
||||
};
|
||||
|
||||
member!.on(RoomMemberEvent.Name, updateName);
|
||||
return () => {
|
||||
member!.removeListener(RoomMemberEvent.Name, updateName);
|
||||
};
|
||||
}
|
||||
}, [item.member]);
|
||||
|
||||
const avatar = (
|
||||
<Avatar
|
||||
key={item.member?.userId}
|
||||
size={Math.round(Math.min(width ?? 0, height ?? 0) / 2)}
|
||||
src={item.member?.getMxcAvatarUrl()}
|
||||
fallback={displayName.slice(0, 1).toUpperCase()}
|
||||
className={Styles.avatar}
|
||||
/>
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<VideoTile
|
||||
sfuParticipant={item.sfuParticipant}
|
||||
content={item.content}
|
||||
name={rawDisplayName}
|
||||
avatar={getAvatar && getAvatar(item.member, width, height)}
|
||||
name={displayName}
|
||||
avatar={avatar}
|
||||
{...rest}
|
||||
/>
|
||||
</>
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
/*
|
||||
Copyright 2022 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import {
|
||||
RoomMember,
|
||||
RoomMemberEvent,
|
||||
} from "matrix-js-sdk/src/models/room-member";
|
||||
import { useState, useEffect } from "react";
|
||||
|
||||
interface RoomMemberName {
|
||||
name: string;
|
||||
rawDisplayName: string;
|
||||
}
|
||||
export function useRoomMemberName(member: RoomMember): RoomMemberName {
|
||||
const [state, setState] = useState<RoomMemberName>({
|
||||
name: member.name,
|
||||
rawDisplayName: member.rawDisplayName,
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
function updateName() {
|
||||
setState({ name: member.name, rawDisplayName: member.rawDisplayName });
|
||||
}
|
||||
|
||||
updateName();
|
||||
|
||||
member.on(RoomMemberEvent.Name, updateName);
|
||||
|
||||
return () => {
|
||||
member.removeListener(RoomMemberEvent.Name, updateName);
|
||||
};
|
||||
}, [member]);
|
||||
|
||||
return state;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue