tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests 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 committed by Tarrien
parent 8429b44b03
commit 027202b334
2 changed files with 3 additions and 3 deletions
Show Stats 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 { export interface ApiPollJSON {
id: string; id: string;
expires_at: string; expires_at: string | null;
expired: boolean; expired: boolean;
multiple: boolean; multiple: boolean;
votes_count: number; votes_count: number;

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

@ -36,7 +36,7 @@ const messages = defineMessages({
}); });
const isPollExpired = (expiresAt: Model.Poll['expires_at']) => const isPollExpired = (expiresAt: Model.Poll['expires_at']) =>
new Date(expiresAt).getTime() < Date.now(); expiresAt !== null && new Date(expiresAt).getTime() < Date.now();
interface PollProps { interface PollProps {
pollId: string; pollId: string;
@ -64,7 +64,7 @@ export const Poll: React.FC<PollProps> = ({ pollId, disabled, status }) => {
return poll.expired || isPollExpired(poll.expires_at); return poll.expired || isPollExpired(poll.expires_at);
}, [poll]); }, [poll]);
const timeRemaining = useMemo(() => { const timeRemaining = useMemo(() => {
if (!poll) { if (!poll?.expires_at) {
return null; return null;
} }
if (expired) { if (expired) {