bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support infinite voting time for remote polls

Browse source 
Signed-off-by: Marcin Mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
Marcin Mikołajczak 2023-11-05 14:46:05 +01:00 committed by marcin mikołajczak
parent ded13132ff
commit 3406ce043c
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/polls/poll-footer.tsx
View file

@ -33,9 +33,11 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
e.preventDefault(); e.preventDefault();
}; };
const timeRemaining = poll.expired ? const timeRemaining = poll.expires_at && (
intl.formatMessage(messages.closed) : poll.expired ?
<RelativeTimestamp weight='medium' timestamp={poll.expires_at} futureDate />; intl.formatMessage(messages.closed) :
<RelativeTimestamp weight='medium' timestamp={poll.expires_at} futureDate />
);
let votesCount = null; let votesCount = null;
@ -82,7 +84,7 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
{votesCount} {votesCount}
</Text> </Text>
{poll.expires_at && ( {poll.expires_at !== null && (
<> <>
<Text theme='muted'>&middot;</Text> <Text theme='muted'>&middot;</Text>
<Text weight='medium' theme='muted' data-testid='poll-expiration'>{timeRemaining}</Text> <Text weight='medium' theme='muted' data-testid='poll-expiration'>{timeRemaining}</Text>

2
src/schemas/poll.ts
View file

@ -14,7 +14,7 @@ const pollOptionSchema = z.object({
const pollSchema = z.object({ const pollSchema = z.object({
emojis: filteredArray(customEmojiSchema), emojis: filteredArray(customEmojiSchema),
expired: z.boolean().catch(false), expired: z.boolean().catch(false),
expires_at: z.string().datetime().catch(new Date().toUTCString()), expires_at: z.string().datetime().nullable().catch(null),
id: z.string(), id: z.string(),
multiple: z.boolean().catch(false), multiple: z.boolean().catch(false),
options: z.array(pollOptionSchema).min(2), options: z.array(pollOptionSchema).min(2),