Open source CapCut alternative.
TypeScript
fix(site): show a held email drainer on its kind row in su
David Leb617d03f4240
diff --git a/site/public/cut-stock-music/acoustic-folk-warm.mp3 b/site/public/cut-stock-music/acoustic-folk-warm.mp3deleted file mode 100644index 88a0b213..00000000Binary files a/site/public/cut-stock-music/acoustic-folk-warm.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/acoustic-guitar-calm.mp3 b/site/public/cut-stock-music/acoustic-guitar-calm.mp3deleted file mode 100644index e61c447b..00000000Binary files a/site/public/cut-stock-music/acoustic-guitar-calm.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/acoustic-sunny-morning.mp3 b/site/public/cut-stock-music/acoustic-sunny-morning.mp3deleted file mode 100644index fa603de7..00000000Binary files a/site/public/cut-stock-music/acoustic-sunny-morning.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/acoustic-ukulele-happy.mp3 b/site/public/cut-stock-music/acoustic-ukulele-happy.mp3deleted file mode 100644index 9a3342b4..00000000Binary files a/site/public/cut-stock-music/acoustic-ukulele-happy.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/ambient-deep-space.mp3 b/site/public/cut-stock-music/ambient-deep-space.mp3deleted file mode 100644index 727c9712..00000000Binary files a/site/public/cut-stock-music/ambient-deep-space.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/ambient-ethereal.mp3 b/site/public/cut-stock-music/ambient-ethereal.mp3deleted file mode 100644index 1e0f7ca3..00000000Binary files a/site/public/cut-stock-music/ambient-ethereal.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/ambient-soothing.mp3 b/site/public/cut-stock-music/ambient-soothing.mp3deleted file mode 100644index cfd30fb0..00000000Binary files a/site/public/cut-stock-music/ambient-soothing.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/ambient-warm-pad.mp3 b/site/public/cut-stock-music/ambient-warm-pad.mp3deleted file mode 100644index f3440d5b..00000000Binary files a/site/public/cut-stock-music/ambient-warm-pad.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/chill-lounge.mp3 b/site/public/cut-stock-music/chill-lounge.mp3deleted file mode 100644index 57921fa4..00000000Binary files a/site/public/cut-stock-music/chill-lounge.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/chill-mellow-keys.mp3 b/site/public/cut-stock-music/chill-mellow-keys.mp3deleted file mode 100644index 234ef274..00000000Binary files a/site/public/cut-stock-music/chill-mellow-keys.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/chill-study.mp3 b/site/public/cut-stock-music/chill-study.mp3deleted file mode 100644index 87077f42..00000000Binary files a/site/public/cut-stock-music/chill-study.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/chill-sunset.mp3 b/site/public/cut-stock-music/chill-sunset.mp3deleted file mode 100644index e531a24a..00000000Binary files a/site/public/cut-stock-music/chill-sunset.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/cinematic-heroic-brass.mp3 b/site/public/cut-stock-music/cinematic-heroic-brass.mp3deleted file mode 100644index 9593ee59..00000000Binary files a/site/public/cut-stock-music/cinematic-heroic-brass.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/cinematic-hopeful-piano.mp3 b/site/public/cut-stock-music/cinematic-hopeful-piano.mp3deleted file mode 100644index f764d942..00000000Binary files a/site/public/cut-stock-music/cinematic-hopeful-piano.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/cinematic-melancholy-cello.mp3 b/site/public/cut-stock-music/cinematic-melancholy-cello.mp3deleted file mode 100644index d91a2978..00000000Binary files a/site/public/cut-stock-music/cinematic-melancholy-cello.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/cinematic-rising-strings.mp3 b/site/public/cut-stock-music/cinematic-rising-strings.mp3deleted file mode 100644index 9cd0ff73..00000000Binary files a/site/public/cut-stock-music/cinematic-rising-strings.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/cinematic-tension.mp3 b/site/public/cut-stock-music/cinematic-tension.mp3deleted file mode 100644index 47414b58..00000000Binary files a/site/public/cut-stock-music/cinematic-tension.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/corporate-clean.mp3 b/site/public/cut-stock-music/corporate-clean.mp3deleted file mode 100644index dac19e09..00000000Binary files a/site/public/cut-stock-music/corporate-clean.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/corporate-confident.mp3 b/site/public/cut-stock-music/corporate-confident.mp3deleted file mode 100644index 55feac54..00000000Binary files a/site/public/cut-stock-music/corporate-confident.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/corporate-inspiring.mp3 b/site/public/cut-stock-music/corporate-inspiring.mp3deleted file mode 100644index 6d94f54f..00000000Binary files a/site/public/cut-stock-music/corporate-inspiring.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/corporate-tech.mp3 b/site/public/cut-stock-music/corporate-tech.mp3deleted file mode 100644index 04486dca..00000000Binary files a/site/public/cut-stock-music/corporate-tech.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/electronic-downtempo.mp3 b/site/public/cut-stock-music/electronic-downtempo.mp3deleted file mode 100644index e59a4c4f..00000000Binary files a/site/public/cut-stock-music/electronic-downtempo.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/electronic-driving-synth.mp3 b/site/public/cut-stock-music/electronic-driving-synth.mp3deleted file mode 100644index 14224f1f..00000000Binary files a/site/public/cut-stock-music/electronic-driving-synth.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/electronic-glow.mp3 b/site/public/cut-stock-music/electronic-glow.mp3deleted file mode 100644index c6289ba9..00000000Binary files a/site/public/cut-stock-music/electronic-glow.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/electronic-retro-wave.mp3 b/site/public/cut-stock-music/electronic-retro-wave.mp3deleted file mode 100644index fd239e5b..00000000Binary files a/site/public/cut-stock-music/electronic-retro-wave.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/piano-bright-flowing.mp3 b/site/public/cut-stock-music/piano-bright-flowing.mp3deleted file mode 100644index 4b782e93..00000000Binary files a/site/public/cut-stock-music/piano-bright-flowing.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/piano-emotional.mp3 b/site/public/cut-stock-music/piano-emotional.mp3deleted file mode 100644index 4a2f7a9e..00000000Binary files a/site/public/cut-stock-music/piano-emotional.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/piano-gentle-solo.mp3 b/site/public/cut-stock-music/piano-gentle-solo.mp3deleted file mode 100644index d43ae1a8..00000000Binary files a/site/public/cut-stock-music/piano-gentle-solo.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/piano-quiet-nocturne.mp3 b/site/public/cut-stock-music/piano-quiet-nocturne.mp3deleted file mode 100644index 943743d4..00000000Binary files a/site/public/cut-stock-music/piano-quiet-nocturne.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-city-lights.mp3 b/site/public/cut-stock-music/songs-city-lights.mp3deleted file mode 100644index fd765a73..00000000Binary files a/site/public/cut-stock-music/songs-city-lights.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-indie-dream.mp3 b/site/public/cut-stock-music/songs-indie-dream.mp3deleted file mode 100644index 719e154a..00000000Binary files a/site/public/cut-stock-music/songs-indie-dream.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-new-morning.mp3 b/site/public/cut-stock-music/songs-new-morning.mp3deleted file mode 100644index 59aa3548..00000000Binary files a/site/public/cut-stock-music/songs-new-morning.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-open-road.mp3 b/site/public/cut-stock-music/songs-open-road.mp3deleted file mode 100644index 0b3cf885..00000000Binary files a/site/public/cut-stock-music/songs-open-road.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-quiet-evening.mp3 b/site/public/cut-stock-music/songs-quiet-evening.mp3deleted file mode 100644index ff090669..00000000Binary files a/site/public/cut-stock-music/songs-quiet-evening.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-soft-ballad.mp3 b/site/public/cut-stock-music/songs-soft-ballad.mp3deleted file mode 100644index d3b9acd3..00000000Binary files a/site/public/cut-stock-music/songs-soft-ballad.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-summer-night.mp3 b/site/public/cut-stock-music/songs-summer-night.mp3deleted file mode 100644index 588b08ce..00000000Binary files a/site/public/cut-stock-music/songs-summer-night.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/songs-sunny-folk.mp3 b/site/public/cut-stock-music/songs-sunny-folk.mp3deleted file mode 100644index 680e345a..00000000Binary files a/site/public/cut-stock-music/songs-sunny-folk.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/upbeat-claps-pop.mp3 b/site/public/cut-stock-music/upbeat-claps-pop.mp3deleted file mode 100644index 8bcc49bd..00000000Binary files a/site/public/cut-stock-music/upbeat-claps-pop.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/upbeat-funky-bass.mp3 b/site/public/cut-stock-music/upbeat-funky-bass.mp3deleted file mode 100644index 6e4fc4aa..00000000Binary files a/site/public/cut-stock-music/upbeat-funky-bass.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/upbeat-motivational.mp3 b/site/public/cut-stock-music/upbeat-motivational.mp3deleted file mode 100644index e0e11dcf..00000000Binary files a/site/public/cut-stock-music/upbeat-motivational.mp3 and /dev/null differdiff --git a/site/public/cut-stock-music/upbeat-summer.mp3 b/site/public/cut-stock-music/upbeat-summer.mp3deleted file mode 100644index 7caa422e..00000000Binary files a/site/public/cut-stock-music/upbeat-summer.mp3 and /dev/null differdiff --git a/site/src/app/su/jobs/email/page.tsx b/site/src/app/su/jobs/email/page.tsxindex f52ce701..d35bcb60 100644--- a/site/src/app/su/jobs/email/page.tsx+++ b/site/src/app/su/jobs/email/page.tsx@@ -128,14 +128,16 @@ function KindsSection({ kinds }: { kinds: OutboxOverview["kinds"] }) {<span className="inline-flex items-center gap-2">{action.isError && action.variables?.action === "drain" && action.variables.kind === k.kind ? (<span className="text-xs text-destructive">Failed.</span>+ ) : k.drainer?.state === "held" ? (+ <span className="text-xs text-muted-foreground">held · resumes {formatWhen(k.drainer.resumesAt)}</span>) : null}<Button- disabled={k.queued === 0 || k.draining || action.isPending}+ disabled={k.queued === 0 || k.drainer !== null || action.isPending}onClick={() => action.mutate({ action: "drain", kind: k.kind })}size="sm"variant="outline">- {k.draining ? "Draining…" : "Drain"}+ {k.drainer?.state === "running" ? "Draining…" : "Drain"}</Button></span></td>diff --git a/site/src/lib/email/outbox.ts b/site/src/lib/email/outbox.tsindex df7639aa..75617c80 100644--- a/site/src/lib/email/outbox.ts+++ b/site/src/lib/email/outbox.ts@@ -279,9 +279,9 @@ export type OutboxKindRow = {queued: number;sentToday: number;failed: number;- // A drainer covering this kind is running or due now; one held back by a- // quota wait is not.- draining: boolean;+ // The drainer covering this kind: running or due now, or held back by a+ // quota wait until `resumesAt`; null when none is coming.+ drainer: { state: "running" } | { state: "held"; resumesAt: string } | null;};export type OutboxItem = {@@ -353,16 +353,24 @@ export async function outboxOverview(now = new Date()): Promise<OutboxOverview>where: { state: { in: ["sent", "skipped"] } },}),prisma.asyncJob.findMany({- select: { payload: true },- where: {- kind: "email-drain",- OR: [{ state: "running" }, { notBefore: null, state: "queued" }, { notBefore: { lte: now }, state: "queued" }],- },+ select: { notBefore: true, payload: true },+ where: { kind: "email-drain", state: { in: ["queued", "running"] } },}),]);- // A drainer without a kind covers every kind.- const drainingKinds = drains.map((d) => (d.payload as { kind?: EmailKindId } | null)?.kind ?? null);- const draining = (kind: EmailKindId) => drainingKinds.some((k) => k === null || k === kind);+ // A drainer without a kind covers every kind. One running or due now is+ // draining; one held back for later is waiting on the quota, and the kind+ // reports the earliest of those.+ const drainers = drains.map((d) => ({+ kind: (d.payload as { kind?: EmailKindId } | null)?.kind ?? null,+ held: d.notBefore !== null && d.notBefore > now ? d.notBefore : null,+ }));+ const drainer = (kind: EmailKindId): OutboxKindRow["drainer"] => {+ const covering = drainers.filter((d) => d.kind === null || d.kind === kind);+ if (covering.some((d) => d.held === null)) return { state: "running" };+ const held = covering.map((d) => d.held).filter((t): t is Date => t !== null);+ if (held.length === 0) return null;+ return { state: "held", resumesAt: new Date(Math.min(...held.map((t) => t.getTime()))).toISOString() };+ };const countOf = (groups: { kind: string; _count: number }[], kind: string) =>groups.find((g) => g.kind === kind)?._count ?? 0;const kinds = EMAIL_KIND_IDS.map((kind) => ({@@ -372,7 +380,7 @@ export async function outboxOverview(now = new Date()): Promise<OutboxOverview>queued: countOf(queued, kind),sentToday: countOf(sentToday, kind),failed: countOf(failed, kind),- draining: draining(kind),+ drainer: drainer(kind),}));const campaignIds = [...new Set(byCampaign.map((g) => g.promotionId).filter((id): id is string => id !== null))];const names = await prisma.promotion.findMany({ select: { id: true, name: true }, where: { id: { in: campaignIds } } });