versia-pub/server
2
0
Fork 0
mirror of https://github.com/versia-pub/server.git synced 2026-04-28 13:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Complete poll implementation with fixes and documentation

Browse source 
Co-authored-by: CPlusPatch <42910258+CPlusPatch@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-07-06 02:38:30 +00:00
parent 31171b5fc7
commit 2e3014582b
3 changed files with 131 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
classes/database/note.ts
View file

@ -6,6 +6,9 @@ import {
MediasToNotes,
Notes,
NoteToMentions,
PollOptions,
Polls,
PollVotes,
Users,
} from "@versia/kit/tables";
import { randomUUIDv7 } from "bun";
@ -56,7 +59,12 @@ type NoteTypeWithRelations = NoteType & {
muted: boolean;
liked: boolean;
reactions: Omit<typeof Reaction.$type, "note" | "author">[];
poll: typeof Poll.$type | null;
poll: (InferSelectModel<typeof Polls> & {
options: (InferSelectModel<typeof PollOptions> & {
votes: InferSelectModel<typeof PollVotes>[];
})[];
votes: InferSelectModel<typeof PollVotes>[];
}) | null;
};
export type NoteTypeWithoutRecursiveRelations = Omit<
@ -693,7 +701,27 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
language: null,
muted: data.muted,
pinned: data.pinned,
poll: data.poll ? data.poll.toApi(userFetching) : null,
poll: data.poll ? {
id: data.poll.id,
expires_at: data.poll.expiresAt,
expired: data.poll.expiresAt ? new Date(data.poll.expiresAt) < new Date() : false,
multiple: data.poll.multiple,
votes_count: data.poll.votesCount,
voters_count: data.poll.votersCount,
options: data.poll.options.map((option) => ({
title: option.title,
votes_count: data.poll.hideTotals && !((data.poll.expiresAt ? new Date(data.poll.expiresAt) < new Date() : false)) ? null : option.votesCount,
})),
emojis: [], // TODO: Parse emojis from poll options
voted: userFetching ? data.poll.votes.some((vote) => vote.userId === userFetching.id) : undefined,
own_votes: userFetching ? data.poll.votes
.filter((vote) => vote.userId === userFetching.id)
.map((vote) => {
const option = data.poll.options.find((opt) => opt.id === vote.optionId);
return option?.index ?? -1;
})
.filter((index) => index !== -1) : undefined,
} : null,
reblog: data.reblog
? await new Note(data.reblog as NoteTypeWithRelations).toApi(
userFetching,

3
classes/database/poll.ts
View file

@ -13,6 +13,7 @@ import {
type InferSelectModel,
inArray,
} from "drizzle-orm";
import { randomUUIDv7 } from "bun";
import type { z } from "zod";
import type { Poll as PollSchema } from "@versia/client/schemas";
import { BaseInterface } from "./base.ts";
@ -203,7 +204,7 @@ export class Poll extends BaseInterface<typeof Polls, PollTypeWithRelations> {
// Insert poll options
const optionInserts = options.map((title, index) => ({
id: crypto.randomUUID(),
id: randomUUIDv7(),
pollId: insertedPoll.id,
title,
index,