rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1303 from robintown/copy-alias

Browse Source 
Make the copy link buttons prefer aliases to room IDs
This commit is contained in:
Robin
2023-07-26 10:55:09 -04:00
committed by GitHub
parent b5e1752e06 44786331c0
commit 075dfaf372
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/room/GroupCallView.tsx
View File

@@ -93,6 +93,7 @@ export function GroupCallView({
avatarUrl: avatarUrl!, avatarUrl: avatarUrl!,
roomId: groupCall.room.roomId, roomId: groupCall.room.roomId,
roomName: groupCall.room.name, roomName: groupCall.room.name,
roomAlias: groupCall.room.getCanonicalAlias(),
}; };
}, [displayName, avatarUrl, groupCall]); }, [displayName, avatarUrl, groupCall]);

7
src/room/InCallView.tsx
View File

@@ -467,7 +467,12 @@ export function InCallView({
/> />
)} )}
{inviteModalState.isOpen && ( {inviteModalState.isOpen && (
<InviteModal roomId={groupCall.room.roomId} {...inviteModalProps} /> <InviteModal
roomIdOrAlias={
groupCall.room.getCanonicalAlias() ?? groupCall.room.roomId
}
{...inviteModalProps}
/>
)} )}
</div> </div>
); );

6
src/room/InviteModal.tsx
View File

@@ -23,10 +23,10 @@ import { getRoomUrl } from "../matrix-utils";
import styles from "./InviteModal.module.css"; import styles from "./InviteModal.module.css";
interface Props extends Omit<ModalProps, "title" | "children"> { interface Props extends Omit<ModalProps, "title" | "children"> {
roomId: string; roomIdOrAlias: string;
} }
export const InviteModal: FC<Props> = ({ roomId, ...rest }) => { export const InviteModal: FC<Props> = ({ roomIdOrAlias, ...rest }) => {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
@@ -40,7 +40,7 @@ export const InviteModal: FC<Props> = ({ roomId, ...rest }) => {
<p>{t("Copy and share this call link")}</p> <p>{t("Copy and share this call link")}</p>
<CopyButton <CopyButton
className={styles.copyButton} className={styles.copyButton}
value={getRoomUrl(roomId)} value={getRoomUrl(roomIdOrAlias)}
data-testid="modal_inviteLink" data-testid="modal_inviteLink"
/> />
</ModalContent> </ModalContent>

4
src/room/LobbyView.tsx
View File

@@ -112,7 +112,9 @@ export function LobbyView(props: Props) {
<Body>Or</Body> <Body>Or</Body>
<CopyButton <CopyButton
variant="secondaryCopy" variant="secondaryCopy"
value={getRoomUrl(props.matrixInfo.roomId)} value={getRoomUrl(
props.matrixInfo.roomAlias ?? props.matrixInfo.roomId
)}
className={styles.copyButton} className={styles.copyButton}
copiedMessage={t("Call link copied")} copiedMessage={t("Call link copied")}
data-testid="lobby_inviteLink" data-testid="lobby_inviteLink"

1
src/room/VideoPreview.tsx
View File

@@ -36,6 +36,7 @@ export type MatrixInfo = {
avatarUrl: string; avatarUrl: string;
roomId: string; roomId: string;
roomName: string; roomName: string;
roomAlias: string | null;
}; };
interface Props { interface Props {