Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-28 07:26:40 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix being unable to vote in polls without an expiration date (#39949)

Browse Source
This commit is contained in:
Claire
2026-07-27 11:46:27 +02:00
parent f161219516
commit e663567535
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/api_types/polls.ts
View File

@@ -9,7 +9,7 @@ export interface ApiPollOptionJSON {
export interface ApiPollJSON {
id: string;
expires_at: string;
expires_at: string | null;
expired: boolean;
multiple: boolean;
votes_count: number;

7
app/javascript/mastodon/components/poll.tsx
View File

@@ -59,10 +59,13 @@ export const Poll: React.FC<PollProps> = ({ pollId, disabled, status }) => {
return false;
}
const expiresAt = poll.expires_at;
return poll.expired || new Date(expiresAt).getTime() < Date.now();
return (
poll.expired ||
(expiresAt !== null && new Date(expiresAt).getTime() < Date.now())
);
}, [poll]);
const timeRemaining = useMemo(() => {
if (!poll) {
if (!poll?.expires_at) {
return null;
}
if (expired) {