Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ea6987083 | ||
|
|
be8e49a2bb | ||
|
|
1e217592fc | ||
|
|
ffe1d5a81e |
@@ -261,52 +261,69 @@ export function PollContent({
|
|||||||
handleVote(answers[idx].id);
|
handleVote(answers[idx].id);
|
||||||
};
|
};
|
||||||
|
|
||||||
const headerLabel = isEnded
|
// [Gitea #246] Type line under the "Poll" label.
|
||||||
? 'Poll closed · Final results'
|
const typeLabel = (() => {
|
||||||
: `Poll · ${isMultiple ? 'Multiple choice' : 'Single choice'}`;
|
if (isEnded) return 'Final results';
|
||||||
|
if (isUndisclosed) return 'Results hidden until the end';
|
||||||
|
return isMultiple ? `Pick up to ${maxSelections}` : 'Single choice';
|
||||||
|
})();
|
||||||
|
|
||||||
|
// Multiple choice counts people, not answers ("1 voter" who picked two).
|
||||||
|
const unit = isMultiple ? 'voter' : 'vote';
|
||||||
const footerNote = (() => {
|
const footerNote = (() => {
|
||||||
|
const totalPart = total > 0 ? `${total} ${unit}${total === 1 ? '' : 's'}` : `No ${unit}s yet`;
|
||||||
if (isUndisclosed && !isEnded) {
|
if (isUndisclosed && !isEnded) {
|
||||||
return canVote
|
return canVote
|
||||||
? 'Voting open · Results hidden until the poll ends'
|
? `${myVotes.size > 0 ? 'You voted' : 'Voting open'} · results shown when the poll ends`
|
||||||
: 'Results hidden until the poll ends';
|
: 'Results shown when the poll ends';
|
||||||
}
|
}
|
||||||
const votesPart = total > 0 ? `${total} vote${total === 1 ? '' : 's'}` : 'No votes yet';
|
if (isEnded) return `${totalPart} · Poll closed`;
|
||||||
if (isEnded) return `${votesPart} · Poll closed`;
|
if (!canVote) return totalPart;
|
||||||
if (!canVote) return votesPart;
|
return `${totalPart} · ${myVotes.size > 0 ? 'Select another answer to change your vote' : 'Select an answer to vote'}`;
|
||||||
if (isMultiple) return `${votesPart} · Select up to ${maxSelections}`;
|
|
||||||
return `${votesPart} · ${myVotes.size > 0 ? 'Click to change' : 'Click to vote'}`;
|
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// Neutral tones derived from the theme's text colour, so they have contrast
|
||||||
|
// in every theme (the Container/ContainerLine tokens were near-invisible).
|
||||||
|
const muted = (pct: number) =>
|
||||||
|
`color-mix(in srgb, ${color.SurfaceVariant.OnContainer} ${pct}%, transparent)`;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
data-poll-content
|
data-poll-content
|
||||||
direction="Column"
|
direction="Column"
|
||||||
gap="200"
|
gap="300"
|
||||||
style={{ maxWidth: '340px', paddingTop: '2px', paddingBottom: '4px' }}
|
style={{
|
||||||
|
// Same width for every poll (the message body shrink-wraps its content).
|
||||||
|
width: toRem(460),
|
||||||
|
maxWidth: '100%',
|
||||||
|
margin: `${config.space.S100} 0`,
|
||||||
|
padding: config.space.S300,
|
||||||
|
borderRadius: config.radii.R400,
|
||||||
|
border: `${config.borderWidth.B300} solid ${muted(18)}`,
|
||||||
|
background: muted(4),
|
||||||
|
boxSizing: 'border-box',
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<Text
|
<Box direction="Column" gap="100">
|
||||||
as="div"
|
<Box alignItems="Center" gap="200" wrap="Wrap" data-poll-content-label>
|
||||||
size="T200"
|
<Icon size="100" src={Icons.OrderList} style={{ opacity: 0.8 }} />
|
||||||
priority="300"
|
<Text as="span" size="L400" style={{ fontWeight: 600 }}>
|
||||||
data-poll-content-label
|
Poll
|
||||||
style={{
|
</Text>
|
||||||
fontWeight: 700,
|
<Text as="span" size="T200" priority="300">
|
||||||
letterSpacing: '0.12em',
|
·
|
||||||
textTransform: 'uppercase',
|
</Text>
|
||||||
marginBottom: config.space.S100,
|
<Text as="span" size="T200" priority="300">
|
||||||
}}
|
{typeLabel}
|
||||||
>
|
</Text>
|
||||||
<span aria-hidden>◉ </span>
|
</Box>
|
||||||
{headerLabel}
|
<Text size="T400" style={{ fontWeight: 600, overflowWrap: 'anywhere' }}>
|
||||||
</Text>
|
{question}
|
||||||
<Text size="T400" style={{ fontWeight: 600 }}>
|
</Text>
|
||||||
{question}
|
</Box>
|
||||||
</Text>
|
|
||||||
<Box
|
<Box
|
||||||
direction="Column"
|
direction="Column"
|
||||||
gap="100"
|
gap="200"
|
||||||
style={{ marginTop: '2px' }}
|
|
||||||
role={isMultiple ? 'group' : 'radiogroup'}
|
role={isMultiple ? 'group' : 'radiogroup'}
|
||||||
aria-label={question}
|
aria-label={question}
|
||||||
onKeyDown={handleRadioKeyDown}
|
onKeyDown={handleRadioKeyDown}
|
||||||
@@ -316,20 +333,32 @@ export function PollContent({
|
|||||||
const text = answer.text;
|
const text = answer.text;
|
||||||
const selected = myVotes.has(id);
|
const selected = myVotes.has(id);
|
||||||
const voteCount = counts.get(id) ?? 0;
|
const voteCount = counts.get(id) ?? 0;
|
||||||
const pct = showResults && total > 0 ? Math.round((voteCount / total) * 100) : 0;
|
const showBar = showResults && total > 0;
|
||||||
|
const pct = showBar ? Math.round((voteCount / total) * 100) : 0;
|
||||||
const isWinner = winners.has(id);
|
const isWinner = winners.has(id);
|
||||||
|
const resultText = `${voteCount} ${voteCount === 1 ? 'vote' : 'votes'} · ${pct}%`;
|
||||||
// Roving tabindex for the single-choice radiogroup; checkboxes stay tabbable.
|
// Roving tabindex for the single-choice radiogroup; checkboxes stay tabbable.
|
||||||
const tabIndex = isMultiple ? 0 : selected || (myVotes.size === 0 && i === 0) ? 0 : -1;
|
const tabIndex = isMultiple ? 0 : selected || (myVotes.size === 0 && i === 0) ? 0 : -1;
|
||||||
|
let barColor = muted(40);
|
||||||
|
if (isWinner) barColor = color.Success.Main;
|
||||||
|
else if (selected) barColor = color.Primary.Main;
|
||||||
|
let rowBorder = muted(22);
|
||||||
|
if (isWinner) rowBorder = color.Success.Main;
|
||||||
|
else if (selected) rowBorder = color.Primary.Main;
|
||||||
|
const labelParts = [text];
|
||||||
|
if (showBar) labelParts.push(resultText);
|
||||||
|
if (isWinner) labelParts.push('winning answer');
|
||||||
return (
|
return (
|
||||||
<React.Fragment key={id}>
|
<React.Fragment key={id}>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
data-poll-answer
|
data-poll-answer
|
||||||
data-selected={selected}
|
data-selected={selected}
|
||||||
|
data-winner={isWinner || undefined}
|
||||||
role={isMultiple ? 'checkbox' : 'radio'}
|
role={isMultiple ? 'checkbox' : 'radio'}
|
||||||
aria-checked={selected}
|
aria-checked={selected}
|
||||||
aria-disabled={!canVote}
|
aria-disabled={!canVote}
|
||||||
aria-label={isWinner ? `${text}, winning answer` : undefined}
|
aria-label={labelParts.join(', ')}
|
||||||
aria-describedby={
|
aria-describedby={
|
||||||
showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0
|
showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0
|
||||||
? `poll-voters-${eventId}-${id}`
|
? `poll-voters-${eventId}-${id}`
|
||||||
@@ -340,60 +369,36 @@ export function PollContent({
|
|||||||
style={{
|
style={{
|
||||||
padding: `${config.space.S200} ${config.space.S300}`,
|
padding: `${config.space.S200} ${config.space.S300}`,
|
||||||
borderRadius: config.radii.R300,
|
borderRadius: config.radii.R300,
|
||||||
background: selected ? color.Primary.Container : color.SurfaceVariant.Container,
|
background: selected ? muted(8) : 'transparent',
|
||||||
border: `${config.borderWidth.B300} solid ${
|
border: `${config.borderWidth.B300} solid ${rowBorder}`,
|
||||||
isWinner
|
|
||||||
? color.Success.Main
|
|
||||||
: selected
|
|
||||||
? color.Primary.Main
|
|
||||||
: color.SurfaceVariant.ContainerLine
|
|
||||||
}`,
|
|
||||||
lineHeight: 1.4,
|
lineHeight: 1.4,
|
||||||
textAlign: 'left',
|
textAlign: 'left',
|
||||||
cursor: canVote ? 'pointer' : 'default',
|
cursor: canVote ? 'pointer' : 'default',
|
||||||
color: 'inherit',
|
color: 'inherit',
|
||||||
|
font: 'inherit',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
gap: config.space.S100,
|
gap: config.space.S200,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
position: 'relative',
|
|
||||||
overflow: 'hidden',
|
|
||||||
transition: 'border-color 0.15s, background 0.15s',
|
transition: 'border-color 0.15s, background 0.15s',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{showResults && total > 0 && (
|
|
||||||
<span
|
|
||||||
aria-hidden
|
|
||||||
style={{
|
|
||||||
position: 'absolute',
|
|
||||||
inset: 0,
|
|
||||||
right: 'auto',
|
|
||||||
width: `${pct}%`,
|
|
||||||
background: selected
|
|
||||||
? color.Primary.ContainerActive
|
|
||||||
: color.SurfaceVariant.ContainerActive,
|
|
||||||
pointerEvents: 'none',
|
|
||||||
transition: 'width 0.3s ease',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<span
|
<span
|
||||||
style={{
|
style={{
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
gap: config.space.S200,
|
gap: config.space.S200,
|
||||||
position: 'relative',
|
width: '100%',
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
aria-hidden
|
aria-hidden
|
||||||
style={{
|
style={{
|
||||||
flexShrink: 0,
|
flexShrink: 0,
|
||||||
width: toRem(14),
|
boxSizing: 'border-box',
|
||||||
height: toRem(14),
|
width: toRem(18),
|
||||||
border: `${config.borderWidth.B300} solid ${
|
height: toRem(18),
|
||||||
selected ? color.Primary.Main : color.Primary.ContainerLine
|
border: `2px solid ${selected ? color.Primary.Main : muted(55)}`,
|
||||||
}`,
|
|
||||||
borderRadius: isMultiple ? config.radii.R300 : config.radii.Pill,
|
borderRadius: isMultiple ? config.radii.R300 : config.radii.Pill,
|
||||||
background: selected ? color.Primary.Main : 'transparent',
|
background: selected ? color.Primary.Main : 'transparent',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -405,29 +410,72 @@ export function PollContent({
|
|||||||
>
|
>
|
||||||
{selected ? <Icon size="50" src={Icons.Check} /> : null}
|
{selected ? <Icon size="50" src={Icons.Check} /> : null}
|
||||||
</span>
|
</span>
|
||||||
<Text as="span" size="T300" style={{ flexGrow: 1 }}>
|
<Text
|
||||||
|
as="span"
|
||||||
|
size="T300"
|
||||||
|
style={{ flexGrow: 1, minWidth: 0, overflowWrap: 'anywhere' }}
|
||||||
|
>
|
||||||
{text}
|
{text}
|
||||||
</Text>
|
</Text>
|
||||||
{isWinner && (
|
{isWinner && (
|
||||||
<Icon
|
<Text
|
||||||
size="50"
|
as="span"
|
||||||
src={Icons.Check}
|
size="T200"
|
||||||
style={{ flexShrink: 0, color: color.Success.Main }}
|
style={{
|
||||||
/>
|
flexShrink: 0,
|
||||||
|
display: 'inline-flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: config.space.S100,
|
||||||
|
color: color.Success.Main,
|
||||||
|
fontWeight: 600,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Icon size="50" src={Icons.Star} filled />
|
||||||
|
Winner
|
||||||
|
</Text>
|
||||||
)}
|
)}
|
||||||
{showResults && total > 0 && (
|
{showBar && (
|
||||||
<Text as="span" size="T200" priority="300" style={{ flexShrink: 0 }}>
|
<Text
|
||||||
{pct}%
|
as="span"
|
||||||
|
size="T200"
|
||||||
|
priority="300"
|
||||||
|
style={{ flexShrink: 0, fontVariantNumeric: 'tabular-nums' }}
|
||||||
|
>
|
||||||
|
{resultText}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</span>
|
</span>
|
||||||
|
{showBar && (
|
||||||
|
<span
|
||||||
|
aria-hidden
|
||||||
|
style={{
|
||||||
|
display: 'block',
|
||||||
|
width: '100%',
|
||||||
|
height: toRem(6),
|
||||||
|
borderRadius: config.radii.Pill,
|
||||||
|
background: muted(12),
|
||||||
|
overflow: 'hidden',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
style={{
|
||||||
|
display: 'block',
|
||||||
|
height: '100%',
|
||||||
|
width: `${pct}%`,
|
||||||
|
borderRadius: config.radii.Pill,
|
||||||
|
background: barColor,
|
||||||
|
transition: 'width 0.3s ease',
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
</button>
|
</button>
|
||||||
{showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0 && (
|
{showVoters && canShowVoters && (voters.get(id)?.length ?? 0) > 0 && (
|
||||||
<Text
|
<Text
|
||||||
id={`poll-voters-${eventId}-${id}`}
|
id={`poll-voters-${eventId}-${id}`}
|
||||||
size="T200"
|
size="T200"
|
||||||
priority="300"
|
priority="300"
|
||||||
style={{ padding: `0 ${config.space.S300} ${config.space.S100}` }}
|
style={{ padding: `0 ${config.space.S300}`, marginTop: `-${config.space.S100}` }}
|
||||||
>
|
>
|
||||||
{`Voted by ${(voters.get(id) ?? []).map((s) => getMemberName(room, s)).join(', ')}`}
|
{`Voted by ${(voters.get(id) ?? []).map((s) => getMemberName(room, s)).join(', ')}`}
|
||||||
</Text>
|
</Text>
|
||||||
@@ -436,48 +484,56 @@ export function PollContent({
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</Box>
|
</Box>
|
||||||
{canShowVoters && (
|
<Box alignItems="Center" justifyContent="SpaceBetween" gap="200" wrap="Wrap">
|
||||||
<Box>
|
<Text size="T200" priority="300" style={{ minWidth: 0, flex: '1 1 12rem' }}>
|
||||||
<Chip
|
{footerNote}
|
||||||
variant={showVoters ? 'Primary' : 'SurfaceVariant'}
|
|
||||||
radii="Pill"
|
|
||||||
aria-pressed={showVoters}
|
|
||||||
onClick={() => setShowVoters((v) => !v)}
|
|
||||||
before={<Icon size="50" src={Icons.User} />}
|
|
||||||
>
|
|
||||||
<Text size="T200">{showVoters ? 'Hide voters' : 'Show who voted'}</Text>
|
|
||||||
</Chip>
|
|
||||||
</Box>
|
|
||||||
)}
|
|
||||||
<Box alignItems="Center" justifyContent="SpaceBetween" gap="200">
|
|
||||||
<Text size="T200" priority="300" style={{ minWidth: 0 }}>
|
|
||||||
<i>{footerNote}</i>
|
|
||||||
</Text>
|
</Text>
|
||||||
{canEnd &&
|
<Box gap="100" shrink="No" alignItems="Center" wrap="Wrap">
|
||||||
(confirmEnd ? (
|
{canShowVoters && (
|
||||||
<Box gap="100" shrink="No" alignItems="Center">
|
|
||||||
<Chip
|
|
||||||
variant="Critical"
|
|
||||||
radii="Pill"
|
|
||||||
aria-disabled={ending}
|
|
||||||
onClick={ending ? undefined : handleEndPoll}
|
|
||||||
>
|
|
||||||
<Text size="T200">{ending ? 'Ending…' : 'End poll'}</Text>
|
|
||||||
</Chip>
|
|
||||||
<Chip variant="Secondary" radii="Pill" onClick={() => setConfirmEnd(false)}>
|
|
||||||
<Text size="T200">Cancel</Text>
|
|
||||||
</Chip>
|
|
||||||
</Box>
|
|
||||||
) : (
|
|
||||||
<Chip
|
<Chip
|
||||||
variant="SurfaceVariant"
|
variant={showVoters ? 'Primary' : 'SurfaceVariant'}
|
||||||
radii="Pill"
|
radii="Pill"
|
||||||
onClick={() => setConfirmEnd(true)}
|
aria-pressed={showVoters}
|
||||||
before={<Icon size="50" src={Icons.Cross} />}
|
onClick={() => setShowVoters((v) => !v)}
|
||||||
|
before={<Icon size="50" src={Icons.User} />}
|
||||||
>
|
>
|
||||||
<Text size="T200">End poll</Text>
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
{showVoters ? 'Hide voters' : 'Who voted'}
|
||||||
|
</Text>
|
||||||
</Chip>
|
</Chip>
|
||||||
))}
|
)}
|
||||||
|
{canEnd &&
|
||||||
|
(confirmEnd ? (
|
||||||
|
<>
|
||||||
|
<Chip
|
||||||
|
variant="Critical"
|
||||||
|
radii="Pill"
|
||||||
|
aria-disabled={ending}
|
||||||
|
onClick={ending ? undefined : handleEndPoll}
|
||||||
|
>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
{ending ? 'Ending…' : 'End poll'}
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
<Chip variant="Secondary" radii="Pill" onClick={() => setConfirmEnd(false)}>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
Cancel
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Chip
|
||||||
|
variant="SurfaceVariant"
|
||||||
|
radii="Pill"
|
||||||
|
onClick={() => setConfirmEnd(true)}
|
||||||
|
before={<Icon size="50" src={Icons.Cross} />}
|
||||||
|
>
|
||||||
|
<Text size="T200" style={{ whiteSpace: 'nowrap' }}>
|
||||||
|
End poll
|
||||||
|
</Text>
|
||||||
|
</Chip>
|
||||||
|
))}
|
||||||
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -83,8 +83,6 @@ import { copyToClipboard } from '../../../utils/dom';
|
|||||||
import { stopPropagation } from '../../../utils/keyboard';
|
import { stopPropagation } from '../../../utils/keyboard';
|
||||||
import { getMatrixToRoomEvent } from '../../../plugins/matrix-to';
|
import { getMatrixToRoomEvent } from '../../../plugins/matrix-to';
|
||||||
import { getLotusRoomPermalink } from '../../../plugins/lotus-permalink';
|
import { getLotusRoomPermalink } from '../../../plugins/lotus-permalink';
|
||||||
import { getOriginBaseUrl } from '../../../pages/pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import { getViaServers } from '../../../plugins/via-servers';
|
import { getViaServers } from '../../../plugins/via-servers';
|
||||||
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
import { useMediaAuthentication } from '../../../hooks/useMediaAuthentication';
|
||||||
import { useRoomPinnedEvents } from '../../../hooks/useRoomPinnedEvents';
|
import { useRoomPinnedEvents } from '../../../hooks/useRoomPinnedEvents';
|
||||||
@@ -98,6 +96,7 @@ import { useLongPress } from '../../../hooks/useLongPress';
|
|||||||
import { ActionSheet } from '../../../components/action-sheet';
|
import { ActionSheet } from '../../../components/action-sheet';
|
||||||
import { useBookmarks } from '../../../hooks/useBookmarks';
|
import { useBookmarks } from '../../../hooks/useBookmarks';
|
||||||
import { PresenceRingAvatar } from '../../../components/presence';
|
import { PresenceRingAvatar } from '../../../components/presence';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { AvatarDecoration } from '../../../components/avatar-decoration/AvatarDecoration';
|
import { AvatarDecoration } from '../../../components/avatar-decoration/AvatarDecoration';
|
||||||
|
|
||||||
// Delivery status indicator for own messages
|
// Delivery status indicator for own messages
|
||||||
@@ -460,18 +459,11 @@ export const MessageCopyLotusLinkItem = as<
|
|||||||
onClose?: () => void;
|
onClose?: () => void;
|
||||||
}
|
}
|
||||||
>(({ room, mEvent, onClose, ...props }, ref) => {
|
>(({ room, mEvent, onClose, ...props }, ref) => {
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const handleCopy = () => {
|
const handleCopy = () => {
|
||||||
const eventId = mEvent.getId();
|
const eventId = mEvent.getId();
|
||||||
if (!eventId) return;
|
if (!eventId) return;
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusRoomPermalink(lotusBase, room.roomId, eventId, getViaServers(room)));
|
||||||
getLotusRoomPermalink(
|
|
||||||
getOriginBaseUrl(hashRouter),
|
|
||||||
room.roomId,
|
|
||||||
eventId,
|
|
||||||
getViaServers(room),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
onClose?.();
|
onClose?.();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { test } from 'node:test';
|
||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import { lotusLinkBases, lotusShareBase } from './useLotusLinkBase';
|
||||||
|
|
||||||
|
const LOCAL = 'http://localhost:44548/#/';
|
||||||
|
const WEB = 'https://chat.lotusguild.org';
|
||||||
|
|
||||||
|
test('web: shared links use the page origin', () => {
|
||||||
|
assert.equal(lotusShareBase(WEB, false, WEB), WEB);
|
||||||
|
assert.deepEqual(lotusLinkBases(WEB, false, undefined), [WEB]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop with webAppUrl: shared links use the public web app', () => {
|
||||||
|
assert.equal(lotusShareBase(LOCAL, true, `${WEB}/`), WEB);
|
||||||
|
assert.deepEqual(lotusLinkBases(LOCAL, true, WEB), [LOCAL, WEB]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('desktop without a valid webAppUrl falls back to the origin', () => {
|
||||||
|
[undefined, '', 'http://chat.lotusguild.org', 'nonsense'].forEach((v) => {
|
||||||
|
assert.equal(lotusShareBase(LOCAL, true, v), LOCAL, String(v));
|
||||||
|
assert.deepEqual(lotusLinkBases(LOCAL, true, v), [LOCAL]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { useMemo } from 'react';
|
||||||
|
import { useClientConfig } from './useClientConfig';
|
||||||
|
import { isTauri } from './useTauri';
|
||||||
|
import { getOriginBaseUrl } from '../pages/pathUtils';
|
||||||
|
import { resolveWebAppUrl } from '../utils/callInBrowser';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [Gitea #248] Base URL for Lotus links meant for other people.
|
||||||
|
*
|
||||||
|
* On the web that's this page's origin. In the desktop app the page is served
|
||||||
|
* from a local address (and hash-routed), which nobody else can open, so use
|
||||||
|
* the public web app from config `webAppUrl` (web path routing) instead.
|
||||||
|
* Without a valid `webAppUrl` it falls back to the origin, as before.
|
||||||
|
*/
|
||||||
|
export const lotusShareBase = (originBase: string, desktop: boolean, webAppUrl: unknown): string =>
|
||||||
|
(desktop && resolveWebAppUrl(webAppUrl)) || originBase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Every base a Lotus link to this deployment may start with: the origin, plus
|
||||||
|
* the public web app in the desktop app, so a shared https link opens in-app.
|
||||||
|
*/
|
||||||
|
export const lotusLinkBases = (
|
||||||
|
originBase: string,
|
||||||
|
desktop: boolean,
|
||||||
|
webAppUrl: unknown,
|
||||||
|
): string[] => {
|
||||||
|
const shared = lotusShareBase(originBase, desktop, webAppUrl);
|
||||||
|
return shared === originBase ? [originBase] : [originBase, shared];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useLotusShareBase = (): string => {
|
||||||
|
const { hashRouter, webAppUrl } = useClientConfig();
|
||||||
|
return useMemo(
|
||||||
|
() => lotusShareBase(getOriginBaseUrl(hashRouter), isTauri(), webAppUrl),
|
||||||
|
[hashRouter, webAppUrl],
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -77,6 +77,7 @@ import { KeyboardShortcutsDialog, useKeyboardShortcutsTrigger } from '../../feat
|
|||||||
import { useRoomsListener } from '../../hooks/useRoomsListener';
|
import { useRoomsListener } from '../../hooks/useRoomsListener';
|
||||||
import { threadNotificationsAtom } from '../../state/threadNotifications';
|
import { threadNotificationsAtom } from '../../state/threadNotifications';
|
||||||
import { roomIdToActiveThreadIdAtomFamily } from '../../state/room/thread';
|
import { roomIdToActiveThreadIdAtomFamily } from '../../state/room/thread';
|
||||||
|
import { lotusLinkBases } from '../../hooks/useLotusLinkBase';
|
||||||
import {
|
import {
|
||||||
getThreadNotificationMode,
|
getThreadNotificationMode,
|
||||||
shouldNotifyThreadReply,
|
shouldNotifyThreadReply,
|
||||||
@@ -118,11 +119,12 @@ function SystemEmojiFeature() {
|
|||||||
|
|
||||||
// [Gitea #103] Mirror the privacy toggle into the html parser's module flag.
|
// [Gitea #103] Mirror the privacy toggle into the html parser's module flag.
|
||||||
function LotusPermalinkFeature() {
|
function LotusPermalinkFeature() {
|
||||||
const { hashRouter } = useClientConfig();
|
const { hashRouter, webAppUrl } = useClientConfig();
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setLotusPermalinkBase(getOriginBaseUrl(hashRouter));
|
// [Gitea #248] In the desktop app, links to the public web app count too.
|
||||||
|
setLotusPermalinkBase(lotusLinkBases(getOriginBaseUrl(hashRouter), isTauriApp(), webAppUrl));
|
||||||
return () => setLotusPermalinkBase(undefined);
|
return () => setLotusPermalinkBase(undefined);
|
||||||
}, [hashRouter]);
|
}, [hashRouter, webAppUrl]);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,13 +49,7 @@ import { roomToParentsAtom } from '../../../state/room/roomToParents';
|
|||||||
import { allRoomsAtom } from '../../../state/room-list/roomList';
|
import { allRoomsAtom } from '../../../state/room-list/roomList';
|
||||||
import { useAnyRoomLiveCall } from '../../../hooks/useSpaceLiveCall';
|
import { useAnyRoomLiveCall } from '../../../hooks/useSpaceLiveCall';
|
||||||
import { LiveDot } from './SpaceTabs.css';
|
import { LiveDot } from './SpaceTabs.css';
|
||||||
import {
|
import { getSpaceLobbyPath, getSpacePath, joinPathComponent } from '../../pathUtils';
|
||||||
getOriginBaseUrl,
|
|
||||||
getSpaceLobbyPath,
|
|
||||||
getSpacePath,
|
|
||||||
joinPathComponent,
|
|
||||||
} from '../../pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import {
|
import {
|
||||||
SidebarAvatar,
|
SidebarAvatar,
|
||||||
SidebarItem,
|
SidebarItem,
|
||||||
@@ -102,6 +96,7 @@ import { settingsAtom } from '../../../state/settings';
|
|||||||
import { useOpenSpaceSettings } from '../../../state/hooks/spaceSettings';
|
import { useOpenSpaceSettings } from '../../../state/hooks/spaceSettings';
|
||||||
import { useRoomCreators } from '../../../hooks/useRoomCreators';
|
import { useRoomCreators } from '../../../hooks/useRoomCreators';
|
||||||
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
|
import { useRoomPermissions } from '../../../hooks/useRoomPermissions';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
||||||
|
|
||||||
type SpaceMenuProps = {
|
type SpaceMenuProps = {
|
||||||
@@ -112,7 +107,7 @@ type SpaceMenuProps = {
|
|||||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
||||||
({ room, requestClose, onUnpin }, ref) => {
|
({ room, requestClose, onUnpin }, ref) => {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
const powerLevels = usePowerLevels(room);
|
const powerLevels = usePowerLevels(room);
|
||||||
@@ -152,9 +147,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(
|
|||||||
const handleCopyLotusLink = () => {
|
const handleCopyLotusLink = () => {
|
||||||
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
||||||
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers));
|
||||||
getLotusSpacePermalink(getOriginBaseUrl(hashRouter), roomIdOrAlias, viaServers),
|
|
||||||
);
|
|
||||||
requestClose();
|
requestClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -39,13 +39,7 @@ import {
|
|||||||
NavItemContent,
|
NavItemContent,
|
||||||
NavLink,
|
NavLink,
|
||||||
} from '../../../components/nav';
|
} from '../../../components/nav';
|
||||||
import {
|
import { getSpaceLobbyPath, getSpaceRoomPath, getSpaceSearchPath } from '../../pathUtils';
|
||||||
getOriginBaseUrl,
|
|
||||||
getSpaceLobbyPath,
|
|
||||||
getSpaceRoomPath,
|
|
||||||
getSpaceSearchPath,
|
|
||||||
} from '../../pathUtils';
|
|
||||||
import { useClientConfig } from '../../../hooks/useClientConfig';
|
|
||||||
import { getCanonicalAliasOrRoomId, isRoomAlias } from '../../../utils/matrix';
|
import { getCanonicalAliasOrRoomId, isRoomAlias } from '../../../utils/matrix';
|
||||||
import { useSelectedRoom } from '../../../hooks/router/useSelectedRoom';
|
import { useSelectedRoom } from '../../../hooks/router/useSelectedRoom';
|
||||||
import {
|
import {
|
||||||
@@ -92,6 +86,7 @@ import { ContainerColor } from '../../../styles/ContainerColor.css';
|
|||||||
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
import { AsyncStatus, useAsyncCallback } from '../../../hooks/useAsyncCallback';
|
||||||
import { BreakWord } from '../../../styles/Text.css';
|
import { BreakWord } from '../../../styles/Text.css';
|
||||||
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
import { InviteUserPrompt } from '../../../components/invite-user-prompt';
|
||||||
|
import { useLotusShareBase } from '../../../hooks/useLotusLinkBase';
|
||||||
import { useCallEmbed } from '../../../hooks/useCallEmbed';
|
import { useCallEmbed } from '../../../hooks/useCallEmbed';
|
||||||
|
|
||||||
type SpaceMenuProps = {
|
type SpaceMenuProps = {
|
||||||
@@ -100,7 +95,7 @@ type SpaceMenuProps = {
|
|||||||
};
|
};
|
||||||
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClose }, ref) => {
|
const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClose }, ref) => {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const { hashRouter } = useClientConfig();
|
const lotusBase = useLotusShareBase();
|
||||||
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
const [hideActivity] = useSetting(settingsAtom, 'hideActivity');
|
||||||
const [developerTools] = useSetting(settingsAtom, 'developerTools');
|
const [developerTools] = useSetting(settingsAtom, 'developerTools');
|
||||||
const roomToParents = useAtomValue(roomToParentsAtom);
|
const roomToParents = useAtomValue(roomToParentsAtom);
|
||||||
@@ -137,9 +132,7 @@ const SpaceMenu = forwardRef<HTMLDivElement, SpaceMenuProps>(({ room, requestClo
|
|||||||
const handleCopyLotusLink = () => {
|
const handleCopyLotusLink = () => {
|
||||||
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
const roomIdOrAlias = getCanonicalAliasOrRoomId(mx, room.roomId);
|
||||||
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
const viaServers = isRoomAlias(roomIdOrAlias) ? undefined : getViaServers(room);
|
||||||
copyToClipboard(
|
copyToClipboard(getLotusSpacePermalink(lotusBase, roomIdOrAlias, viaServers));
|
||||||
getLotusSpacePermalink(getOriginBaseUrl(hashRouter), roomIdOrAlias, viaServers),
|
|
||||||
);
|
|
||||||
requestClose();
|
requestClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -122,11 +122,15 @@ const cleanHref = (href: string): string =>
|
|||||||
stripTrackingOnRender ? stripTrackingParams(href) : href;
|
stripTrackingOnRender ? stripTrackingParams(href) : href;
|
||||||
|
|
||||||
// [Gitea #130] Links to THIS deployment's room routes render and click like
|
// [Gitea #130] Links to THIS deployment's room routes render and click like
|
||||||
// matrix.to links. The base is set once from the client config
|
// matrix.to links. The bases are set once from the client config
|
||||||
// (ClientNonUIFeatures) because this module has no access to hooks.
|
// (ClientNonUIFeatures) because this module has no access to hooks. [Gitea
|
||||||
let lotusPermalinkBase: string | undefined;
|
// #248] Several: the desktop app knows both its local origin and the public web
|
||||||
export const setLotusPermalinkBase = (baseUrl: string | undefined): void => {
|
// app (`webAppUrl`), and people share the public one.
|
||||||
lotusPermalinkBase = baseUrl;
|
let lotusPermalinkBases: string[] = [];
|
||||||
|
export const setLotusPermalinkBase = (baseUrls: string | string[] | undefined): void => {
|
||||||
|
lotusPermalinkBases = (Array.isArray(baseUrls) ? baseUrls : [baseUrls]).filter(
|
||||||
|
(b): b is string => !!b,
|
||||||
|
);
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* The matrix.to form of `href` when it is a matrix.to link or a Lotus
|
* The matrix.to form of `href` when it is a matrix.to link or a Lotus
|
||||||
@@ -134,7 +138,11 @@ export const setLotusPermalinkBase = (baseUrl: string | undefined): void => {
|
|||||||
*/
|
*/
|
||||||
export const toMatrixToHref = (href: string): string | undefined => {
|
export const toMatrixToHref = (href: string): string | undefined => {
|
||||||
if (testMatrixTo(href)) return href;
|
if (testMatrixTo(href)) return href;
|
||||||
return lotusPermalinkBase ? lotusPermalinkToMatrixTo(lotusPermalinkBase, href) : undefined;
|
for (const base of lotusPermalinkBases) {
|
||||||
|
const matrixTo = lotusPermalinkToMatrixTo(base, href);
|
||||||
|
if (matrixTo) return matrixTo;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const LINKIFY_OPTS: LinkifyOpts = {
|
export const LINKIFY_OPTS: LinkifyOpts = {
|
||||||
|
|||||||
@@ -898,6 +898,14 @@ globalStyle(
|
|||||||
boxShadow: '0 0 10px rgba(255,107,0,0.10)',
|
boxShadow: '0 0 10px rgba(255,107,0,0.10)',
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
// [Gitea #246] The poll's winning answer (after it ends).
|
||||||
|
globalStyle(
|
||||||
|
`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-answer][data-winner="true"]`,
|
||||||
|
{
|
||||||
|
border: '1px solid rgba(0,255,136,0.55) !important',
|
||||||
|
boxShadow: '0 0 10px rgba(0,255,136,0.10)',
|
||||||
|
},
|
||||||
|
);
|
||||||
globalStyle(`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-content-label]`, {
|
globalStyle(`body.${lotusTerminalBodyClass} [data-poll-content] [data-poll-content-label]`, {
|
||||||
color: 'rgba(0,212,255,0.60) !important',
|
color: 'rgba(0,212,255,0.60) !important',
|
||||||
opacity: '1 !important',
|
opacity: '1 !important',
|
||||||
|
|||||||
Reference in New Issue
Block a user