diff --git a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx index 4e110be41..a0b76d10f 100644 --- a/src/app/components/invite-user-prompt/InviteUserPrompt.tsx +++ b/src/app/components/invite-user-prompt/InviteUserPrompt.tsx @@ -51,9 +51,10 @@ import { useMatrixClient } from '../../hooks/useMatrixClient'; import { BreakWord } from '../../styles/Text.css'; import { useAlive } from '../../hooks/useAlive'; import { copyToClipboard } from '../../utils/dom'; -import { getMatrixToRoom } from '../../plugins/matrix-to'; import { getViaServers } from '../../plugins/via-servers'; import { useModalStyle } from '../../hooks/useModalStyle'; +import { useLotusShareBase } from '../../hooks/useLotusLinkBase'; +import { getLotusRoomPermalink, getLotusSpacePermalink } from '../../plugins/lotus-permalink'; const SEARCH_OPTIONS: UseAsyncSearchOptions = { limit: 1000, @@ -75,10 +76,14 @@ export function InviteUserPrompt({ room, requestClose }: InviteUserProps) { const [linkCopied, setLinkCopied] = useState(false); const [showQr, setShowQr] = useState(false); + // [Gitea #285] A link into this deployment; matrix.to can't open Lotus Chat. + const lotusBase = useLotusShareBase(); const inviteUrl = (() => { const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId); const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room); - return getMatrixToRoom(roomIdOrAlias, viaServers); + return room.isSpaceRoom() + ? getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers) + : getLotusRoomPermalink(lotusBase, roomIdOrAlias, undefined, viaServers); })(); const handleCopyLink = () => { diff --git a/src/app/features/common-settings/general/RoomShareInvite.tsx b/src/app/features/common-settings/general/RoomShareInvite.tsx index f37bdf100..f3d0c3aa9 100644 Binary files a/src/app/features/common-settings/general/RoomShareInvite.tsx and b/src/app/features/common-settings/general/RoomShareInvite.tsx differ