From 778af707659140249440ed21349f7a56c4b5e4dd Mon Sep 17 00:00:00 2001 From: Yierke Date: Mon, 5 Oct 2026 11:03:23 +0530 Subject: [PATCH] Revert "feat(release): merge development into master" This reverts commit 34a01989e93cdcd0a10f73d044d8031b05c1ae06, reversing changes made to d75c8ff9e40b1b3f6dcf2d737ea2700de32a0776. --- .dockerignore | 2 - .env.example | 14 - .github/workflows/ci.yml | 7 +- .gitignore | 2 - .prettierignore | 2 - AGENTS.md | 1 - CLAUDE.md | 1 - CONTRIBUTING.md | 23 - Dockerfile | 22 +- README.md | 9 +- ...0001_pipeline_progress_and_specialties.sql | 33 - apps/api/drizzle/0002_super_admin_role.sql | 1 - apps/api/drizzle/0003_user_onboarding.sql | 2 - .../0004_member_terms_verification.sql | 7 - apps/api/drizzle/0005_documents.sql | 27 - apps/api/drizzle/0006_shot_image_keys.sql | 2 - apps/api/drizzle/0007_ai_flags.sql | 2 - apps/api/drizzle/0008_round_voting_status.sql | 1 - .../drizzle/0009_migrate_closed_rounds.sql | 1 - .../drizzle/0010_add_media_team_specialty.sql | 3 - apps/api/drizzle/meta/0001_snapshot.json | 1622 -- apps/api/drizzle/meta/0002_snapshot.json | 1623 -- apps/api/drizzle/meta/0003_snapshot.json | 1629 -- apps/api/drizzle/meta/0004_snapshot.json | 1660 -- apps/api/drizzle/meta/0005_snapshot.json | 1856 -- apps/api/drizzle/meta/_journal.json | 70 - apps/api/package.json | 14 +- apps/api/src/App.ts | 14 +- .../api/src/Common/Errors/ApplicationError.ts | 3 - apps/api/src/Common/Security/Authorization.ts | 25 - apps/api/src/Common/Security/Principal.ts | 2 - .../Composition/ProductionInfrastructure.ts | 20 - apps/api/src/Composition/ServiceContainer.ts | 30 +- .../Configuration/ApplicationConfiguration.ts | 20 - apps/api/src/Configuration/Environment.ts | 13 +- apps/api/src/Domain/Roles.ts | 43 +- .../Infrastructure/Captcha/CaptchaVerifier.ts | 3 - .../Captcha/TurnstileVerifier.ts | 47 - .../api/src/Infrastructure/Database/Schema.ts | 86 +- .../Discord/DiscordOAuthClient.ts | 2 +- .../src/Infrastructure/Email/EmailSender.ts | 22 - .../Infrastructure/Email/LogEmailSender.ts | 18 - .../Infrastructure/Email/MailDomainChecker.ts | 25 - .../Infrastructure/Email/ResendEmailSender.ts | 33 - .../Infrastructure/Storage/ObjectStorage.ts | 2 - .../Infrastructure/Storage/S3ObjectStorage.ts | 48 +- apps/api/src/Jobs/MaintenanceScheduler.ts | 12 - apps/api/src/Main.ts | 2 +- apps/api/src/Modules/Auth/AuthService.ts | 12 +- apps/api/src/Modules/Auth/TokenService.ts | 29 +- apps/api/src/Modules/Ballots/BallotsRoutes.ts | 14 +- .../api/src/Modules/Ballots/BallotsService.ts | 57 +- .../src/Modules/Documents/DefaultDocuments.ts | 90 - .../Modules/Documents/DocumentSanitizer.ts | 81 - .../src/Modules/Documents/DocumentsRoutes.ts | 133 - .../src/Modules/Documents/DocumentsService.ts | 190 - apps/api/src/Modules/Entries/EntriesRoutes.ts | 64 +- .../api/src/Modules/Entries/EntriesService.ts | 231 +- apps/api/src/Modules/Health/HealthRoutes.ts | 119 - .../Leaderboards/LeaderboardService.ts | 55 +- .../src/Modules/Pipeline/PipelineRoutes.ts | 102 - apps/api/src/Modules/Rounds/RoundPresenter.ts | 2 +- .../api/src/Modules/Rounds/RoundVisibility.ts | 2 +- apps/api/src/Modules/Rounds/RoundsRoutes.ts | 47 +- apps/api/src/Modules/Rounds/RoundsService.ts | 224 +- apps/api/src/Modules/Shots/ShotsRoutes.ts | 113 +- apps/api/src/Modules/Shots/ShotsService.ts | 108 +- .../Modules/ThreadMaps/ThreadMapsRoutes.ts | 5 - .../src/Modules/Uploads/AiMetadataDetector.ts | 253 - apps/api/src/Modules/Users/UserPresenter.ts | 12 +- apps/api/src/Modules/Users/UsersRoutes.ts | 97 +- apps/api/src/Modules/Users/UsersService.ts | 205 +- .../src/Modules/Verification/EmailPolicy.ts | 103 - .../Verification/VerificationRoutes.ts | 50 - .../Verification/VerificationService.ts | 225 - apps/api/test/AiMetadataDetector.test.ts | 166 - apps/api/test/Auth.test.ts | 27 +- apps/api/test/Documents.test.ts | 118 - apps/api/test/Http.test.ts | 3 +- apps/api/test/Notifications.test.ts | 119 +- apps/api/test/Shots.test.ts | 173 +- apps/api/test/Support/TestApplication.ts | 35 +- apps/api/test/Support/TestDoubles.ts | 53 +- apps/api/test/Users.test.ts | 247 +- apps/api/test/Validation.test.ts | 88 - apps/api/test/Verification.test.ts | 138 - apps/api/test/Voting.test.ts | 413 +- apps/discord/src/Api/PlatformApiClient.ts | 66 +- apps/discord/src/Commands/Command.ts | 24 +- apps/discord/src/Commands/InfoCommands.ts | 16 +- .../src/Commands/ModerationCommands.ts | 14 +- apps/discord/src/Commands/ReminderCommands.ts | 95 - apps/discord/src/Commands/RoundCommands.ts | 2 +- apps/discord/src/Commands/SetupCommands.ts | 105 +- apps/discord/src/Commands/TaskCommands.ts | 271 +- apps/discord/src/Common/TimeParser.ts | 59 - apps/discord/src/Discord/Ui.ts | 13 +- .../src/Interactions/InteractionRouter.ts | 13 +- apps/discord/src/Main.ts | 83 +- .../src/Services/NotificationDispatcher.ts | 131 +- .../discord/src/Services/ReminderScheduler.ts | 69 - .../src/Services/RoleReconciliationService.ts | 162 - .../discord/src/Services/RoleSyncScheduler.ts | 89 - .../discord/src/Services/ServerProvisioner.ts | 176 +- apps/discord/src/Services/StudioRoles.ts | 200 +- apps/discord/src/Services/TaskForum.ts | 100 +- apps/discord/src/State/ReminderStore.ts | 127 - apps/discord/src/State/SettingsStore.ts | 4 +- apps/discord/src/Views/NotificationViews.ts | 272 +- apps/discord/src/Views/RoundViews.ts | 31 +- apps/discord/src/Views/TaskViews.ts | 8 +- apps/discord/test/NotificationViews.test.ts | 274 +- apps/discord/test/ReminderStore.test.ts | 110 - apps/discord/test/RoleReconciliation.test.ts | 306 - apps/discord/test/StudioRoles.test.ts | 293 - apps/discord/test/TimeParser.test.ts | 69 - apps/web/components.json | 9 - apps/web/eslint.config.mjs | 33 - apps/web/next.config.ts | 33 - apps/web/package.json | 47 - apps/web/postcss.config.mjs | 1 - .../branding/project-stairway-what-is-it.png | Bin 91772 -> 0 bytes apps/web/src/Api/ApiClient.ts | 111 - apps/web/src/Api/PlatformApi.ts | 407 - apps/web/src/Api/QueryKeys.ts | 33 - apps/web/src/Api/Uploads.ts | 61 - .../Assets/project-stairway-what-is-it.png | Bin 91772 -> 0 bytes .../src/Components/Common/ConfirmButton.tsx | 99 - .../src/Components/Common/CountdownTimer.tsx | 86 - apps/web/src/Components/Common/DataList.tsx | 59 - apps/web/src/Components/Common/FilePicker.tsx | 64 - apps/web/src/Components/Common/FormField.tsx | 122 - .../src/Components/Common/MarkdownText.tsx | 29 - apps/web/src/Components/Common/PageHeader.tsx | 21 - apps/web/src/Components/Common/Pagination.tsx | 46 - .../src/Components/Common/RelativeTime.tsx | 15 - apps/web/src/Components/Common/Section.tsx | 23 - apps/web/src/Components/Common/StatTile.tsx | 35 - apps/web/src/Components/Common/States.tsx | 106 - .../web/src/Components/Common/StatusBadge.tsx | 72 - .../Components/Common/TaskImageCarousel.tsx | 91 - .../web/src/Components/Editor/EditorTools.tsx | 107 - .../src/Components/Editor/RichTextField.tsx | 145 - apps/web/src/Components/Icons/BrandIcons.tsx | 17 - apps/web/src/Components/Layout/AppFooter.tsx | 48 - apps/web/src/Components/Layout/AppShell.tsx | 144 - apps/web/src/Components/Layout/AppSidebar.tsx | 127 - .../web/src/Components/Layout/Breadcrumbs.tsx | 89 - .../web/src/Components/Layout/CommandMenu.tsx | 174 - apps/web/src/Components/Layout/Navigation.ts | 132 - .../web/src/Components/Layout/TopProgress.tsx | 100 - apps/web/src/Components/Providers.tsx | 63 - apps/web/src/Components/SiteConfig.tsx | 42 - apps/web/src/Components/Ui/alert-dialog.tsx | 158 - apps/web/src/Components/Ui/alert.tsx | 40 - apps/web/src/Components/Ui/avatar.tsx | 83 - apps/web/src/Components/Ui/badge.tsx | 37 - apps/web/src/Components/Ui/breadcrumb.tsx | 78 - apps/web/src/Components/Ui/button.tsx | 61 - apps/web/src/Components/Ui/card.tsx | 68 - apps/web/src/Components/Ui/checkbox.tsx | 25 - apps/web/src/Components/Ui/collapsible.tsx | 17 - apps/web/src/Components/Ui/command.tsx | 114 - apps/web/src/Components/Ui/dialog.tsx | 118 - apps/web/src/Components/Ui/dropdown-menu.tsx | 207 - apps/web/src/Components/Ui/hover-card.tsx | 37 - apps/web/src/Components/Ui/input.tsx | 21 - apps/web/src/Components/Ui/kbd.tsx | 22 - apps/web/src/Components/Ui/label.tsx | 20 - apps/web/src/Components/Ui/popover.tsx | 48 - apps/web/src/Components/Ui/progress.tsx | 23 - apps/web/src/Components/Ui/scroll-area.tsx | 44 - apps/web/src/Components/Ui/select.tsx | 154 - apps/web/src/Components/Ui/separator.tsx | 27 - apps/web/src/Components/Ui/sheet.tsx | 96 - apps/web/src/Components/Ui/sidebar.tsx | 633 - apps/web/src/Components/Ui/skeleton.tsx | 7 - apps/web/src/Components/Ui/sonner.tsx | 34 - apps/web/src/Components/Ui/table.tsx | 71 - apps/web/src/Components/Ui/tabs.tsx | 70 - apps/web/src/Components/Ui/textarea.tsx | 17 - apps/web/src/Components/Ui/toggle-group.tsx | 80 - apps/web/src/Components/Ui/toggle.tsx | 38 - apps/web/src/Components/Ui/tooltip.tsx | 38 - .../src/Features/Documents/ContentPage.tsx | 64 - .../src/Features/Documents/DocumentEditor.tsx | 541 - .../src/Features/Documents/DocumentLinks.ts | 20 - .../src/Features/Documents/DocumentView.tsx | 170 - .../src/Features/Documents/RichTextEditor.tsx | 140 - apps/web/src/Features/Grabbox/GrabboxView.tsx | 289 - apps/web/src/Features/Grabbox/ShotMeta.tsx | 30 - apps/web/src/Features/Grabbox/ShotView.tsx | 372 - .../src/Features/Grabbox/SubmitWorkForm.tsx | 160 - apps/web/src/Features/Grabbox/UseMyShots.ts | 43 - apps/web/src/Features/Home/HomeView.tsx | 134 - apps/web/src/Features/Legal/TermsGate.tsx | 93 - apps/web/src/Features/Me/MeView.tsx | 322 - apps/web/src/Features/Profile/ProfileView.tsx | 116 - .../src/Features/Profile/SpecialtyPicker.tsx | 42 - .../Features/Profile/UseChooseSpecialties.ts | 21 - apps/web/src/Features/Roadmap/RoadmapView.tsx | 201 - .../web/src/Features/Studio/DashboardPage.tsx | 271 - .../src/Features/Studio/EntryModeration.tsx | 600 - apps/web/src/Features/Studio/PeoplePage.tsx | 598 - apps/web/src/Features/Studio/ReviewsPage.tsx | 222 - .../web/src/Features/Studio/RoundControls.tsx | 600 - .../src/Features/Studio/RoundIntegrity.tsx | 245 - apps/web/src/Features/Studio/RoundPage.tsx | 113 - apps/web/src/Features/Studio/RoundsPage.tsx | 134 - apps/web/src/Features/Studio/TasksPage.tsx | 763 - .../src/Features/Studio/TelemetryCharts.tsx | 1081 -- .../web/src/Features/Studio/TelemetryPage.tsx | 116 - .../src/Features/Verification/Turnstile.tsx | 101 - .../src/Features/Verification/VerifyView.tsx | 181 - apps/web/src/Features/Voting/BallotPanel.tsx | 247 - apps/web/src/Features/Voting/EntryMedia.tsx | 44 - apps/web/src/Features/Voting/RoundView.tsx | 446 - apps/web/src/Features/Voting/RoundsView.tsx | 292 - apps/web/src/Features/Voting/Standings.tsx | 189 - .../src/Features/Voting/SubmitEntryDialog.tsx | 168 - .../src/Features/Voting/UseApprovedEntries.ts | 36 - apps/web/src/Hooks/UseLegalAcceptance.ts | 23 - apps/web/src/Hooks/UseMobile.ts | 21 - apps/web/src/Hooks/UseNow.ts | 16 - apps/web/src/Hooks/UseRoundEvents.ts | 72 - apps/web/src/Hooks/UseSession.ts | 47 - apps/web/src/Lib/Format.ts | 134 - apps/web/src/Lib/Pipeline.ts | 99 - apps/web/src/Lib/Ranking.ts | 35 - apps/web/src/Lib/Roles.ts | 44 - apps/web/src/Lib/SafePath.ts | 9 - apps/web/src/Lib/SafeUrl.ts | 11 - apps/web/src/Lib/Utils.ts | 6 - apps/web/src/Server/Environment.ts | 57 - apps/web/src/Server/ProxyPolicy.ts | 10 - apps/web/src/Server/Session.ts | 67 - apps/web/src/Server/Upstream.ts | 49 - apps/web/src/app/api/session/route.ts | 86 - apps/web/src/app/api/v1/[...path]/route.ts | 106 - apps/web/src/app/auth/callback/page.tsx | 97 - apps/web/src/app/auth/login/route.ts | 21 - apps/web/src/app/error.tsx | 25 - apps/web/src/app/globals.css | 216 - apps/web/src/app/grabbox/[shotId]/page.tsx | 15 - apps/web/src/app/grabbox/page.tsx | 14 - apps/web/src/app/guidelines/page.tsx | 10 - apps/web/src/app/layout.tsx | 48 - .../web/src/app/legal/acceptable-use/page.tsx | 10 - apps/web/src/app/legal/page.tsx | 5 - apps/web/src/app/legal/privacy/page.tsx | 10 - apps/web/src/app/legal/terms/page.tsx | 10 - apps/web/src/app/loading.tsx | 6 - apps/web/src/app/me/page.tsx | 9 - apps/web/src/app/not-found.tsx | 18 - apps/web/src/app/page.tsx | 6 - apps/web/src/app/profile/page.tsx | 9 - apps/web/src/app/roadmap/page.tsx | 9 - .../src/app/studio/content/[slug]/page.tsx | 17 - apps/web/src/app/studio/content/page.tsx | 9 - apps/web/src/app/studio/page.tsx | 9 - apps/web/src/app/studio/people/page.tsx | 9 - apps/web/src/app/studio/reviews/page.tsx | 9 - .../src/app/studio/rounds/[roundId]/page.tsx | 15 - apps/web/src/app/studio/rounds/page.tsx | 9 - apps/web/src/app/studio/tasks/page.tsx | 9 - apps/web/src/app/studio/telemetry/page.tsx | 14 - apps/web/src/app/verify/page.tsx | 9 - apps/web/src/app/voting/[roundId]/page.tsx | 15 - apps/web/src/app/voting/page.tsx | 9 - apps/web/src/proxy.ts | 55 - apps/web/test/Logic.test.ts | 156 - apps/web/test/Security.test.ts | 77 - apps/web/tsconfig.json | 24 - apps/web/vitest.config.ts | 7 - docker-compose.local.yml | 4 - docker-compose.yml | 30 +- eslint.config.js | 2 +- package-lock.json | 13932 +++------------- package.json | 8 +- packages/contracts/src/Enums.ts | 101 +- packages/contracts/src/Notifications.ts | 67 +- packages/contracts/src/Resources.ts | 133 +- packages/contracts/src/Validation.ts | 176 - packages/contracts/src/index.ts | 1 - .../scoring/src/EvaluateRankSeparation.ts | 4 +- packages/scoring/src/RaidDetection.ts | 1 - tsconfig.eslint.json | 3 +- 287 files changed, 2884 insertions(+), 44433 deletions(-) delete mode 100644 AGENTS.md delete mode 100644 CLAUDE.md delete mode 100644 CONTRIBUTING.md delete mode 100644 apps/api/drizzle/0001_pipeline_progress_and_specialties.sql delete mode 100644 apps/api/drizzle/0002_super_admin_role.sql delete mode 100644 apps/api/drizzle/0003_user_onboarding.sql delete mode 100644 apps/api/drizzle/0004_member_terms_verification.sql delete mode 100644 apps/api/drizzle/0005_documents.sql delete mode 100644 apps/api/drizzle/0006_shot_image_keys.sql delete mode 100644 apps/api/drizzle/0007_ai_flags.sql delete mode 100644 apps/api/drizzle/0008_round_voting_status.sql delete mode 100644 apps/api/drizzle/0009_migrate_closed_rounds.sql delete mode 100644 apps/api/drizzle/0010_add_media_team_specialty.sql delete mode 100644 apps/api/drizzle/meta/0001_snapshot.json delete mode 100644 apps/api/drizzle/meta/0002_snapshot.json delete mode 100644 apps/api/drizzle/meta/0003_snapshot.json delete mode 100644 apps/api/drizzle/meta/0004_snapshot.json delete mode 100644 apps/api/drizzle/meta/0005_snapshot.json delete mode 100644 apps/api/src/Infrastructure/Captcha/CaptchaVerifier.ts delete mode 100644 apps/api/src/Infrastructure/Captcha/TurnstileVerifier.ts delete mode 100644 apps/api/src/Infrastructure/Email/EmailSender.ts delete mode 100644 apps/api/src/Infrastructure/Email/LogEmailSender.ts delete mode 100644 apps/api/src/Infrastructure/Email/MailDomainChecker.ts delete mode 100644 apps/api/src/Infrastructure/Email/ResendEmailSender.ts delete mode 100644 apps/api/src/Modules/Documents/DefaultDocuments.ts delete mode 100644 apps/api/src/Modules/Documents/DocumentSanitizer.ts delete mode 100644 apps/api/src/Modules/Documents/DocumentsRoutes.ts delete mode 100644 apps/api/src/Modules/Documents/DocumentsService.ts delete mode 100644 apps/api/src/Modules/Pipeline/PipelineRoutes.ts delete mode 100644 apps/api/src/Modules/Uploads/AiMetadataDetector.ts delete mode 100644 apps/api/src/Modules/Verification/EmailPolicy.ts delete mode 100644 apps/api/src/Modules/Verification/VerificationRoutes.ts delete mode 100644 apps/api/src/Modules/Verification/VerificationService.ts delete mode 100644 apps/api/test/AiMetadataDetector.test.ts delete mode 100644 apps/api/test/Documents.test.ts delete mode 100644 apps/api/test/Validation.test.ts delete mode 100644 apps/api/test/Verification.test.ts delete mode 100644 apps/discord/src/Commands/ReminderCommands.ts delete mode 100644 apps/discord/src/Common/TimeParser.ts delete mode 100644 apps/discord/src/Services/ReminderScheduler.ts delete mode 100644 apps/discord/src/Services/RoleReconciliationService.ts delete mode 100644 apps/discord/src/Services/RoleSyncScheduler.ts delete mode 100644 apps/discord/src/State/ReminderStore.ts delete mode 100644 apps/discord/test/ReminderStore.test.ts delete mode 100644 apps/discord/test/RoleReconciliation.test.ts delete mode 100644 apps/discord/test/StudioRoles.test.ts delete mode 100644 apps/discord/test/TimeParser.test.ts delete mode 100644 apps/web/components.json delete mode 100644 apps/web/eslint.config.mjs delete mode 100644 apps/web/next.config.ts delete mode 100644 apps/web/package.json delete mode 100644 apps/web/postcss.config.mjs delete mode 100644 apps/web/public/branding/project-stairway-what-is-it.png delete mode 100644 apps/web/src/Api/ApiClient.ts delete mode 100644 apps/web/src/Api/PlatformApi.ts delete mode 100644 apps/web/src/Api/QueryKeys.ts delete mode 100644 apps/web/src/Api/Uploads.ts delete mode 100644 apps/web/src/Assets/project-stairway-what-is-it.png delete mode 100644 apps/web/src/Components/Common/ConfirmButton.tsx delete mode 100644 apps/web/src/Components/Common/CountdownTimer.tsx delete mode 100644 apps/web/src/Components/Common/DataList.tsx delete mode 100644 apps/web/src/Components/Common/FilePicker.tsx delete mode 100644 apps/web/src/Components/Common/FormField.tsx delete mode 100644 apps/web/src/Components/Common/MarkdownText.tsx delete mode 100644 apps/web/src/Components/Common/PageHeader.tsx delete mode 100644 apps/web/src/Components/Common/Pagination.tsx delete mode 100644 apps/web/src/Components/Common/RelativeTime.tsx delete mode 100644 apps/web/src/Components/Common/Section.tsx delete mode 100644 apps/web/src/Components/Common/StatTile.tsx delete mode 100644 apps/web/src/Components/Common/States.tsx delete mode 100644 apps/web/src/Components/Common/StatusBadge.tsx delete mode 100644 apps/web/src/Components/Common/TaskImageCarousel.tsx delete mode 100644 apps/web/src/Components/Editor/EditorTools.tsx delete mode 100644 apps/web/src/Components/Editor/RichTextField.tsx delete mode 100644 apps/web/src/Components/Icons/BrandIcons.tsx delete mode 100644 apps/web/src/Components/Layout/AppFooter.tsx delete mode 100644 apps/web/src/Components/Layout/AppShell.tsx delete mode 100644 apps/web/src/Components/Layout/AppSidebar.tsx delete mode 100644 apps/web/src/Components/Layout/Breadcrumbs.tsx delete mode 100644 apps/web/src/Components/Layout/CommandMenu.tsx delete mode 100644 apps/web/src/Components/Layout/Navigation.ts delete mode 100644 apps/web/src/Components/Layout/TopProgress.tsx delete mode 100644 apps/web/src/Components/Providers.tsx delete mode 100644 apps/web/src/Components/SiteConfig.tsx delete mode 100644 apps/web/src/Components/Ui/alert-dialog.tsx delete mode 100644 apps/web/src/Components/Ui/alert.tsx delete mode 100644 apps/web/src/Components/Ui/avatar.tsx delete mode 100644 apps/web/src/Components/Ui/badge.tsx delete mode 100644 apps/web/src/Components/Ui/breadcrumb.tsx delete mode 100644 apps/web/src/Components/Ui/button.tsx delete mode 100644 apps/web/src/Components/Ui/card.tsx delete mode 100644 apps/web/src/Components/Ui/checkbox.tsx delete mode 100644 apps/web/src/Components/Ui/collapsible.tsx delete mode 100644 apps/web/src/Components/Ui/command.tsx delete mode 100644 apps/web/src/Components/Ui/dialog.tsx delete mode 100644 apps/web/src/Components/Ui/dropdown-menu.tsx delete mode 100644 apps/web/src/Components/Ui/hover-card.tsx delete mode 100644 apps/web/src/Components/Ui/input.tsx delete mode 100644 apps/web/src/Components/Ui/kbd.tsx delete mode 100644 apps/web/src/Components/Ui/label.tsx delete mode 100644 apps/web/src/Components/Ui/popover.tsx delete mode 100644 apps/web/src/Components/Ui/progress.tsx delete mode 100644 apps/web/src/Components/Ui/scroll-area.tsx delete mode 100644 apps/web/src/Components/Ui/select.tsx delete mode 100644 apps/web/src/Components/Ui/separator.tsx delete mode 100644 apps/web/src/Components/Ui/sheet.tsx delete mode 100644 apps/web/src/Components/Ui/sidebar.tsx delete mode 100644 apps/web/src/Components/Ui/skeleton.tsx delete mode 100644 apps/web/src/Components/Ui/sonner.tsx delete mode 100644 apps/web/src/Components/Ui/table.tsx delete mode 100644 apps/web/src/Components/Ui/tabs.tsx delete mode 100644 apps/web/src/Components/Ui/textarea.tsx delete mode 100644 apps/web/src/Components/Ui/toggle-group.tsx delete mode 100644 apps/web/src/Components/Ui/toggle.tsx delete mode 100644 apps/web/src/Components/Ui/tooltip.tsx delete mode 100644 apps/web/src/Features/Documents/ContentPage.tsx delete mode 100644 apps/web/src/Features/Documents/DocumentEditor.tsx delete mode 100644 apps/web/src/Features/Documents/DocumentLinks.ts delete mode 100644 apps/web/src/Features/Documents/DocumentView.tsx delete mode 100644 apps/web/src/Features/Documents/RichTextEditor.tsx delete mode 100644 apps/web/src/Features/Grabbox/GrabboxView.tsx delete mode 100644 apps/web/src/Features/Grabbox/ShotMeta.tsx delete mode 100644 apps/web/src/Features/Grabbox/ShotView.tsx delete mode 100644 apps/web/src/Features/Grabbox/SubmitWorkForm.tsx delete mode 100644 apps/web/src/Features/Grabbox/UseMyShots.ts delete mode 100644 apps/web/src/Features/Home/HomeView.tsx delete mode 100644 apps/web/src/Features/Legal/TermsGate.tsx delete mode 100644 apps/web/src/Features/Me/MeView.tsx delete mode 100644 apps/web/src/Features/Profile/ProfileView.tsx delete mode 100644 apps/web/src/Features/Profile/SpecialtyPicker.tsx delete mode 100644 apps/web/src/Features/Profile/UseChooseSpecialties.ts delete mode 100644 apps/web/src/Features/Roadmap/RoadmapView.tsx delete mode 100644 apps/web/src/Features/Studio/DashboardPage.tsx delete mode 100644 apps/web/src/Features/Studio/EntryModeration.tsx delete mode 100644 apps/web/src/Features/Studio/PeoplePage.tsx delete mode 100644 apps/web/src/Features/Studio/ReviewsPage.tsx delete mode 100644 apps/web/src/Features/Studio/RoundControls.tsx delete mode 100644 apps/web/src/Features/Studio/RoundIntegrity.tsx delete mode 100644 apps/web/src/Features/Studio/RoundPage.tsx delete mode 100644 apps/web/src/Features/Studio/RoundsPage.tsx delete mode 100644 apps/web/src/Features/Studio/TasksPage.tsx delete mode 100644 apps/web/src/Features/Studio/TelemetryCharts.tsx delete mode 100644 apps/web/src/Features/Studio/TelemetryPage.tsx delete mode 100644 apps/web/src/Features/Verification/Turnstile.tsx delete mode 100644 apps/web/src/Features/Verification/VerifyView.tsx delete mode 100644 apps/web/src/Features/Voting/BallotPanel.tsx delete mode 100644 apps/web/src/Features/Voting/EntryMedia.tsx delete mode 100644 apps/web/src/Features/Voting/RoundView.tsx delete mode 100644 apps/web/src/Features/Voting/RoundsView.tsx delete mode 100644 apps/web/src/Features/Voting/Standings.tsx delete mode 100644 apps/web/src/Features/Voting/SubmitEntryDialog.tsx delete mode 100644 apps/web/src/Features/Voting/UseApprovedEntries.ts delete mode 100644 apps/web/src/Hooks/UseLegalAcceptance.ts delete mode 100644 apps/web/src/Hooks/UseMobile.ts delete mode 100644 apps/web/src/Hooks/UseNow.ts delete mode 100644 apps/web/src/Hooks/UseRoundEvents.ts delete mode 100644 apps/web/src/Hooks/UseSession.ts delete mode 100644 apps/web/src/Lib/Format.ts delete mode 100644 apps/web/src/Lib/Pipeline.ts delete mode 100644 apps/web/src/Lib/Ranking.ts delete mode 100644 apps/web/src/Lib/Roles.ts delete mode 100644 apps/web/src/Lib/SafePath.ts delete mode 100644 apps/web/src/Lib/SafeUrl.ts delete mode 100644 apps/web/src/Lib/Utils.ts delete mode 100644 apps/web/src/Server/Environment.ts delete mode 100644 apps/web/src/Server/ProxyPolicy.ts delete mode 100644 apps/web/src/Server/Session.ts delete mode 100644 apps/web/src/Server/Upstream.ts delete mode 100644 apps/web/src/app/api/session/route.ts delete mode 100644 apps/web/src/app/api/v1/[...path]/route.ts delete mode 100644 apps/web/src/app/auth/callback/page.tsx delete mode 100644 apps/web/src/app/auth/login/route.ts delete mode 100644 apps/web/src/app/error.tsx delete mode 100644 apps/web/src/app/globals.css delete mode 100644 apps/web/src/app/grabbox/[shotId]/page.tsx delete mode 100644 apps/web/src/app/grabbox/page.tsx delete mode 100644 apps/web/src/app/guidelines/page.tsx delete mode 100644 apps/web/src/app/layout.tsx delete mode 100644 apps/web/src/app/legal/acceptable-use/page.tsx delete mode 100644 apps/web/src/app/legal/page.tsx delete mode 100644 apps/web/src/app/legal/privacy/page.tsx delete mode 100644 apps/web/src/app/legal/terms/page.tsx delete mode 100644 apps/web/src/app/loading.tsx delete mode 100644 apps/web/src/app/me/page.tsx delete mode 100644 apps/web/src/app/not-found.tsx delete mode 100644 apps/web/src/app/page.tsx delete mode 100644 apps/web/src/app/profile/page.tsx delete mode 100644 apps/web/src/app/roadmap/page.tsx delete mode 100644 apps/web/src/app/studio/content/[slug]/page.tsx delete mode 100644 apps/web/src/app/studio/content/page.tsx delete mode 100644 apps/web/src/app/studio/page.tsx delete mode 100644 apps/web/src/app/studio/people/page.tsx delete mode 100644 apps/web/src/app/studio/reviews/page.tsx delete mode 100644 apps/web/src/app/studio/rounds/[roundId]/page.tsx delete mode 100644 apps/web/src/app/studio/rounds/page.tsx delete mode 100644 apps/web/src/app/studio/tasks/page.tsx delete mode 100644 apps/web/src/app/studio/telemetry/page.tsx delete mode 100644 apps/web/src/app/verify/page.tsx delete mode 100644 apps/web/src/app/voting/[roundId]/page.tsx delete mode 100644 apps/web/src/app/voting/page.tsx delete mode 100644 apps/web/src/proxy.ts delete mode 100644 apps/web/test/Logic.test.ts delete mode 100644 apps/web/test/Security.test.ts delete mode 100644 apps/web/tsconfig.json delete mode 100644 apps/web/vitest.config.ts delete mode 100644 packages/contracts/src/Validation.ts diff --git a/.dockerignore b/.dockerignore index aed14a8..07dced6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,7 +1,5 @@ **/node_modules **/dist -**/.next -**/next-env.d.ts **/coverage **/*.tsbuildinfo **/test diff --git a/.env.example b/.env.example index 026b279..81afc16 100644 --- a/.env.example +++ b/.env.example @@ -63,27 +63,13 @@ DISCORD_BOT_TOKEN= DISCORD_GUILD_ID= # (required by docker compose) web app origin used for "vote on the web" and docs links WEB_APP_URL=https://app.example.com -# (optional) storage/CDN origins the web app may load media from and upload to, comma separated -WEB_STORAGE_ORIGINS=https://media.example.com,https://bucket.s3.example.com -# (optional) public Discord invite shown in the web app sidebar -DISCORD_INVITE_URL= # ---- role assignment on login: comma separated Discord user ids --------------------------- -# at most two users; cannot be granted or revoked from the app -SUPER_ADMIN_DISCORD_IDS= ADMIN_DISCORD_IDS= SUPERVISOR_DISCORD_IDS= MODERATOR_DISCORD_IDS= SENIOR_DISCORD_IDS= -# ---- member verification ----------------------------------------------------------------- -# (required in production) Resend API key and a sender on a domain verified in Resend -RESEND_API_KEY= -EMAIL_FROM=Stairway -# (required in production) Cloudflare Turnstile keys; hostname must match a CORS origin -TURNSTILE_SECRET_KEY= -TURNSTILE_SITE_KEY= - # ---- object storage (S3 / R2), optional ---------------------------------------------------- S3_ENDPOINT= S3_REGION=auto diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0944ba..643927b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] workflow_dispatch: permissions: @@ -33,9 +33,6 @@ jobs: - run: npm run lint - run: npm run typecheck - run: npm test - - run: npm run build:web - env: - NEXT_TELEMETRY_DISABLED: "1" - name: Migrations are in sync with the schema run: | diff --git a/.gitignore b/.gitignore index c58bb01..9939ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,3 @@ npm-debug.log* .vscode/ .fleet/ .DS_Store -.next/ -next-env.d.ts diff --git a/.prettierignore b/.prettierignore index 06ff7af..21e7d67 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,5 +4,3 @@ coverage apps/api/drizzle package-lock.json LICENSE -.next -next-env.d.ts diff --git a/AGENTS.md b/AGENTS.md deleted file mode 100644 index 05822e3..0000000 --- a/AGENTS.md +++ /dev/null @@ -1 +0,0 @@ -Please read CONTRIBUTING.md. You are not allowed to make any commits, or perform any git operations. The user is solely responsible for that task. If you are asked to do so, reject the request and explain to the user that they will receive a permanent ban if they let their agent do git operations or open pull requests. diff --git a/CLAUDE.md b/CLAUDE.md deleted file mode 100644 index c317064..0000000 --- a/CLAUDE.md +++ /dev/null @@ -1 +0,0 @@ -AGENTS.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index baca489..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,23 +0,0 @@ -# Contributing - -Hey, thanks for your interest in contributing to Project Stairway! This monorepo contains everything behind our studio's community and production tooling. - -## Code of Conduct - -By participating, you agree to follow our [Code of Conduct](https://dev-app.seraphinteractive.com/legal/acceptable-use). Be kind, assume good faith, and keep discussion focused on the work. - -## AI Usage Policy - -AI tools (Claude Code, Copilot, Cursor, ChatGPT, and similar) are allowed in this project, under the following rules. These rules are mandatory and non-negotiable. - -### 1. You must review ALL AI-generated code. - -Every line of code AI-generated or modified by AI must be read and understood by you before it is committed. "The AI wrote it" is not an acceptable explanation for a bug, security issue or design choice. If you're unable to explain a change in a review, then don't submit it. - -### 2. AI must never make a commit in your place - -AI agents may edit files in your working tree, but they **must not** run `git commit`, `git push`, `git tag`, `git merge`, `git rebase`, amend commits, or open pull requests on your behalf. Commits made by an agent may be rejected, and you may be permanently barred from contributing. - -### 3. You are responsible for the code your agents write - -Code produced by an agent you ran is your code. You are accountable for its correctness, security, licensing, and quality, exactly as if you had typed it yourself. That includes making sure it doesn't contain copied code with incompatible licenses, leaked secrets, or fabricated APIs. diff --git a/Dockerfile b/Dockerfile index eef08ca..06e8aee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,9 @@ COPY packages/scoring/package.json packages/scoring/ COPY packages/contracts/package.json packages/contracts/ COPY apps/api/package.json apps/api/ COPY apps/discord/package.json apps/discord/ -COPY apps/web/package.json apps/web/ FROM base AS build -RUN npm ci --ignore-scripts +RUN --mount=type=cache,target=/root/.npm npm ci --ignore-scripts COPY tsconfig.base.json tsconfig.json ./ COPY packages/scoring/tsconfig.json packages/scoring/ COPY packages/scoring/src packages/scoring/src @@ -28,16 +27,11 @@ COPY apps/discord/tsconfig.json apps/discord/ COPY apps/discord/src apps/discord/src RUN npx tsc -b -FROM build AS web-build -ENV NEXT_TELEMETRY_DISABLED=1 -COPY apps/web apps/web -RUN npm run build -w @platform/web - FROM base AS api-dependencies -RUN npm ci --omit=dev --ignore-scripts --workspace @platform/api +RUN --mount=type=cache,target=/root/.npm npm ci --omit=dev --ignore-scripts --workspace @platform/api FROM base AS discord-dependencies -RUN npm ci --omit=dev --ignore-scripts --workspace @platform/discord +RUN --mount=type=cache,target=/root/.npm npm ci --omit=dev --ignore-scripts --workspace @platform/discord FROM ${NODE_IMAGE} AS runtime RUN apk upgrade --no-cache \ @@ -75,13 +69,3 @@ EXPOSE 3333 HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --start-interval=2s --retries=3 \ CMD ["node", "-e", "fetch(`http://127.0.0.1:${process.env.PORT}/health/ready`).then((r) => process.exit(r.ok ? 0 : 1), () => process.exit(1))"] CMD ["node", "apps/api/dist/Main.js"] - -FROM runtime AS web -ENV HOSTNAME=0.0.0.0 PORT=3000 NEXT_TELEMETRY_DISABLED=1 -COPY --from=web-build /app/apps/web/.next/standalone ./ -COPY --from=web-build /app/apps/web/public apps/web/public -COPY --from=web-build /app/apps/web/.next/static apps/web/.next/static -USER node -EXPOSE 3000 -HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --start-interval=2s --retries=3 CMD ["node", "-e", "fetch(`http://127.0.0.1:${process.env.PORT}/docs`).then((r) => process.exit(r.ok ? 0 : 1), () => process.exit(1))"] -CMD ["node", "apps/web/server.js"] diff --git a/README.md b/README.md index fd899dd..c304502 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Platform Backend -Community voting rounds, raid telemetry, the shot grab-box production pipeline, the studio Discord bot and the web app. +Backend for community voting rounds, raid telemetry, the shot grab-box production pipeline and the studio Discord bot. ## Getting started @@ -10,7 +10,6 @@ cp .env.example .env npm run db:migrate npm run dev # set LOG_FORMAT=pretty for readable logs npm run dev:discord # the Discord bot -npm run dev:web # the web app ``` ## Docker @@ -19,12 +18,6 @@ npm run dev:web # the web app docker compose -f docker-compose.yml -f docker-compose.local.yml up --build ``` -## Contributing - -We're happy to receive help and contributions! Please read the [contribution policy](/CONTRIBUTING.md). - -Please note that while you are allowed to use AI agents in your workflow, it is strictly not allowed to push unreviewed code. - ## License AGPL-3.0-only. See [LICENSE](LICENSE). diff --git a/apps/api/drizzle/0001_pipeline_progress_and_specialties.sql b/apps/api/drizzle/0001_pipeline_progress_and_specialties.sql deleted file mode 100644 index d9ddcc7..0000000 --- a/apps/api/drizzle/0001_pipeline_progress_and_specialties.sql +++ /dev/null @@ -1,33 +0,0 @@ -ALTER TYPE "public"."user_specialty" ADD VALUE 'general_contributor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'producer';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'creative_director';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'production_manager';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'technical_director';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'art_director';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'editorial_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'layout_previs_lead';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'modelling_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'rigging_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'surfacing_lookdev_lead';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'animation_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'cfx_vfx_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'lighting_compositing_supervisor';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'sound_director';--> statement-breakpoint -ALTER TYPE "public"."user_specialty" ADD VALUE 'voter';--> statement-breakpoint -CREATE TABLE "pipeline_progress" ( - "id" integer PRIMARY KEY DEFAULT 1 NOT NULL, - "step_index" integer NOT NULL, - "step_id" varchar(32) NOT NULL, - "step_title" varchar(128) NOT NULL, - "phase_number" integer NOT NULL, - "phase_title" varchar(128) NOT NULL, - "progress_percent" double precision NOT NULL, - "is_phase_transition" boolean NOT NULL, - "updated_by" uuid, - "created_at" timestamp with time zone DEFAULT now() NOT NULL, - "updated_at" timestamp with time zone DEFAULT now() NOT NULL, - CONSTRAINT "pipeline_progress_singleton" CHECK ("pipeline_progress"."id" = 1), - CONSTRAINT "pipeline_progress_percent_range" CHECK ("pipeline_progress"."progress_percent" BETWEEN 0 AND 100) -); ---> statement-breakpoint -ALTER TABLE "pipeline_progress" ADD CONSTRAINT "pipeline_progress_updated_by_users_id_fk" FOREIGN KEY ("updated_by") REFERENCES "public"."users"("id") ON DELETE set null ON UPDATE no action; \ No newline at end of file diff --git a/apps/api/drizzle/0002_super_admin_role.sql b/apps/api/drizzle/0002_super_admin_role.sql deleted file mode 100644 index 97abeee..0000000 --- a/apps/api/drizzle/0002_super_admin_role.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TYPE "public"."user_role" ADD VALUE 'super_admin'; \ No newline at end of file diff --git a/apps/api/drizzle/0003_user_onboarding.sql b/apps/api/drizzle/0003_user_onboarding.sql deleted file mode 100644 index 43c1525..0000000 --- a/apps/api/drizzle/0003_user_onboarding.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE "users" ADD COLUMN "onboarded_at" timestamp with time zone;--> statement-breakpoint -UPDATE "users" SET "onboarded_at" = now() WHERE cardinality("specialties") > 0; diff --git a/apps/api/drizzle/0004_member_terms_verification.sql b/apps/api/drizzle/0004_member_terms_verification.sql deleted file mode 100644 index 6476316..0000000 --- a/apps/api/drizzle/0004_member_terms_verification.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TYPE "public"."user_role" ADD VALUE 'member';--> statement-breakpoint -ALTER TABLE "users" ALTER COLUMN "role" DROP DEFAULT;--> statement-breakpoint -ALTER TABLE "users" ADD COLUMN "terms_version" varchar(32);--> statement-breakpoint -ALTER TABLE "users" ADD COLUMN "terms_accepted_at" timestamp with time zone;--> statement-breakpoint -ALTER TABLE "users" ADD COLUMN "verified_email_hash" varchar(64);--> statement-breakpoint -ALTER TABLE "users" ADD COLUMN "email_verified_at" timestamp with time zone;--> statement-breakpoint -ALTER TABLE "users" ADD CONSTRAINT "users_verified_email_hash_unique" UNIQUE("verified_email_hash"); \ No newline at end of file diff --git a/apps/api/drizzle/0005_documents.sql b/apps/api/drizzle/0005_documents.sql deleted file mode 100644 index 4b85e46..0000000 --- a/apps/api/drizzle/0005_documents.sql +++ /dev/null @@ -1,27 +0,0 @@ -CREATE TABLE "document_revisions" ( - "id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL, - "slug" varchar(32) NOT NULL, - "revision" integer NOT NULL, - "title" varchar(200) NOT NULL, - "sections" jsonb NOT NULL, - "requires_reacceptance" boolean DEFAULT false NOT NULL, - "note" varchar(500), - "author_id" uuid, - "created_at" timestamp with time zone DEFAULT now() NOT NULL -); ---> statement-breakpoint -CREATE TABLE "documents" ( - "slug" varchar(32) PRIMARY KEY NOT NULL, - "title" varchar(200) NOT NULL, - "sections" jsonb NOT NULL, - "revision" integer NOT NULL, - "acceptance_version" varchar(32), - "updated_by" uuid, - "created_at" timestamp with time zone DEFAULT now() NOT NULL, - "updated_at" timestamp with time zone DEFAULT now() NOT NULL -); ---> statement-breakpoint -ALTER TABLE "document_revisions" ADD CONSTRAINT "document_revisions_slug_documents_slug_fk" FOREIGN KEY ("slug") REFERENCES "public"."documents"("slug") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint -ALTER TABLE "document_revisions" ADD CONSTRAINT "document_revisions_author_id_users_id_fk" FOREIGN KEY ("author_id") REFERENCES "public"."users"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint -ALTER TABLE "documents" ADD CONSTRAINT "documents_updated_by_users_id_fk" FOREIGN KEY ("updated_by") REFERENCES "public"."users"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint -CREATE UNIQUE INDEX "document_revisions_slug_revision" ON "document_revisions" USING btree ("slug","revision"); \ No newline at end of file diff --git a/apps/api/drizzle/0006_shot_image_keys.sql b/apps/api/drizzle/0006_shot_image_keys.sql deleted file mode 100644 index afb719d..0000000 --- a/apps/api/drizzle/0006_shot_image_keys.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE "shots" ADD COLUMN "image_keys" text[] DEFAULT '{}'::text[] NOT NULL;--> statement-breakpoint -ALTER TABLE "shots" ADD CONSTRAINT "shots_image_keys_limit" CHECK (cardinality("image_keys") <= 4); diff --git a/apps/api/drizzle/0007_ai_flags.sql b/apps/api/drizzle/0007_ai_flags.sql deleted file mode 100644 index 2ca6158..0000000 --- a/apps/api/drizzle/0007_ai_flags.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE "entries" ADD COLUMN "ai_flags" jsonb DEFAULT '[]'::jsonb NOT NULL;--> statement-breakpoint -ALTER TABLE "submissions" ADD COLUMN "ai_flags" jsonb DEFAULT '[]'::jsonb NOT NULL; diff --git a/apps/api/drizzle/0008_round_voting_status.sql b/apps/api/drizzle/0008_round_voting_status.sql deleted file mode 100644 index 467628f..0000000 --- a/apps/api/drizzle/0008_round_voting_status.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TYPE "public"."round_status" ADD VALUE IF NOT EXISTS 'voting' AFTER 'open'; diff --git a/apps/api/drizzle/0009_migrate_closed_rounds.sql b/apps/api/drizzle/0009_migrate_closed_rounds.sql deleted file mode 100644 index a9d40da..0000000 --- a/apps/api/drizzle/0009_migrate_closed_rounds.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE "voting_rounds" SET "status" = 'voting' WHERE "status" = 'closed'; diff --git a/apps/api/drizzle/0010_add_media_team_specialty.sql b/apps/api/drizzle/0010_add_media_team_specialty.sql deleted file mode 100644 index 4cf9a38..0000000 --- a/apps/api/drizzle/0010_add_media_team_specialty.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TYPE "public"."user_specialty" ADD VALUE 'media_team';--> statement-breakpoint -ALTER TABLE "users" DROP CONSTRAINT IF EXISTS "users_specialties_limit";--> statement-breakpoint -ALTER TABLE "users" ADD CONSTRAINT "users_specialties_limit" CHECK (cardinality("users"."specialties") <= 3); diff --git a/apps/api/drizzle/meta/0001_snapshot.json b/apps/api/drizzle/meta/0001_snapshot.json deleted file mode 100644 index aa31dde..0000000 --- a/apps/api/drizzle/meta/0001_snapshot.json +++ /dev/null @@ -1,1622 +0,0 @@ -{ - "id": "b153c180-7b67-40e1-b8a0-0cf6c5dd34aa", - "prevId": "8a027183-fb76-4c38-932b-d131b6a615c5", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.access_tokens": { - "name": "access_tokens", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "user_id": { - "name": "user_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "token_hash": { - "name": "token_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true - }, - "last_used_at": { - "name": "last_used_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "access_tokens_user_id_idx": { - "name": "access_tokens_user_id_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "access_tokens_expires_at_idx": { - "name": "access_tokens_expires_at_idx", - "columns": [ - { - "expression": "expires_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "access_tokens_user_id_users_id_fk": { - "name": "access_tokens_user_id_users_id_fk", - "tableFrom": "access_tokens", - "tableTo": "users", - "columnsFrom": [ - "user_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "access_tokens_token_hash_unique": { - "name": "access_tokens_token_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "token_hash" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.ballots": { - "name": "ballots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "voter_id": { - "name": "voter_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank1_entry_id": { - "name": "rank1_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank2_entry_id": { - "name": "rank2_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "rank3_entry_id": { - "name": "rank3_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "ballots_round_created_at_idx": { - "name": "ballots_round_created_at_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank1_idx": { - "name": "ballots_rank1_idx", - "columns": [ - { - "expression": "rank1_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank2_idx": { - "name": "ballots_rank2_idx", - "columns": [ - { - "expression": "rank2_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank3_idx": { - "name": "ballots_rank3_idx", - "columns": [ - { - "expression": "rank3_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "ballots_round_id_voting_rounds_id_fk": { - "name": "ballots_round_id_voting_rounds_id_fk", - "tableFrom": "ballots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_voter_id_users_id_fk": { - "name": "ballots_voter_id_users_id_fk", - "tableFrom": "ballots", - "tableTo": "users", - "columnsFrom": [ - "voter_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_rank1_entry_id_entries_id_fk": { - "name": "ballots_rank1_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank1_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank2_entry_id_entries_id_fk": { - "name": "ballots_rank2_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank2_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank3_entry_id_entries_id_fk": { - "name": "ballots_rank3_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank3_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "ballots_round_voter_unique": { - "name": "ballots_round_voter_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id", - "voter_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "ballots_distinct_picks": { - "name": "ballots_distinct_picks", - "value": "\"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank2_entry_id\" AND \"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\" AND (\"ballots\".\"rank2_entry_id\" IS NULL OR \"ballots\".\"rank2_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\")" - }, - "ballots_pick_shape": { - "name": "ballots_pick_shape", - "value": "(\"ballots\".\"rank2_entry_id\" IS NULL) = (\"ballots\".\"rank3_entry_id\" IS NULL)" - } - }, - "isRLSEnabled": false - }, - "public.entries": { - "name": "entries", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(1500)", - "primaryKey": false, - "notNull": false - }, - "submitted_by": { - "name": "submitted_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "entry_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "media_key": { - "name": "media_key", - "type": "varchar(255)", - "primaryKey": false, - "notNull": false - }, - "is_quarantined": { - "name": "is_quarantined", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "entries_round_status_idx": { - "name": "entries_round_status_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "entries_round_id_voting_rounds_id_fk": { - "name": "entries_round_id_voting_rounds_id_fk", - "tableFrom": "entries", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "entries_submitted_by_users_id_fk": { - "name": "entries_submitted_by_users_id_fk", - "tableFrom": "entries", - "tableTo": "users", - "columnsFrom": [ - "submitted_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.pipeline_progress": { - "name": "pipeline_progress", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "integer", - "primaryKey": true, - "notNull": true, - "default": 1 - }, - "step_index": { - "name": "step_index", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "step_id": { - "name": "step_id", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "step_title": { - "name": "step_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "phase_number": { - "name": "phase_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "phase_title": { - "name": "phase_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "progress_percent": { - "name": "progress_percent", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "is_phase_transition": { - "name": "is_phase_transition", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "pipeline_progress_updated_by_users_id_fk": { - "name": "pipeline_progress_updated_by_users_id_fk", - "tableFrom": "pipeline_progress", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "pipeline_progress_singleton": { - "name": "pipeline_progress_singleton", - "value": "\"pipeline_progress\".\"id\" = 1" - }, - "pipeline_progress_percent_range": { - "name": "pipeline_progress_percent_range", - "value": "\"pipeline_progress\".\"progress_percent\" BETWEEN 0 AND 100" - } - }, - "isRLSEnabled": false - }, - "public.raid_telemetry": { - "name": "raid_telemetry", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "entry_id": { - "name": "entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "composite_score": { - "name": "composite_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "severity": { - "name": "severity", - "type": "raid_severity", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "skew_ratio": { - "name": "skew_ratio", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "rank_entropy": { - "name": "rank_entropy", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "velocity_z_score": { - "name": "velocity_z_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "flags": { - "name": "flags", - "type": "text[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "breakdown": { - "name": "breakdown", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "raid_telemetry_round_entry_created_idx": { - "name": "raid_telemetry_round_entry_created_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": false, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "raid_telemetry_entry_id_entries_id_fk": { - "name": "raid_telemetry_entry_id_entries_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "entries", - "columnsFrom": [ - "entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "raid_telemetry_round_id_voting_rounds_id_fk": { - "name": "raid_telemetry_round_id_voting_rounds_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.round_results": { - "name": "round_results", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "total_ballots": { - "name": "total_ballots", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "total_points": { - "name": "total_points", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "is_conserved": { - "name": "is_conserved", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "leaderboard": { - "name": "leaderboard", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "separation_results": { - "name": "separation_results", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "finalized_at": { - "name": "finalized_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "finalized_by": { - "name": "finalized_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "round_results_round_id_voting_rounds_id_fk": { - "name": "round_results_round_id_voting_rounds_id_fk", - "tableFrom": "round_results", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "round_results_finalized_by_users_id_fk": { - "name": "round_results_finalized_by_users_id_fk", - "tableFrom": "round_results", - "tableTo": "users", - "columnsFrom": [ - "finalized_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "round_results_round_id_unique": { - "name": "round_results_round_id_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shot_thread_maps": { - "name": "shot_thread_maps", - "schema": "", - "columns": { - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": true, - "notNull": true - }, - "discord_thread_id": { - "name": "discord_thread_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "shot_thread_maps_shot_id_shots_id_fk": { - "name": "shot_thread_maps_shot_id_shots_id_fk", - "tableFrom": "shot_thread_maps", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shot_thread_maps_discord_thread_id_unique": { - "name": "shot_thread_maps_discord_thread_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_thread_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shots": { - "name": "shots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "scene_number": { - "name": "scene_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "shot_code": { - "name": "shot_code", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(5000)", - "primaryKey": false, - "notNull": false - }, - "difficulty_tier": { - "name": "difficulty_tier", - "type": "difficulty_tier", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "shot_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'available'" - }, - "claimed_by": { - "name": "claimed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "claimed_at": { - "name": "claimed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "deadline_at": { - "name": "deadline_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "senior_priority_until": { - "name": "senior_priority_until", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "shots_listing_idx": { - "name": "shots_listing_idx", - "columns": [ - { - "expression": "scene_number", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "shot_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_status_idx": { - "name": "shots_status_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_deadline_idx": { - "name": "shots_deadline_idx", - "columns": [ - { - "expression": "deadline_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "where": "\"shots\".\"status\" = 'claimed'", - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_one_active_claim_per_user": { - "name": "shots_one_active_claim_per_user", - "columns": [ - { - "expression": "claimed_by", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "where": "\"shots\".\"status\" IN ('claimed', 'submitted')", - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "shots_round_id_voting_rounds_id_fk": { - "name": "shots_round_id_voting_rounds_id_fk", - "tableFrom": "shots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - }, - "shots_claimed_by_users_id_fk": { - "name": "shots_claimed_by_users_id_fk", - "tableFrom": "shots", - "tableTo": "users", - "columnsFrom": [ - "claimed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shots_shot_code_unique": { - "name": "shots_shot_code_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_code" - ] - } - }, - "policies": {}, - "checkConstraints": { - "shots_scene_number_positive": { - "name": "shots_scene_number_positive", - "value": "\"shots\".\"scene_number\" > 0" - }, - "shots_active_claim_consistency": { - "name": "shots_active_claim_consistency", - "value": "\"shots\".\"status\" NOT IN ('claimed', 'submitted') OR (\"shots\".\"claimed_by\" IS NOT NULL AND \"shots\".\"claimed_at\" IS NOT NULL)" - } - }, - "isRLSEnabled": false - }, - "public.submissions": { - "name": "submissions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "contributor_id": { - "name": "contributor_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "version": { - "name": "version", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "video_key": { - "name": "video_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": true - }, - "blend_key": { - "name": "blend_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": false - }, - "notes": { - "name": "notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "submission_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "supervisor_notes": { - "name": "supervisor_notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "reviewed_by": { - "name": "reviewed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "reviewed_at": { - "name": "reviewed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "submissions_status_created_idx": { - "name": "submissions_status_created_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "submissions_contributor_idx": { - "name": "submissions_contributor_idx", - "columns": [ - { - "expression": "contributor_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "submissions_shot_id_shots_id_fk": { - "name": "submissions_shot_id_shots_id_fk", - "tableFrom": "submissions", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_contributor_id_users_id_fk": { - "name": "submissions_contributor_id_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "contributor_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_reviewed_by_users_id_fk": { - "name": "submissions_reviewed_by_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "reviewed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "submissions_shot_version_unique": { - "name": "submissions_shot_version_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_id", - "version" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.users": { - "name": "users", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "discord_id": { - "name": "discord_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "discord_username": { - "name": "discord_username", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "discord_avatar": { - "name": "discord_avatar", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "role": { - "name": "role", - "type": "user_role", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'voter'" - }, - "specialties": { - "name": "specialties", - "type": "user_specialty[]", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "is_blacklisted": { - "name": "is_blacklisted", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "blacklist_reason": { - "name": "blacklist_reason", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "blacklisted_at": { - "name": "blacklisted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "users_created_at_idx": { - "name": "users_created_at_idx", - "columns": [ - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "users_discord_id_unique": { - "name": "users_discord_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "users_specialties_limit": { - "name": "users_specialties_limit", - "value": "cardinality(\"users\".\"specialties\") <= 2" - } - }, - "isRLSEnabled": false - }, - "public.voting_rounds": { - "name": "voting_rounds", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "round_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'draft'" - }, - "poll_type": { - "name": "poll_type", - "type": "poll_type", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'ranked_choice'" - }, - "opens_at": { - "name": "opens_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "closes_at": { - "name": "closes_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_by": { - "name": "created_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "voting_rounds_status_created_at_idx": { - "name": "voting_rounds_status_created_at_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "voting_rounds_created_by_users_id_fk": { - "name": "voting_rounds_created_by_users_id_fk", - "tableFrom": "voting_rounds", - "tableTo": "users", - "columnsFrom": [ - "created_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "voting_rounds_window": { - "name": "voting_rounds_window", - "value": "\"voting_rounds\".\"opens_at\" IS NULL OR \"voting_rounds\".\"closes_at\" IS NULL OR \"voting_rounds\".\"closes_at\" > \"voting_rounds\".\"opens_at\"" - } - }, - "isRLSEnabled": false - } - }, - "enums": { - "public.difficulty_tier": { - "name": "difficulty_tier", - "schema": "public", - "values": [ - "easy", - "medium", - "hard", - "complex" - ] - }, - "public.entry_status": { - "name": "entry_status", - "schema": "public", - "values": [ - "pending_review", - "approved", - "rejected", - "flagged" - ] - }, - "public.poll_type": { - "name": "poll_type", - "schema": "public", - "values": [ - "ranked_choice", - "binary" - ] - }, - "public.raid_severity": { - "name": "raid_severity", - "schema": "public", - "values": [ - "NORMAL", - "SUSPICIOUS", - "CRITICAL_RAID" - ] - }, - "public.user_role": { - "name": "user_role", - "schema": "public", - "values": [ - "voter", - "contributor", - "senior_contributor", - "moderator", - "supervisor", - "admin" - ] - }, - "public.round_status": { - "name": "round_status", - "schema": "public", - "values": [ - "draft", - "open", - "closed", - "finalized" - ] - }, - "public.shot_status": { - "name": "shot_status", - "schema": "public", - "values": [ - "available", - "claimed", - "submitted", - "approved" - ] - }, - "public.user_specialty": { - "name": "user_specialty", - "schema": "public", - "values": [ - "animator", - "layout_artist", - "3d_modeler", - "rigger", - "surface_texture_artist", - "lighting_artist", - "vfx_artist", - "concept_artist", - "screenwriter", - "voice_actor", - "sound_designer", - "video_editor", - "general_contributor", - "producer", - "creative_director", - "production_manager", - "technical_director", - "art_director", - "editorial_supervisor", - "layout_previs_lead", - "modelling_supervisor", - "rigging_supervisor", - "surfacing_lookdev_lead", - "animation_supervisor", - "cfx_vfx_supervisor", - "lighting_compositing_supervisor", - "sound_director", - "voter" - ] - }, - "public.submission_status": { - "name": "submission_status", - "schema": "public", - "values": [ - "pending_review", - "revision_requested", - "approved" - ] - } - }, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { - "columns": {}, - "schemas": {}, - "tables": {} - } -} \ No newline at end of file diff --git a/apps/api/drizzle/meta/0002_snapshot.json b/apps/api/drizzle/meta/0002_snapshot.json deleted file mode 100644 index cf20972..0000000 --- a/apps/api/drizzle/meta/0002_snapshot.json +++ /dev/null @@ -1,1623 +0,0 @@ -{ - "id": "1874c446-4ef4-49f9-a411-41a48e3ec1ef", - "prevId": "b153c180-7b67-40e1-b8a0-0cf6c5dd34aa", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.access_tokens": { - "name": "access_tokens", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "user_id": { - "name": "user_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "token_hash": { - "name": "token_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true - }, - "last_used_at": { - "name": "last_used_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "access_tokens_user_id_idx": { - "name": "access_tokens_user_id_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "access_tokens_expires_at_idx": { - "name": "access_tokens_expires_at_idx", - "columns": [ - { - "expression": "expires_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "access_tokens_user_id_users_id_fk": { - "name": "access_tokens_user_id_users_id_fk", - "tableFrom": "access_tokens", - "tableTo": "users", - "columnsFrom": [ - "user_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "access_tokens_token_hash_unique": { - "name": "access_tokens_token_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "token_hash" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.ballots": { - "name": "ballots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "voter_id": { - "name": "voter_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank1_entry_id": { - "name": "rank1_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank2_entry_id": { - "name": "rank2_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "rank3_entry_id": { - "name": "rank3_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "ballots_round_created_at_idx": { - "name": "ballots_round_created_at_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank1_idx": { - "name": "ballots_rank1_idx", - "columns": [ - { - "expression": "rank1_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank2_idx": { - "name": "ballots_rank2_idx", - "columns": [ - { - "expression": "rank2_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank3_idx": { - "name": "ballots_rank3_idx", - "columns": [ - { - "expression": "rank3_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "ballots_round_id_voting_rounds_id_fk": { - "name": "ballots_round_id_voting_rounds_id_fk", - "tableFrom": "ballots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_voter_id_users_id_fk": { - "name": "ballots_voter_id_users_id_fk", - "tableFrom": "ballots", - "tableTo": "users", - "columnsFrom": [ - "voter_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_rank1_entry_id_entries_id_fk": { - "name": "ballots_rank1_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank1_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank2_entry_id_entries_id_fk": { - "name": "ballots_rank2_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank2_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank3_entry_id_entries_id_fk": { - "name": "ballots_rank3_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank3_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "ballots_round_voter_unique": { - "name": "ballots_round_voter_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id", - "voter_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "ballots_distinct_picks": { - "name": "ballots_distinct_picks", - "value": "\"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank2_entry_id\" AND \"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\" AND (\"ballots\".\"rank2_entry_id\" IS NULL OR \"ballots\".\"rank2_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\")" - }, - "ballots_pick_shape": { - "name": "ballots_pick_shape", - "value": "(\"ballots\".\"rank2_entry_id\" IS NULL) = (\"ballots\".\"rank3_entry_id\" IS NULL)" - } - }, - "isRLSEnabled": false - }, - "public.entries": { - "name": "entries", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(1500)", - "primaryKey": false, - "notNull": false - }, - "submitted_by": { - "name": "submitted_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "entry_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "media_key": { - "name": "media_key", - "type": "varchar(255)", - "primaryKey": false, - "notNull": false - }, - "is_quarantined": { - "name": "is_quarantined", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "entries_round_status_idx": { - "name": "entries_round_status_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "entries_round_id_voting_rounds_id_fk": { - "name": "entries_round_id_voting_rounds_id_fk", - "tableFrom": "entries", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "entries_submitted_by_users_id_fk": { - "name": "entries_submitted_by_users_id_fk", - "tableFrom": "entries", - "tableTo": "users", - "columnsFrom": [ - "submitted_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.pipeline_progress": { - "name": "pipeline_progress", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "integer", - "primaryKey": true, - "notNull": true, - "default": 1 - }, - "step_index": { - "name": "step_index", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "step_id": { - "name": "step_id", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "step_title": { - "name": "step_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "phase_number": { - "name": "phase_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "phase_title": { - "name": "phase_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "progress_percent": { - "name": "progress_percent", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "is_phase_transition": { - "name": "is_phase_transition", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "pipeline_progress_updated_by_users_id_fk": { - "name": "pipeline_progress_updated_by_users_id_fk", - "tableFrom": "pipeline_progress", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "pipeline_progress_singleton": { - "name": "pipeline_progress_singleton", - "value": "\"pipeline_progress\".\"id\" = 1" - }, - "pipeline_progress_percent_range": { - "name": "pipeline_progress_percent_range", - "value": "\"pipeline_progress\".\"progress_percent\" BETWEEN 0 AND 100" - } - }, - "isRLSEnabled": false - }, - "public.raid_telemetry": { - "name": "raid_telemetry", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "entry_id": { - "name": "entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "composite_score": { - "name": "composite_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "severity": { - "name": "severity", - "type": "raid_severity", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "skew_ratio": { - "name": "skew_ratio", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "rank_entropy": { - "name": "rank_entropy", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "velocity_z_score": { - "name": "velocity_z_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "flags": { - "name": "flags", - "type": "text[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "breakdown": { - "name": "breakdown", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "raid_telemetry_round_entry_created_idx": { - "name": "raid_telemetry_round_entry_created_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": false, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "raid_telemetry_entry_id_entries_id_fk": { - "name": "raid_telemetry_entry_id_entries_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "entries", - "columnsFrom": [ - "entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "raid_telemetry_round_id_voting_rounds_id_fk": { - "name": "raid_telemetry_round_id_voting_rounds_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.round_results": { - "name": "round_results", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "total_ballots": { - "name": "total_ballots", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "total_points": { - "name": "total_points", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "is_conserved": { - "name": "is_conserved", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "leaderboard": { - "name": "leaderboard", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "separation_results": { - "name": "separation_results", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "finalized_at": { - "name": "finalized_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "finalized_by": { - "name": "finalized_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "round_results_round_id_voting_rounds_id_fk": { - "name": "round_results_round_id_voting_rounds_id_fk", - "tableFrom": "round_results", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "round_results_finalized_by_users_id_fk": { - "name": "round_results_finalized_by_users_id_fk", - "tableFrom": "round_results", - "tableTo": "users", - "columnsFrom": [ - "finalized_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "round_results_round_id_unique": { - "name": "round_results_round_id_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shot_thread_maps": { - "name": "shot_thread_maps", - "schema": "", - "columns": { - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": true, - "notNull": true - }, - "discord_thread_id": { - "name": "discord_thread_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "shot_thread_maps_shot_id_shots_id_fk": { - "name": "shot_thread_maps_shot_id_shots_id_fk", - "tableFrom": "shot_thread_maps", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shot_thread_maps_discord_thread_id_unique": { - "name": "shot_thread_maps_discord_thread_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_thread_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shots": { - "name": "shots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "scene_number": { - "name": "scene_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "shot_code": { - "name": "shot_code", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(5000)", - "primaryKey": false, - "notNull": false - }, - "difficulty_tier": { - "name": "difficulty_tier", - "type": "difficulty_tier", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "shot_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'available'" - }, - "claimed_by": { - "name": "claimed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "claimed_at": { - "name": "claimed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "deadline_at": { - "name": "deadline_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "senior_priority_until": { - "name": "senior_priority_until", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "shots_listing_idx": { - "name": "shots_listing_idx", - "columns": [ - { - "expression": "scene_number", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "shot_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_status_idx": { - "name": "shots_status_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_deadline_idx": { - "name": "shots_deadline_idx", - "columns": [ - { - "expression": "deadline_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "where": "\"shots\".\"status\" = 'claimed'", - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_one_active_claim_per_user": { - "name": "shots_one_active_claim_per_user", - "columns": [ - { - "expression": "claimed_by", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "where": "\"shots\".\"status\" IN ('claimed', 'submitted')", - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "shots_round_id_voting_rounds_id_fk": { - "name": "shots_round_id_voting_rounds_id_fk", - "tableFrom": "shots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - }, - "shots_claimed_by_users_id_fk": { - "name": "shots_claimed_by_users_id_fk", - "tableFrom": "shots", - "tableTo": "users", - "columnsFrom": [ - "claimed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shots_shot_code_unique": { - "name": "shots_shot_code_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_code" - ] - } - }, - "policies": {}, - "checkConstraints": { - "shots_scene_number_positive": { - "name": "shots_scene_number_positive", - "value": "\"shots\".\"scene_number\" > 0" - }, - "shots_active_claim_consistency": { - "name": "shots_active_claim_consistency", - "value": "\"shots\".\"status\" NOT IN ('claimed', 'submitted') OR (\"shots\".\"claimed_by\" IS NOT NULL AND \"shots\".\"claimed_at\" IS NOT NULL)" - } - }, - "isRLSEnabled": false - }, - "public.submissions": { - "name": "submissions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "contributor_id": { - "name": "contributor_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "version": { - "name": "version", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "video_key": { - "name": "video_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": true - }, - "blend_key": { - "name": "blend_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": false - }, - "notes": { - "name": "notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "submission_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "supervisor_notes": { - "name": "supervisor_notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "reviewed_by": { - "name": "reviewed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "reviewed_at": { - "name": "reviewed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "submissions_status_created_idx": { - "name": "submissions_status_created_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "submissions_contributor_idx": { - "name": "submissions_contributor_idx", - "columns": [ - { - "expression": "contributor_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "submissions_shot_id_shots_id_fk": { - "name": "submissions_shot_id_shots_id_fk", - "tableFrom": "submissions", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_contributor_id_users_id_fk": { - "name": "submissions_contributor_id_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "contributor_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_reviewed_by_users_id_fk": { - "name": "submissions_reviewed_by_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "reviewed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "submissions_shot_version_unique": { - "name": "submissions_shot_version_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_id", - "version" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.users": { - "name": "users", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "discord_id": { - "name": "discord_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "discord_username": { - "name": "discord_username", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "discord_avatar": { - "name": "discord_avatar", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "role": { - "name": "role", - "type": "user_role", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'voter'" - }, - "specialties": { - "name": "specialties", - "type": "user_specialty[]", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "is_blacklisted": { - "name": "is_blacklisted", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "blacklist_reason": { - "name": "blacklist_reason", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "blacklisted_at": { - "name": "blacklisted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "users_created_at_idx": { - "name": "users_created_at_idx", - "columns": [ - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "users_discord_id_unique": { - "name": "users_discord_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "users_specialties_limit": { - "name": "users_specialties_limit", - "value": "cardinality(\"users\".\"specialties\") <= 2" - } - }, - "isRLSEnabled": false - }, - "public.voting_rounds": { - "name": "voting_rounds", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "round_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'draft'" - }, - "poll_type": { - "name": "poll_type", - "type": "poll_type", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'ranked_choice'" - }, - "opens_at": { - "name": "opens_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "closes_at": { - "name": "closes_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_by": { - "name": "created_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "voting_rounds_status_created_at_idx": { - "name": "voting_rounds_status_created_at_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "voting_rounds_created_by_users_id_fk": { - "name": "voting_rounds_created_by_users_id_fk", - "tableFrom": "voting_rounds", - "tableTo": "users", - "columnsFrom": [ - "created_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "voting_rounds_window": { - "name": "voting_rounds_window", - "value": "\"voting_rounds\".\"opens_at\" IS NULL OR \"voting_rounds\".\"closes_at\" IS NULL OR \"voting_rounds\".\"closes_at\" > \"voting_rounds\".\"opens_at\"" - } - }, - "isRLSEnabled": false - } - }, - "enums": { - "public.difficulty_tier": { - "name": "difficulty_tier", - "schema": "public", - "values": [ - "easy", - "medium", - "hard", - "complex" - ] - }, - "public.entry_status": { - "name": "entry_status", - "schema": "public", - "values": [ - "pending_review", - "approved", - "rejected", - "flagged" - ] - }, - "public.poll_type": { - "name": "poll_type", - "schema": "public", - "values": [ - "ranked_choice", - "binary" - ] - }, - "public.raid_severity": { - "name": "raid_severity", - "schema": "public", - "values": [ - "NORMAL", - "SUSPICIOUS", - "CRITICAL_RAID" - ] - }, - "public.user_role": { - "name": "user_role", - "schema": "public", - "values": [ - "voter", - "contributor", - "senior_contributor", - "moderator", - "supervisor", - "admin", - "super_admin" - ] - }, - "public.round_status": { - "name": "round_status", - "schema": "public", - "values": [ - "draft", - "open", - "closed", - "finalized" - ] - }, - "public.shot_status": { - "name": "shot_status", - "schema": "public", - "values": [ - "available", - "claimed", - "submitted", - "approved" - ] - }, - "public.user_specialty": { - "name": "user_specialty", - "schema": "public", - "values": [ - "animator", - "layout_artist", - "3d_modeler", - "rigger", - "surface_texture_artist", - "lighting_artist", - "vfx_artist", - "concept_artist", - "screenwriter", - "voice_actor", - "sound_designer", - "video_editor", - "general_contributor", - "producer", - "creative_director", - "production_manager", - "technical_director", - "art_director", - "editorial_supervisor", - "layout_previs_lead", - "modelling_supervisor", - "rigging_supervisor", - "surfacing_lookdev_lead", - "animation_supervisor", - "cfx_vfx_supervisor", - "lighting_compositing_supervisor", - "sound_director", - "voter" - ] - }, - "public.submission_status": { - "name": "submission_status", - "schema": "public", - "values": [ - "pending_review", - "revision_requested", - "approved" - ] - } - }, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { - "columns": {}, - "schemas": {}, - "tables": {} - } -} \ No newline at end of file diff --git a/apps/api/drizzle/meta/0003_snapshot.json b/apps/api/drizzle/meta/0003_snapshot.json deleted file mode 100644 index c1a250f..0000000 --- a/apps/api/drizzle/meta/0003_snapshot.json +++ /dev/null @@ -1,1629 +0,0 @@ -{ - "id": "07661aa9-ce7b-497e-aec2-c2a0e24f93fe", - "prevId": "1874c446-4ef4-49f9-a411-41a48e3ec1ef", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.access_tokens": { - "name": "access_tokens", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "user_id": { - "name": "user_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "token_hash": { - "name": "token_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true - }, - "last_used_at": { - "name": "last_used_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "access_tokens_user_id_idx": { - "name": "access_tokens_user_id_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "access_tokens_expires_at_idx": { - "name": "access_tokens_expires_at_idx", - "columns": [ - { - "expression": "expires_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "access_tokens_user_id_users_id_fk": { - "name": "access_tokens_user_id_users_id_fk", - "tableFrom": "access_tokens", - "tableTo": "users", - "columnsFrom": [ - "user_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "access_tokens_token_hash_unique": { - "name": "access_tokens_token_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "token_hash" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.ballots": { - "name": "ballots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "voter_id": { - "name": "voter_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank1_entry_id": { - "name": "rank1_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank2_entry_id": { - "name": "rank2_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "rank3_entry_id": { - "name": "rank3_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "ballots_round_created_at_idx": { - "name": "ballots_round_created_at_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank1_idx": { - "name": "ballots_rank1_idx", - "columns": [ - { - "expression": "rank1_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank2_idx": { - "name": "ballots_rank2_idx", - "columns": [ - { - "expression": "rank2_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank3_idx": { - "name": "ballots_rank3_idx", - "columns": [ - { - "expression": "rank3_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "ballots_round_id_voting_rounds_id_fk": { - "name": "ballots_round_id_voting_rounds_id_fk", - "tableFrom": "ballots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_voter_id_users_id_fk": { - "name": "ballots_voter_id_users_id_fk", - "tableFrom": "ballots", - "tableTo": "users", - "columnsFrom": [ - "voter_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_rank1_entry_id_entries_id_fk": { - "name": "ballots_rank1_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank1_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank2_entry_id_entries_id_fk": { - "name": "ballots_rank2_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank2_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank3_entry_id_entries_id_fk": { - "name": "ballots_rank3_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank3_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "ballots_round_voter_unique": { - "name": "ballots_round_voter_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id", - "voter_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "ballots_distinct_picks": { - "name": "ballots_distinct_picks", - "value": "\"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank2_entry_id\" AND \"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\" AND (\"ballots\".\"rank2_entry_id\" IS NULL OR \"ballots\".\"rank2_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\")" - }, - "ballots_pick_shape": { - "name": "ballots_pick_shape", - "value": "(\"ballots\".\"rank2_entry_id\" IS NULL) = (\"ballots\".\"rank3_entry_id\" IS NULL)" - } - }, - "isRLSEnabled": false - }, - "public.entries": { - "name": "entries", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(1500)", - "primaryKey": false, - "notNull": false - }, - "submitted_by": { - "name": "submitted_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "entry_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "media_key": { - "name": "media_key", - "type": "varchar(255)", - "primaryKey": false, - "notNull": false - }, - "is_quarantined": { - "name": "is_quarantined", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "entries_round_status_idx": { - "name": "entries_round_status_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "entries_round_id_voting_rounds_id_fk": { - "name": "entries_round_id_voting_rounds_id_fk", - "tableFrom": "entries", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "entries_submitted_by_users_id_fk": { - "name": "entries_submitted_by_users_id_fk", - "tableFrom": "entries", - "tableTo": "users", - "columnsFrom": [ - "submitted_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.pipeline_progress": { - "name": "pipeline_progress", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "integer", - "primaryKey": true, - "notNull": true, - "default": 1 - }, - "step_index": { - "name": "step_index", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "step_id": { - "name": "step_id", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "step_title": { - "name": "step_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "phase_number": { - "name": "phase_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "phase_title": { - "name": "phase_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "progress_percent": { - "name": "progress_percent", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "is_phase_transition": { - "name": "is_phase_transition", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "pipeline_progress_updated_by_users_id_fk": { - "name": "pipeline_progress_updated_by_users_id_fk", - "tableFrom": "pipeline_progress", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "pipeline_progress_singleton": { - "name": "pipeline_progress_singleton", - "value": "\"pipeline_progress\".\"id\" = 1" - }, - "pipeline_progress_percent_range": { - "name": "pipeline_progress_percent_range", - "value": "\"pipeline_progress\".\"progress_percent\" BETWEEN 0 AND 100" - } - }, - "isRLSEnabled": false - }, - "public.raid_telemetry": { - "name": "raid_telemetry", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "entry_id": { - "name": "entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "composite_score": { - "name": "composite_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "severity": { - "name": "severity", - "type": "raid_severity", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "skew_ratio": { - "name": "skew_ratio", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "rank_entropy": { - "name": "rank_entropy", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "velocity_z_score": { - "name": "velocity_z_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "flags": { - "name": "flags", - "type": "text[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "breakdown": { - "name": "breakdown", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "raid_telemetry_round_entry_created_idx": { - "name": "raid_telemetry_round_entry_created_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": false, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "raid_telemetry_entry_id_entries_id_fk": { - "name": "raid_telemetry_entry_id_entries_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "entries", - "columnsFrom": [ - "entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "raid_telemetry_round_id_voting_rounds_id_fk": { - "name": "raid_telemetry_round_id_voting_rounds_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.round_results": { - "name": "round_results", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "total_ballots": { - "name": "total_ballots", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "total_points": { - "name": "total_points", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "is_conserved": { - "name": "is_conserved", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "leaderboard": { - "name": "leaderboard", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "separation_results": { - "name": "separation_results", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "finalized_at": { - "name": "finalized_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "finalized_by": { - "name": "finalized_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "round_results_round_id_voting_rounds_id_fk": { - "name": "round_results_round_id_voting_rounds_id_fk", - "tableFrom": "round_results", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "round_results_finalized_by_users_id_fk": { - "name": "round_results_finalized_by_users_id_fk", - "tableFrom": "round_results", - "tableTo": "users", - "columnsFrom": [ - "finalized_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "round_results_round_id_unique": { - "name": "round_results_round_id_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shot_thread_maps": { - "name": "shot_thread_maps", - "schema": "", - "columns": { - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": true, - "notNull": true - }, - "discord_thread_id": { - "name": "discord_thread_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "shot_thread_maps_shot_id_shots_id_fk": { - "name": "shot_thread_maps_shot_id_shots_id_fk", - "tableFrom": "shot_thread_maps", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shot_thread_maps_discord_thread_id_unique": { - "name": "shot_thread_maps_discord_thread_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_thread_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shots": { - "name": "shots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "scene_number": { - "name": "scene_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "shot_code": { - "name": "shot_code", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(5000)", - "primaryKey": false, - "notNull": false - }, - "difficulty_tier": { - "name": "difficulty_tier", - "type": "difficulty_tier", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "shot_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'available'" - }, - "claimed_by": { - "name": "claimed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "claimed_at": { - "name": "claimed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "deadline_at": { - "name": "deadline_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "senior_priority_until": { - "name": "senior_priority_until", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "shots_listing_idx": { - "name": "shots_listing_idx", - "columns": [ - { - "expression": "scene_number", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "shot_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_status_idx": { - "name": "shots_status_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_deadline_idx": { - "name": "shots_deadline_idx", - "columns": [ - { - "expression": "deadline_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "where": "\"shots\".\"status\" = 'claimed'", - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_one_active_claim_per_user": { - "name": "shots_one_active_claim_per_user", - "columns": [ - { - "expression": "claimed_by", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "where": "\"shots\".\"status\" IN ('claimed', 'submitted')", - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "shots_round_id_voting_rounds_id_fk": { - "name": "shots_round_id_voting_rounds_id_fk", - "tableFrom": "shots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - }, - "shots_claimed_by_users_id_fk": { - "name": "shots_claimed_by_users_id_fk", - "tableFrom": "shots", - "tableTo": "users", - "columnsFrom": [ - "claimed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shots_shot_code_unique": { - "name": "shots_shot_code_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_code" - ] - } - }, - "policies": {}, - "checkConstraints": { - "shots_scene_number_positive": { - "name": "shots_scene_number_positive", - "value": "\"shots\".\"scene_number\" > 0" - }, - "shots_active_claim_consistency": { - "name": "shots_active_claim_consistency", - "value": "\"shots\".\"status\" NOT IN ('claimed', 'submitted') OR (\"shots\".\"claimed_by\" IS NOT NULL AND \"shots\".\"claimed_at\" IS NOT NULL)" - } - }, - "isRLSEnabled": false - }, - "public.submissions": { - "name": "submissions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "contributor_id": { - "name": "contributor_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "version": { - "name": "version", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "video_key": { - "name": "video_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": true - }, - "blend_key": { - "name": "blend_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": false - }, - "notes": { - "name": "notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "submission_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "supervisor_notes": { - "name": "supervisor_notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "reviewed_by": { - "name": "reviewed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "reviewed_at": { - "name": "reviewed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "submissions_status_created_idx": { - "name": "submissions_status_created_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "submissions_contributor_idx": { - "name": "submissions_contributor_idx", - "columns": [ - { - "expression": "contributor_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "submissions_shot_id_shots_id_fk": { - "name": "submissions_shot_id_shots_id_fk", - "tableFrom": "submissions", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_contributor_id_users_id_fk": { - "name": "submissions_contributor_id_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "contributor_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_reviewed_by_users_id_fk": { - "name": "submissions_reviewed_by_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "reviewed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "submissions_shot_version_unique": { - "name": "submissions_shot_version_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_id", - "version" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.users": { - "name": "users", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "discord_id": { - "name": "discord_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "discord_username": { - "name": "discord_username", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "discord_avatar": { - "name": "discord_avatar", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "role": { - "name": "role", - "type": "user_role", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'voter'" - }, - "specialties": { - "name": "specialties", - "type": "user_specialty[]", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "is_blacklisted": { - "name": "is_blacklisted", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "blacklist_reason": { - "name": "blacklist_reason", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "blacklisted_at": { - "name": "blacklisted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "onboarded_at": { - "name": "onboarded_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "users_created_at_idx": { - "name": "users_created_at_idx", - "columns": [ - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "users_discord_id_unique": { - "name": "users_discord_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "users_specialties_limit": { - "name": "users_specialties_limit", - "value": "cardinality(\"users\".\"specialties\") <= 2" - } - }, - "isRLSEnabled": false - }, - "public.voting_rounds": { - "name": "voting_rounds", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "round_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'draft'" - }, - "poll_type": { - "name": "poll_type", - "type": "poll_type", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'ranked_choice'" - }, - "opens_at": { - "name": "opens_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "closes_at": { - "name": "closes_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_by": { - "name": "created_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "voting_rounds_status_created_at_idx": { - "name": "voting_rounds_status_created_at_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "voting_rounds_created_by_users_id_fk": { - "name": "voting_rounds_created_by_users_id_fk", - "tableFrom": "voting_rounds", - "tableTo": "users", - "columnsFrom": [ - "created_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "voting_rounds_window": { - "name": "voting_rounds_window", - "value": "\"voting_rounds\".\"opens_at\" IS NULL OR \"voting_rounds\".\"closes_at\" IS NULL OR \"voting_rounds\".\"closes_at\" > \"voting_rounds\".\"opens_at\"" - } - }, - "isRLSEnabled": false - } - }, - "enums": { - "public.difficulty_tier": { - "name": "difficulty_tier", - "schema": "public", - "values": [ - "easy", - "medium", - "hard", - "complex" - ] - }, - "public.entry_status": { - "name": "entry_status", - "schema": "public", - "values": [ - "pending_review", - "approved", - "rejected", - "flagged" - ] - }, - "public.poll_type": { - "name": "poll_type", - "schema": "public", - "values": [ - "ranked_choice", - "binary" - ] - }, - "public.raid_severity": { - "name": "raid_severity", - "schema": "public", - "values": [ - "NORMAL", - "SUSPICIOUS", - "CRITICAL_RAID" - ] - }, - "public.user_role": { - "name": "user_role", - "schema": "public", - "values": [ - "voter", - "contributor", - "senior_contributor", - "moderator", - "supervisor", - "admin", - "super_admin" - ] - }, - "public.round_status": { - "name": "round_status", - "schema": "public", - "values": [ - "draft", - "open", - "closed", - "finalized" - ] - }, - "public.shot_status": { - "name": "shot_status", - "schema": "public", - "values": [ - "available", - "claimed", - "submitted", - "approved" - ] - }, - "public.user_specialty": { - "name": "user_specialty", - "schema": "public", - "values": [ - "animator", - "layout_artist", - "3d_modeler", - "rigger", - "surface_texture_artist", - "lighting_artist", - "vfx_artist", - "concept_artist", - "screenwriter", - "voice_actor", - "sound_designer", - "video_editor", - "general_contributor", - "producer", - "creative_director", - "production_manager", - "technical_director", - "art_director", - "editorial_supervisor", - "layout_previs_lead", - "modelling_supervisor", - "rigging_supervisor", - "surfacing_lookdev_lead", - "animation_supervisor", - "cfx_vfx_supervisor", - "lighting_compositing_supervisor", - "sound_director", - "voter" - ] - }, - "public.submission_status": { - "name": "submission_status", - "schema": "public", - "values": [ - "pending_review", - "revision_requested", - "approved" - ] - } - }, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { - "columns": {}, - "schemas": {}, - "tables": {} - } -} \ No newline at end of file diff --git a/apps/api/drizzle/meta/0004_snapshot.json b/apps/api/drizzle/meta/0004_snapshot.json deleted file mode 100644 index 8e0d350..0000000 --- a/apps/api/drizzle/meta/0004_snapshot.json +++ /dev/null @@ -1,1660 +0,0 @@ -{ - "id": "1f0afa31-4be4-40b5-b22e-59a0e0c78bb3", - "prevId": "07661aa9-ce7b-497e-aec2-c2a0e24f93fe", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.access_tokens": { - "name": "access_tokens", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "user_id": { - "name": "user_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "token_hash": { - "name": "token_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true - }, - "last_used_at": { - "name": "last_used_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "access_tokens_user_id_idx": { - "name": "access_tokens_user_id_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "access_tokens_expires_at_idx": { - "name": "access_tokens_expires_at_idx", - "columns": [ - { - "expression": "expires_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "access_tokens_user_id_users_id_fk": { - "name": "access_tokens_user_id_users_id_fk", - "tableFrom": "access_tokens", - "tableTo": "users", - "columnsFrom": [ - "user_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "access_tokens_token_hash_unique": { - "name": "access_tokens_token_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "token_hash" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.ballots": { - "name": "ballots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "voter_id": { - "name": "voter_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank1_entry_id": { - "name": "rank1_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank2_entry_id": { - "name": "rank2_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "rank3_entry_id": { - "name": "rank3_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "ballots_round_created_at_idx": { - "name": "ballots_round_created_at_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank1_idx": { - "name": "ballots_rank1_idx", - "columns": [ - { - "expression": "rank1_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank2_idx": { - "name": "ballots_rank2_idx", - "columns": [ - { - "expression": "rank2_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank3_idx": { - "name": "ballots_rank3_idx", - "columns": [ - { - "expression": "rank3_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "ballots_round_id_voting_rounds_id_fk": { - "name": "ballots_round_id_voting_rounds_id_fk", - "tableFrom": "ballots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_voter_id_users_id_fk": { - "name": "ballots_voter_id_users_id_fk", - "tableFrom": "ballots", - "tableTo": "users", - "columnsFrom": [ - "voter_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_rank1_entry_id_entries_id_fk": { - "name": "ballots_rank1_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank1_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank2_entry_id_entries_id_fk": { - "name": "ballots_rank2_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank2_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank3_entry_id_entries_id_fk": { - "name": "ballots_rank3_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank3_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "ballots_round_voter_unique": { - "name": "ballots_round_voter_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id", - "voter_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "ballots_distinct_picks": { - "name": "ballots_distinct_picks", - "value": "\"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank2_entry_id\" AND \"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\" AND (\"ballots\".\"rank2_entry_id\" IS NULL OR \"ballots\".\"rank2_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\")" - }, - "ballots_pick_shape": { - "name": "ballots_pick_shape", - "value": "(\"ballots\".\"rank2_entry_id\" IS NULL) = (\"ballots\".\"rank3_entry_id\" IS NULL)" - } - }, - "isRLSEnabled": false - }, - "public.entries": { - "name": "entries", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(1500)", - "primaryKey": false, - "notNull": false - }, - "submitted_by": { - "name": "submitted_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "entry_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "media_key": { - "name": "media_key", - "type": "varchar(255)", - "primaryKey": false, - "notNull": false - }, - "is_quarantined": { - "name": "is_quarantined", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "entries_round_status_idx": { - "name": "entries_round_status_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "entries_round_id_voting_rounds_id_fk": { - "name": "entries_round_id_voting_rounds_id_fk", - "tableFrom": "entries", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "entries_submitted_by_users_id_fk": { - "name": "entries_submitted_by_users_id_fk", - "tableFrom": "entries", - "tableTo": "users", - "columnsFrom": [ - "submitted_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.pipeline_progress": { - "name": "pipeline_progress", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "integer", - "primaryKey": true, - "notNull": true, - "default": 1 - }, - "step_index": { - "name": "step_index", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "step_id": { - "name": "step_id", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "step_title": { - "name": "step_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "phase_number": { - "name": "phase_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "phase_title": { - "name": "phase_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "progress_percent": { - "name": "progress_percent", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "is_phase_transition": { - "name": "is_phase_transition", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "pipeline_progress_updated_by_users_id_fk": { - "name": "pipeline_progress_updated_by_users_id_fk", - "tableFrom": "pipeline_progress", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "pipeline_progress_singleton": { - "name": "pipeline_progress_singleton", - "value": "\"pipeline_progress\".\"id\" = 1" - }, - "pipeline_progress_percent_range": { - "name": "pipeline_progress_percent_range", - "value": "\"pipeline_progress\".\"progress_percent\" BETWEEN 0 AND 100" - } - }, - "isRLSEnabled": false - }, - "public.raid_telemetry": { - "name": "raid_telemetry", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "entry_id": { - "name": "entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "composite_score": { - "name": "composite_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "severity": { - "name": "severity", - "type": "raid_severity", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "skew_ratio": { - "name": "skew_ratio", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "rank_entropy": { - "name": "rank_entropy", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "velocity_z_score": { - "name": "velocity_z_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "flags": { - "name": "flags", - "type": "text[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "breakdown": { - "name": "breakdown", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "raid_telemetry_round_entry_created_idx": { - "name": "raid_telemetry_round_entry_created_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": false, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "raid_telemetry_entry_id_entries_id_fk": { - "name": "raid_telemetry_entry_id_entries_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "entries", - "columnsFrom": [ - "entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "raid_telemetry_round_id_voting_rounds_id_fk": { - "name": "raid_telemetry_round_id_voting_rounds_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.round_results": { - "name": "round_results", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "total_ballots": { - "name": "total_ballots", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "total_points": { - "name": "total_points", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "is_conserved": { - "name": "is_conserved", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "leaderboard": { - "name": "leaderboard", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "separation_results": { - "name": "separation_results", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "finalized_at": { - "name": "finalized_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "finalized_by": { - "name": "finalized_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "round_results_round_id_voting_rounds_id_fk": { - "name": "round_results_round_id_voting_rounds_id_fk", - "tableFrom": "round_results", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "round_results_finalized_by_users_id_fk": { - "name": "round_results_finalized_by_users_id_fk", - "tableFrom": "round_results", - "tableTo": "users", - "columnsFrom": [ - "finalized_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "round_results_round_id_unique": { - "name": "round_results_round_id_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shot_thread_maps": { - "name": "shot_thread_maps", - "schema": "", - "columns": { - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": true, - "notNull": true - }, - "discord_thread_id": { - "name": "discord_thread_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "shot_thread_maps_shot_id_shots_id_fk": { - "name": "shot_thread_maps_shot_id_shots_id_fk", - "tableFrom": "shot_thread_maps", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shot_thread_maps_discord_thread_id_unique": { - "name": "shot_thread_maps_discord_thread_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_thread_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shots": { - "name": "shots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "scene_number": { - "name": "scene_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "shot_code": { - "name": "shot_code", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(5000)", - "primaryKey": false, - "notNull": false - }, - "difficulty_tier": { - "name": "difficulty_tier", - "type": "difficulty_tier", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "shot_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'available'" - }, - "claimed_by": { - "name": "claimed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "claimed_at": { - "name": "claimed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "deadline_at": { - "name": "deadline_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "senior_priority_until": { - "name": "senior_priority_until", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "shots_listing_idx": { - "name": "shots_listing_idx", - "columns": [ - { - "expression": "scene_number", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "shot_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_status_idx": { - "name": "shots_status_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_deadline_idx": { - "name": "shots_deadline_idx", - "columns": [ - { - "expression": "deadline_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "where": "\"shots\".\"status\" = 'claimed'", - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_one_active_claim_per_user": { - "name": "shots_one_active_claim_per_user", - "columns": [ - { - "expression": "claimed_by", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "where": "\"shots\".\"status\" IN ('claimed', 'submitted')", - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "shots_round_id_voting_rounds_id_fk": { - "name": "shots_round_id_voting_rounds_id_fk", - "tableFrom": "shots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - }, - "shots_claimed_by_users_id_fk": { - "name": "shots_claimed_by_users_id_fk", - "tableFrom": "shots", - "tableTo": "users", - "columnsFrom": [ - "claimed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shots_shot_code_unique": { - "name": "shots_shot_code_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_code" - ] - } - }, - "policies": {}, - "checkConstraints": { - "shots_scene_number_positive": { - "name": "shots_scene_number_positive", - "value": "\"shots\".\"scene_number\" > 0" - }, - "shots_active_claim_consistency": { - "name": "shots_active_claim_consistency", - "value": "\"shots\".\"status\" NOT IN ('claimed', 'submitted') OR (\"shots\".\"claimed_by\" IS NOT NULL AND \"shots\".\"claimed_at\" IS NOT NULL)" - } - }, - "isRLSEnabled": false - }, - "public.submissions": { - "name": "submissions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "contributor_id": { - "name": "contributor_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "version": { - "name": "version", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "video_key": { - "name": "video_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": true - }, - "blend_key": { - "name": "blend_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": false - }, - "notes": { - "name": "notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "submission_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "supervisor_notes": { - "name": "supervisor_notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "reviewed_by": { - "name": "reviewed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "reviewed_at": { - "name": "reviewed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "submissions_status_created_idx": { - "name": "submissions_status_created_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "submissions_contributor_idx": { - "name": "submissions_contributor_idx", - "columns": [ - { - "expression": "contributor_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "submissions_shot_id_shots_id_fk": { - "name": "submissions_shot_id_shots_id_fk", - "tableFrom": "submissions", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_contributor_id_users_id_fk": { - "name": "submissions_contributor_id_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "contributor_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_reviewed_by_users_id_fk": { - "name": "submissions_reviewed_by_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "reviewed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "submissions_shot_version_unique": { - "name": "submissions_shot_version_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_id", - "version" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.users": { - "name": "users", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "discord_id": { - "name": "discord_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "discord_username": { - "name": "discord_username", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "discord_avatar": { - "name": "discord_avatar", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "role": { - "name": "role", - "type": "user_role", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "specialties": { - "name": "specialties", - "type": "user_specialty[]", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "is_blacklisted": { - "name": "is_blacklisted", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "blacklist_reason": { - "name": "blacklist_reason", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "blacklisted_at": { - "name": "blacklisted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "onboarded_at": { - "name": "onboarded_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "terms_version": { - "name": "terms_version", - "type": "varchar(32)", - "primaryKey": false, - "notNull": false - }, - "terms_accepted_at": { - "name": "terms_accepted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "verified_email_hash": { - "name": "verified_email_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "email_verified_at": { - "name": "email_verified_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "users_created_at_idx": { - "name": "users_created_at_idx", - "columns": [ - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "users_discord_id_unique": { - "name": "users_discord_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_id" - ] - }, - "users_verified_email_hash_unique": { - "name": "users_verified_email_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "verified_email_hash" - ] - } - }, - "policies": {}, - "checkConstraints": { - "users_specialties_limit": { - "name": "users_specialties_limit", - "value": "cardinality(\"users\".\"specialties\") <= 2" - } - }, - "isRLSEnabled": false - }, - "public.voting_rounds": { - "name": "voting_rounds", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "round_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'draft'" - }, - "poll_type": { - "name": "poll_type", - "type": "poll_type", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'ranked_choice'" - }, - "opens_at": { - "name": "opens_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "closes_at": { - "name": "closes_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_by": { - "name": "created_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "voting_rounds_status_created_at_idx": { - "name": "voting_rounds_status_created_at_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "voting_rounds_created_by_users_id_fk": { - "name": "voting_rounds_created_by_users_id_fk", - "tableFrom": "voting_rounds", - "tableTo": "users", - "columnsFrom": [ - "created_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "voting_rounds_window": { - "name": "voting_rounds_window", - "value": "\"voting_rounds\".\"opens_at\" IS NULL OR \"voting_rounds\".\"closes_at\" IS NULL OR \"voting_rounds\".\"closes_at\" > \"voting_rounds\".\"opens_at\"" - } - }, - "isRLSEnabled": false - } - }, - "enums": { - "public.difficulty_tier": { - "name": "difficulty_tier", - "schema": "public", - "values": [ - "easy", - "medium", - "hard", - "complex" - ] - }, - "public.entry_status": { - "name": "entry_status", - "schema": "public", - "values": [ - "pending_review", - "approved", - "rejected", - "flagged" - ] - }, - "public.poll_type": { - "name": "poll_type", - "schema": "public", - "values": [ - "ranked_choice", - "binary" - ] - }, - "public.raid_severity": { - "name": "raid_severity", - "schema": "public", - "values": [ - "NORMAL", - "SUSPICIOUS", - "CRITICAL_RAID" - ] - }, - "public.user_role": { - "name": "user_role", - "schema": "public", - "values": [ - "voter", - "contributor", - "senior_contributor", - "moderator", - "supervisor", - "admin", - "super_admin", - "member" - ] - }, - "public.round_status": { - "name": "round_status", - "schema": "public", - "values": [ - "draft", - "open", - "closed", - "finalized" - ] - }, - "public.shot_status": { - "name": "shot_status", - "schema": "public", - "values": [ - "available", - "claimed", - "submitted", - "approved" - ] - }, - "public.user_specialty": { - "name": "user_specialty", - "schema": "public", - "values": [ - "animator", - "layout_artist", - "3d_modeler", - "rigger", - "surface_texture_artist", - "lighting_artist", - "vfx_artist", - "concept_artist", - "screenwriter", - "voice_actor", - "sound_designer", - "video_editor", - "general_contributor", - "producer", - "creative_director", - "production_manager", - "technical_director", - "art_director", - "editorial_supervisor", - "layout_previs_lead", - "modelling_supervisor", - "rigging_supervisor", - "surfacing_lookdev_lead", - "animation_supervisor", - "cfx_vfx_supervisor", - "lighting_compositing_supervisor", - "sound_director", - "voter" - ] - }, - "public.submission_status": { - "name": "submission_status", - "schema": "public", - "values": [ - "pending_review", - "revision_requested", - "approved" - ] - } - }, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { - "columns": {}, - "schemas": {}, - "tables": {} - } -} \ No newline at end of file diff --git a/apps/api/drizzle/meta/0005_snapshot.json b/apps/api/drizzle/meta/0005_snapshot.json deleted file mode 100644 index a2c3be8..0000000 --- a/apps/api/drizzle/meta/0005_snapshot.json +++ /dev/null @@ -1,1856 +0,0 @@ -{ - "id": "c03d12bb-4fbe-40d7-9852-f01af353e0e4", - "prevId": "1f0afa31-4be4-40b5-b22e-59a0e0c78bb3", - "version": "7", - "dialect": "postgresql", - "tables": { - "public.access_tokens": { - "name": "access_tokens", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "user_id": { - "name": "user_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "token_hash": { - "name": "token_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "expires_at": { - "name": "expires_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true - }, - "last_used_at": { - "name": "last_used_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "access_tokens_user_id_idx": { - "name": "access_tokens_user_id_idx", - "columns": [ - { - "expression": "user_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "access_tokens_expires_at_idx": { - "name": "access_tokens_expires_at_idx", - "columns": [ - { - "expression": "expires_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "access_tokens_user_id_users_id_fk": { - "name": "access_tokens_user_id_users_id_fk", - "tableFrom": "access_tokens", - "tableTo": "users", - "columnsFrom": [ - "user_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "access_tokens_token_hash_unique": { - "name": "access_tokens_token_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "token_hash" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.ballots": { - "name": "ballots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "voter_id": { - "name": "voter_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank1_entry_id": { - "name": "rank1_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "rank2_entry_id": { - "name": "rank2_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "rank3_entry_id": { - "name": "rank3_entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "ballots_round_created_at_idx": { - "name": "ballots_round_created_at_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank1_idx": { - "name": "ballots_rank1_idx", - "columns": [ - { - "expression": "rank1_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank2_idx": { - "name": "ballots_rank2_idx", - "columns": [ - { - "expression": "rank2_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "ballots_rank3_idx": { - "name": "ballots_rank3_idx", - "columns": [ - { - "expression": "rank3_entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "ballots_round_id_voting_rounds_id_fk": { - "name": "ballots_round_id_voting_rounds_id_fk", - "tableFrom": "ballots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_voter_id_users_id_fk": { - "name": "ballots_voter_id_users_id_fk", - "tableFrom": "ballots", - "tableTo": "users", - "columnsFrom": [ - "voter_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "ballots_rank1_entry_id_entries_id_fk": { - "name": "ballots_rank1_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank1_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank2_entry_id_entries_id_fk": { - "name": "ballots_rank2_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank2_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - }, - "ballots_rank3_entry_id_entries_id_fk": { - "name": "ballots_rank3_entry_id_entries_id_fk", - "tableFrom": "ballots", - "tableTo": "entries", - "columnsFrom": [ - "rank3_entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "ballots_round_voter_unique": { - "name": "ballots_round_voter_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id", - "voter_id" - ] - } - }, - "policies": {}, - "checkConstraints": { - "ballots_distinct_picks": { - "name": "ballots_distinct_picks", - "value": "\"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank2_entry_id\" AND \"ballots\".\"rank1_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\" AND (\"ballots\".\"rank2_entry_id\" IS NULL OR \"ballots\".\"rank2_entry_id\" IS DISTINCT FROM \"ballots\".\"rank3_entry_id\")" - }, - "ballots_pick_shape": { - "name": "ballots_pick_shape", - "value": "(\"ballots\".\"rank2_entry_id\" IS NULL) = (\"ballots\".\"rank3_entry_id\" IS NULL)" - } - }, - "isRLSEnabled": false - }, - "public.document_revisions": { - "name": "document_revisions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "slug": { - "name": "slug", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "revision": { - "name": "revision", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(200)", - "primaryKey": false, - "notNull": true - }, - "sections": { - "name": "sections", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "requires_reacceptance": { - "name": "requires_reacceptance", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "note": { - "name": "note", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "author_id": { - "name": "author_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "document_revisions_slug_revision": { - "name": "document_revisions_slug_revision", - "columns": [ - { - "expression": "slug", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "revision", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "document_revisions_slug_documents_slug_fk": { - "name": "document_revisions_slug_documents_slug_fk", - "tableFrom": "document_revisions", - "tableTo": "documents", - "columnsFrom": [ - "slug" - ], - "columnsTo": [ - "slug" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "document_revisions_author_id_users_id_fk": { - "name": "document_revisions_author_id_users_id_fk", - "tableFrom": "document_revisions", - "tableTo": "users", - "columnsFrom": [ - "author_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.documents": { - "name": "documents", - "schema": "", - "columns": { - "slug": { - "name": "slug", - "type": "varchar(32)", - "primaryKey": true, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(200)", - "primaryKey": false, - "notNull": true - }, - "sections": { - "name": "sections", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "revision": { - "name": "revision", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "acceptance_version": { - "name": "acceptance_version", - "type": "varchar(32)", - "primaryKey": false, - "notNull": false - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "documents_updated_by_users_id_fk": { - "name": "documents_updated_by_users_id_fk", - "tableFrom": "documents", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.entries": { - "name": "entries", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(1500)", - "primaryKey": false, - "notNull": false - }, - "submitted_by": { - "name": "submitted_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "entry_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "media_key": { - "name": "media_key", - "type": "varchar(255)", - "primaryKey": false, - "notNull": false - }, - "is_quarantined": { - "name": "is_quarantined", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "entries_round_status_idx": { - "name": "entries_round_status_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "entries_round_id_voting_rounds_id_fk": { - "name": "entries_round_id_voting_rounds_id_fk", - "tableFrom": "entries", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "entries_submitted_by_users_id_fk": { - "name": "entries_submitted_by_users_id_fk", - "tableFrom": "entries", - "tableTo": "users", - "columnsFrom": [ - "submitted_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.pipeline_progress": { - "name": "pipeline_progress", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "integer", - "primaryKey": true, - "notNull": true, - "default": 1 - }, - "step_index": { - "name": "step_index", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "step_id": { - "name": "step_id", - "type": "varchar(32)", - "primaryKey": false, - "notNull": true - }, - "step_title": { - "name": "step_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "phase_number": { - "name": "phase_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "phase_title": { - "name": "phase_title", - "type": "varchar(128)", - "primaryKey": false, - "notNull": true - }, - "progress_percent": { - "name": "progress_percent", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "is_phase_transition": { - "name": "is_phase_transition", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "updated_by": { - "name": "updated_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "pipeline_progress_updated_by_users_id_fk": { - "name": "pipeline_progress_updated_by_users_id_fk", - "tableFrom": "pipeline_progress", - "tableTo": "users", - "columnsFrom": [ - "updated_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "pipeline_progress_singleton": { - "name": "pipeline_progress_singleton", - "value": "\"pipeline_progress\".\"id\" = 1" - }, - "pipeline_progress_percent_range": { - "name": "pipeline_progress_percent_range", - "value": "\"pipeline_progress\".\"progress_percent\" BETWEEN 0 AND 100" - } - }, - "isRLSEnabled": false - }, - "public.raid_telemetry": { - "name": "raid_telemetry", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "entry_id": { - "name": "entry_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "composite_score": { - "name": "composite_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "severity": { - "name": "severity", - "type": "raid_severity", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "skew_ratio": { - "name": "skew_ratio", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "rank_entropy": { - "name": "rank_entropy", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "velocity_z_score": { - "name": "velocity_z_score", - "type": "double precision", - "primaryKey": false, - "notNull": true - }, - "flags": { - "name": "flags", - "type": "text[]", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "breakdown": { - "name": "breakdown", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "raid_telemetry_round_entry_created_idx": { - "name": "raid_telemetry_round_entry_created_idx", - "columns": [ - { - "expression": "round_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "entry_id", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": false, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "raid_telemetry_entry_id_entries_id_fk": { - "name": "raid_telemetry_entry_id_entries_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "entries", - "columnsFrom": [ - "entry_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "raid_telemetry_round_id_voting_rounds_id_fk": { - "name": "raid_telemetry_round_id_voting_rounds_id_fk", - "tableFrom": "raid_telemetry", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.round_results": { - "name": "round_results", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "total_ballots": { - "name": "total_ballots", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "total_points": { - "name": "total_points", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "is_conserved": { - "name": "is_conserved", - "type": "boolean", - "primaryKey": false, - "notNull": true - }, - "leaderboard": { - "name": "leaderboard", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "separation_results": { - "name": "separation_results", - "type": "jsonb", - "primaryKey": false, - "notNull": true - }, - "finalized_at": { - "name": "finalized_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "finalized_by": { - "name": "finalized_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - } - }, - "indexes": {}, - "foreignKeys": { - "round_results_round_id_voting_rounds_id_fk": { - "name": "round_results_round_id_voting_rounds_id_fk", - "tableFrom": "round_results", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "round_results_finalized_by_users_id_fk": { - "name": "round_results_finalized_by_users_id_fk", - "tableFrom": "round_results", - "tableTo": "users", - "columnsFrom": [ - "finalized_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "round_results_round_id_unique": { - "name": "round_results_round_id_unique", - "nullsNotDistinct": false, - "columns": [ - "round_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shot_thread_maps": { - "name": "shot_thread_maps", - "schema": "", - "columns": { - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": true, - "notNull": true - }, - "discord_thread_id": { - "name": "discord_thread_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": {}, - "foreignKeys": { - "shot_thread_maps_shot_id_shots_id_fk": { - "name": "shot_thread_maps_shot_id_shots_id_fk", - "tableFrom": "shot_thread_maps", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shot_thread_maps_discord_thread_id_unique": { - "name": "shot_thread_maps_discord_thread_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_thread_id" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.shots": { - "name": "shots", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "round_id": { - "name": "round_id", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "scene_number": { - "name": "scene_number", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "shot_code": { - "name": "shot_code", - "type": "varchar(50)", - "primaryKey": false, - "notNull": true - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "description": { - "name": "description", - "type": "varchar(5000)", - "primaryKey": false, - "notNull": false - }, - "difficulty_tier": { - "name": "difficulty_tier", - "type": "difficulty_tier", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "shot_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'available'" - }, - "claimed_by": { - "name": "claimed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "claimed_at": { - "name": "claimed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "deadline_at": { - "name": "deadline_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "senior_priority_until": { - "name": "senior_priority_until", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "shots_listing_idx": { - "name": "shots_listing_idx", - "columns": [ - { - "expression": "scene_number", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "shot_code", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_status_idx": { - "name": "shots_status_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_deadline_idx": { - "name": "shots_deadline_idx", - "columns": [ - { - "expression": "deadline_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "where": "\"shots\".\"status\" = 'claimed'", - "concurrently": false, - "method": "btree", - "with": {} - }, - "shots_one_active_claim_per_user": { - "name": "shots_one_active_claim_per_user", - "columns": [ - { - "expression": "claimed_by", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": true, - "where": "\"shots\".\"status\" IN ('claimed', 'submitted')", - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "shots_round_id_voting_rounds_id_fk": { - "name": "shots_round_id_voting_rounds_id_fk", - "tableFrom": "shots", - "tableTo": "voting_rounds", - "columnsFrom": [ - "round_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - }, - "shots_claimed_by_users_id_fk": { - "name": "shots_claimed_by_users_id_fk", - "tableFrom": "shots", - "tableTo": "users", - "columnsFrom": [ - "claimed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "shots_shot_code_unique": { - "name": "shots_shot_code_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_code" - ] - } - }, - "policies": {}, - "checkConstraints": { - "shots_scene_number_positive": { - "name": "shots_scene_number_positive", - "value": "\"shots\".\"scene_number\" > 0" - }, - "shots_active_claim_consistency": { - "name": "shots_active_claim_consistency", - "value": "\"shots\".\"status\" NOT IN ('claimed', 'submitted') OR (\"shots\".\"claimed_by\" IS NOT NULL AND \"shots\".\"claimed_at\" IS NOT NULL)" - } - }, - "isRLSEnabled": false - }, - "public.submissions": { - "name": "submissions", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "shot_id": { - "name": "shot_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "contributor_id": { - "name": "contributor_id", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "version": { - "name": "version", - "type": "integer", - "primaryKey": false, - "notNull": true - }, - "video_key": { - "name": "video_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": true - }, - "blend_key": { - "name": "blend_key", - "type": "varchar(512)", - "primaryKey": false, - "notNull": false - }, - "notes": { - "name": "notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "status": { - "name": "status", - "type": "submission_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'pending_review'" - }, - "supervisor_notes": { - "name": "supervisor_notes", - "type": "varchar(2000)", - "primaryKey": false, - "notNull": false - }, - "reviewed_by": { - "name": "reviewed_by", - "type": "uuid", - "primaryKey": false, - "notNull": false - }, - "reviewed_at": { - "name": "reviewed_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "submissions_status_created_idx": { - "name": "submissions_status_created_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - }, - "submissions_contributor_idx": { - "name": "submissions_contributor_idx", - "columns": [ - { - "expression": "contributor_id", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "submissions_shot_id_shots_id_fk": { - "name": "submissions_shot_id_shots_id_fk", - "tableFrom": "submissions", - "tableTo": "shots", - "columnsFrom": [ - "shot_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_contributor_id_users_id_fk": { - "name": "submissions_contributor_id_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "contributor_id" - ], - "columnsTo": [ - "id" - ], - "onDelete": "cascade", - "onUpdate": "no action" - }, - "submissions_reviewed_by_users_id_fk": { - "name": "submissions_reviewed_by_users_id_fk", - "tableFrom": "submissions", - "tableTo": "users", - "columnsFrom": [ - "reviewed_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "set null", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "submissions_shot_version_unique": { - "name": "submissions_shot_version_unique", - "nullsNotDistinct": false, - "columns": [ - "shot_id", - "version" - ] - } - }, - "policies": {}, - "checkConstraints": {}, - "isRLSEnabled": false - }, - "public.users": { - "name": "users", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "discord_id": { - "name": "discord_id", - "type": "varchar(20)", - "primaryKey": false, - "notNull": true - }, - "discord_username": { - "name": "discord_username", - "type": "varchar(64)", - "primaryKey": false, - "notNull": true - }, - "discord_avatar": { - "name": "discord_avatar", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "role": { - "name": "role", - "type": "user_role", - "typeSchema": "public", - "primaryKey": false, - "notNull": true - }, - "specialties": { - "name": "specialties", - "type": "user_specialty[]", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'{}'" - }, - "is_blacklisted": { - "name": "is_blacklisted", - "type": "boolean", - "primaryKey": false, - "notNull": true, - "default": false - }, - "blacklist_reason": { - "name": "blacklist_reason", - "type": "varchar(500)", - "primaryKey": false, - "notNull": false - }, - "blacklisted_at": { - "name": "blacklisted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "onboarded_at": { - "name": "onboarded_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "terms_version": { - "name": "terms_version", - "type": "varchar(32)", - "primaryKey": false, - "notNull": false - }, - "terms_accepted_at": { - "name": "terms_accepted_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "verified_email_hash": { - "name": "verified_email_hash", - "type": "varchar(64)", - "primaryKey": false, - "notNull": false - }, - "email_verified_at": { - "name": "email_verified_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "users_created_at_idx": { - "name": "users_created_at_idx", - "columns": [ - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": {}, - "compositePrimaryKeys": {}, - "uniqueConstraints": { - "users_discord_id_unique": { - "name": "users_discord_id_unique", - "nullsNotDistinct": false, - "columns": [ - "discord_id" - ] - }, - "users_verified_email_hash_unique": { - "name": "users_verified_email_hash_unique", - "nullsNotDistinct": false, - "columns": [ - "verified_email_hash" - ] - } - }, - "policies": {}, - "checkConstraints": { - "users_specialties_limit": { - "name": "users_specialties_limit", - "value": "cardinality(\"users\".\"specialties\") <= 2" - } - }, - "isRLSEnabled": false - }, - "public.voting_rounds": { - "name": "voting_rounds", - "schema": "", - "columns": { - "id": { - "name": "id", - "type": "uuid", - "primaryKey": true, - "notNull": true, - "default": "gen_random_uuid()" - }, - "title": { - "name": "title", - "type": "varchar(255)", - "primaryKey": false, - "notNull": true - }, - "status": { - "name": "status", - "type": "round_status", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'draft'" - }, - "poll_type": { - "name": "poll_type", - "type": "poll_type", - "typeSchema": "public", - "primaryKey": false, - "notNull": true, - "default": "'ranked_choice'" - }, - "opens_at": { - "name": "opens_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "closes_at": { - "name": "closes_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": false - }, - "created_by": { - "name": "created_by", - "type": "uuid", - "primaryKey": false, - "notNull": true - }, - "created_at": { - "name": "created_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - }, - "updated_at": { - "name": "updated_at", - "type": "timestamp with time zone", - "primaryKey": false, - "notNull": true, - "default": "now()" - } - }, - "indexes": { - "voting_rounds_status_created_at_idx": { - "name": "voting_rounds_status_created_at_idx", - "columns": [ - { - "expression": "status", - "isExpression": false, - "asc": true, - "nulls": "last" - }, - { - "expression": "created_at", - "isExpression": false, - "asc": true, - "nulls": "last" - } - ], - "isUnique": false, - "concurrently": false, - "method": "btree", - "with": {} - } - }, - "foreignKeys": { - "voting_rounds_created_by_users_id_fk": { - "name": "voting_rounds_created_by_users_id_fk", - "tableFrom": "voting_rounds", - "tableTo": "users", - "columnsFrom": [ - "created_by" - ], - "columnsTo": [ - "id" - ], - "onDelete": "no action", - "onUpdate": "no action" - } - }, - "compositePrimaryKeys": {}, - "uniqueConstraints": {}, - "policies": {}, - "checkConstraints": { - "voting_rounds_window": { - "name": "voting_rounds_window", - "value": "\"voting_rounds\".\"opens_at\" IS NULL OR \"voting_rounds\".\"closes_at\" IS NULL OR \"voting_rounds\".\"closes_at\" > \"voting_rounds\".\"opens_at\"" - } - }, - "isRLSEnabled": false - } - }, - "enums": { - "public.difficulty_tier": { - "name": "difficulty_tier", - "schema": "public", - "values": [ - "easy", - "medium", - "hard", - "complex" - ] - }, - "public.entry_status": { - "name": "entry_status", - "schema": "public", - "values": [ - "pending_review", - "approved", - "rejected", - "flagged" - ] - }, - "public.poll_type": { - "name": "poll_type", - "schema": "public", - "values": [ - "ranked_choice", - "binary" - ] - }, - "public.raid_severity": { - "name": "raid_severity", - "schema": "public", - "values": [ - "NORMAL", - "SUSPICIOUS", - "CRITICAL_RAID" - ] - }, - "public.user_role": { - "name": "user_role", - "schema": "public", - "values": [ - "voter", - "contributor", - "senior_contributor", - "moderator", - "supervisor", - "admin", - "super_admin", - "member" - ] - }, - "public.round_status": { - "name": "round_status", - "schema": "public", - "values": [ - "draft", - "open", - "closed", - "finalized" - ] - }, - "public.shot_status": { - "name": "shot_status", - "schema": "public", - "values": [ - "available", - "claimed", - "submitted", - "approved" - ] - }, - "public.user_specialty": { - "name": "user_specialty", - "schema": "public", - "values": [ - "animator", - "layout_artist", - "3d_modeler", - "rigger", - "surface_texture_artist", - "lighting_artist", - "vfx_artist", - "concept_artist", - "screenwriter", - "voice_actor", - "sound_designer", - "video_editor", - "general_contributor", - "producer", - "creative_director", - "production_manager", - "technical_director", - "art_director", - "editorial_supervisor", - "layout_previs_lead", - "modelling_supervisor", - "rigging_supervisor", - "surfacing_lookdev_lead", - "animation_supervisor", - "cfx_vfx_supervisor", - "lighting_compositing_supervisor", - "sound_director", - "voter" - ] - }, - "public.submission_status": { - "name": "submission_status", - "schema": "public", - "values": [ - "pending_review", - "revision_requested", - "approved" - ] - } - }, - "schemas": {}, - "sequences": {}, - "roles": {}, - "policies": {}, - "views": {}, - "_meta": { - "columns": {}, - "schemas": {}, - "tables": {} - } -} \ No newline at end of file diff --git a/apps/api/drizzle/meta/_journal.json b/apps/api/drizzle/meta/_journal.json index 5c4f8d1..ed9cd0c 100644 --- a/apps/api/drizzle/meta/_journal.json +++ b/apps/api/drizzle/meta/_journal.json @@ -8,76 +8,6 @@ "when": 1790449811057, "tag": "0000_initial_schema", "breakpoints": true - }, - { - "idx": 1, - "version": "7", - "when": 1790511795849, - "tag": "0001_pipeline_progress_and_specialties", - "breakpoints": true - }, - { - "idx": 2, - "version": "7", - "when": 1790531591750, - "tag": "0002_super_admin_role", - "breakpoints": true - }, - { - "idx": 3, - "version": "7", - "when": 1790531953158, - "tag": "0003_user_onboarding", - "breakpoints": true - }, - { - "idx": 4, - "version": "7", - "when": 1790533126109, - "tag": "0004_member_terms_verification", - "breakpoints": true - }, - { - "idx": 5, - "version": "7", - "when": 1790533730975, - "tag": "0005_documents", - "breakpoints": true - }, - { - "idx": 6, - "version": "7", - "when": 1790546500000, - "tag": "0006_shot_image_keys", - "breakpoints": true - }, - { - "idx": 7, - "version": "7", - "when": 1790680000000, - "tag": "0007_ai_flags", - "breakpoints": true - }, - { - "idx": 8, - "version": "7", - "when": 1790780000000, - "tag": "0008_round_voting_status", - "breakpoints": true - }, - { - "idx": 9, - "version": "7", - "when": 1790780000001, - "tag": "0009_migrate_closed_rounds", - "breakpoints": true - }, - { - "idx": 10, - "version": "7", - "when": 1790780000002, - "tag": "0010_add_media_team_specialty", - "breakpoints": true } ] } \ No newline at end of file diff --git a/apps/api/package.json b/apps/api/package.json index 6ae099e..c601b34 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -13,15 +13,14 @@ "token:issue": "tsx --env-file=../../.env src/Scripts/IssueToken.ts" }, "dependencies": { - "@aws-sdk/client-s3": "^3.1144.0", - "@aws-sdk/s3-presigned-post": "^3.1144.0", - "@aws-sdk/s3-request-presigner": "^3.1144.0", + "@aws-sdk/client-s3": "^3.1141.0", + "@aws-sdk/s3-presigned-post": "^3.1141.0", + "@aws-sdk/s3-request-presigner": "^3.1141.0", "@fastify/cookie": "^11.1.2", "@fastify/cors": "^11.3.0", "@fastify/helmet": "^13.1.1", "@fastify/rate-limit": "^11.2.0", - "@fastify/swagger": "^9.9.1", - "@platform/contracts": "2.0.0", + "@fastify/swagger": "^9.9.0", "@platform/scoring": "2.0.0", "drizzle-orm": "^0.45.3", "fastify": "^5.12.5", @@ -30,12 +29,11 @@ "ioredis": "^6.0.0", "pino": "^10.3.1", "postgres": "^3.4.9", - "sanitize-html": "^2.18.0", - "zod": "^4.6.5" + "zod": "^4.6.5", + "@platform/contracts": "2.0.0" }, "devDependencies": { "@electric-sql/pglite": "^0.5.8", - "@types/sanitize-html": "^2.16.2", "drizzle-kit": "^0.31.11", "pino-pretty": "^13.1.3", "tsx": "^4.23.15" diff --git a/apps/api/src/App.ts b/apps/api/src/App.ts index e3b3061..06b42f3 100644 --- a/apps/api/src/App.ts +++ b/apps/api/src/App.ts @@ -16,7 +16,6 @@ import { import { actingUserHeader } from "@platform/contracts"; import { ApplicationError, BadRequestError, ErrorCode, ForbiddenError, UnauthorizedError } from "./Common/Errors/ApplicationError.js"; import type { Principal } from "./Common/Security/Principal.js"; -import { requireRole } from "./Common/Security/Authorization.js"; import type { TokenService } from "./Modules/Auth/TokenService.js"; import { registerErrorHandling } from "./Common/Http/ErrorHandling.js"; import type { ServiceContainer } from "./Composition/ServiceContainer.js"; @@ -26,14 +25,11 @@ import { ballotsRoutes } from "./Modules/Ballots/BallotsRoutes.js"; import { entriesRoutes } from "./Modules/Entries/EntriesRoutes.js"; import { healthRoutes } from "./Modules/Health/HealthRoutes.js"; import { notificationRoutes } from "./Modules/Notifications/NotificationRoutes.js"; -import { pipelineRoutes } from "./Modules/Pipeline/PipelineRoutes.js"; import { roundsRoutes } from "./Modules/Rounds/RoundsRoutes.js"; import { shotsRoutes } from "./Modules/Shots/ShotsRoutes.js"; import { telemetryRoutes } from "./Modules/Telemetry/TelemetryRoutes.js"; import { threadMapsRoutes } from "./Modules/ThreadMaps/ThreadMapsRoutes.js"; import { uploadsRoutes } from "./Modules/Uploads/UploadsRoutes.js"; -import { documentsRoutes } from "./Modules/Documents/DocumentsRoutes.js"; -import { verificationRoutes } from "./Modules/Verification/VerificationRoutes.js"; import { usersRoutes } from "./Modules/Users/UsersRoutes.js"; export const apiPrefix = "/api/v1"; @@ -45,14 +41,12 @@ const bearerPattern = /^Bearer ([A-Za-z0-9._~+/=-]{1,256})$/iu; const perMinuteLimits: Readonly> = { anonymous: 60, - [Role.Member]: 120, [Role.Voter]: 120, [Role.Contributor]: 300, [Role.SeniorContributor]: 300, [Role.Moderator]: 500, [Role.Supervisor]: 500, [Role.Admin]: 1000, - [Role.SuperAdmin]: 1000, service: 3000 }; @@ -192,10 +186,7 @@ export async function buildApplication(services: ServiceContainer, logger: Fasti await application.register( async (api) => { - api.get("/openapi.json", { schema: { hide: true }, preHandler: requireRole(Role.Moderator) }, async () => - application.swagger() - ); - await api.register(healthRoutes, { services }); + api.get("/openapi.json", { schema: { hide: true } }, async () => application.swagger()); await api.register(authRoutes, { services }); await api.register(usersRoutes, { services }); await api.register(roundsRoutes, { services }); @@ -205,10 +196,7 @@ export async function buildApplication(services: ServiceContainer, logger: Fasti await api.register(shotsRoutes, { services }); await api.register(uploadsRoutes, { services }); await api.register(threadMapsRoutes, { services }); - await api.register(pipelineRoutes, { services }); await api.register(notificationRoutes, { services }); - await api.register(verificationRoutes, { services }); - await api.register(documentsRoutes, { services }); }, { prefix: apiPrefix } ); diff --git a/apps/api/src/Common/Errors/ApplicationError.ts b/apps/api/src/Common/Errors/ApplicationError.ts index dc211d1..9555063 100644 --- a/apps/api/src/Common/Errors/ApplicationError.ts +++ b/apps/api/src/Common/Errors/ApplicationError.ts @@ -20,9 +20,6 @@ export enum ErrorCode { SubmissionNotPending = "SUBMISSION_NOT_PENDING", UploadMissing = "UPLOAD_MISSING", InvalidLoginCode = "INVALID_LOGIN_CODE", - TermsNotAccepted = "TERMS_NOT_ACCEPTED", - VerificationRequired = "VERIFICATION_REQUIRED", - VerificationFailed = "VERIFICATION_FAILED", AccountNotLinked = "ACCOUNT_NOT_LINKED", PayloadTooLarge = "PAYLOAD_TOO_LARGE", UnsupportedMediaType = "UNSUPPORTED_MEDIA_TYPE", diff --git a/apps/api/src/Common/Security/Authorization.ts b/apps/api/src/Common/Security/Authorization.ts index b960c06..aa39010 100644 --- a/apps/api/src/Common/Security/Authorization.ts +++ b/apps/api/src/Common/Security/Authorization.ts @@ -1,7 +1,6 @@ import type { FastifyReply, FastifyRequest, preHandlerAsyncHookHandler } from "fastify"; import { ErrorCode, ForbiddenError, UnauthorizedError } from "../Errors/ApplicationError.js"; import { hasAtLeast, type Role } from "../../Domain/Roles.js"; -import type { LegalAcceptance } from "../../Modules/Documents/DocumentsService.js"; import { actorFor, userActorFor, @@ -33,30 +32,6 @@ export function requireRole(role: Role): preHandlerAsyncHookHandler { }; } -export function requireAcceptedTerms(legal: LegalAcceptance): preHandlerAsyncHookHandler { - return async function (request: FastifyRequest): Promise { - const { user } = userPrincipalOf(request); - if (user.termsVersion !== (await legal.currentAcceptanceVersion())) { - throw new ForbiddenError("Accept the current terms of service first.", ErrorCode.TermsNotAccepted); - } - }; -} - -export function requireParticipant(role: Role, legal: LegalAcceptance): preHandlerAsyncHookHandler { - return async function (request: FastifyRequest): Promise { - const { user } = userPrincipalOf(request); - if (user.termsVersion !== (await legal.currentAcceptanceVersion())) { - throw new ForbiddenError("Accept the current terms of service first.", ErrorCode.TermsNotAccepted); - } - if (!user.isVerified) { - throw new ForbiddenError("Verify your email to take part.", ErrorCode.VerificationRequired); - } - if (!hasAtLeast(user.role, role)) { - throw new ForbiddenError(`This action requires the ${role} role or higher.`, ErrorCode.InsufficientRole); - } - }; -} - export function requireRoleOrService(role: Role): preHandlerAsyncHookHandler { const userCheck = requireRole(role); return async function (this: unknown, request: FastifyRequest, reply: FastifyReply): Promise { diff --git a/apps/api/src/Common/Security/Principal.ts b/apps/api/src/Common/Security/Principal.ts index 6ef0b53..66586c5 100644 --- a/apps/api/src/Common/Security/Principal.ts +++ b/apps/api/src/Common/Security/Principal.ts @@ -6,8 +6,6 @@ export interface AuthenticatedUser { readonly discordUsername: string; readonly role: Role; readonly isBlacklisted: boolean; - readonly termsVersion: string | null; - readonly isVerified: boolean; } export interface UserPrincipal { diff --git a/apps/api/src/Composition/ProductionInfrastructure.ts b/apps/api/src/Composition/ProductionInfrastructure.ts index 81e979b..738b16c 100644 --- a/apps/api/src/Composition/ProductionInfrastructure.ts +++ b/apps/api/src/Composition/ProductionInfrastructure.ts @@ -1,11 +1,6 @@ import type { FastifyBaseLogger } from "fastify"; import { Redis, type RedisOptions } from "ioredis"; import type { ApplicationConfiguration } from "../Configuration/ApplicationConfiguration.js"; -import { DisabledCaptchaVerifier, TurnstileVerifier } from "../Infrastructure/Captcha/TurnstileVerifier.js"; -import type { EmailSender } from "../Infrastructure/Email/EmailSender.js"; -import { LogEmailSender } from "../Infrastructure/Email/LogEmailSender.js"; -import { DnsMailDomainChecker } from "../Infrastructure/Email/MailDomainChecker.js"; -import { ResendEmailSender } from "../Infrastructure/Email/ResendEmailSender.js"; import { RedisKeyValueStore } from "../Infrastructure/Cache/RedisKeyValueStore.js"; import { createPostgresConnection } from "../Infrastructure/Database/Database.js"; import { HttpDiscordOAuthClient } from "../Infrastructure/Discord/DiscordOAuthClient.js"; @@ -16,11 +11,6 @@ import { RedisNotificationLog } from "../Infrastructure/Notifications/RedisNotif import { S3ObjectStorage } from "../Infrastructure/Storage/S3ObjectStorage.js"; import type { Infrastructure } from "./ServiceContainer.js"; -function createEmailSender(configuration: ApplicationConfiguration, logger: FastifyBaseLogger): EmailSender { - const resend = new ResendEmailSender(configuration.email); - return resend.isEnabled() || configuration.environment === "production" ? resend : new LogEmailSender(logger); -} - export function createProductionInfrastructure(configuration: ApplicationConfiguration, logger: FastifyBaseLogger): Infrastructure { const connection = createPostgresConnection(configuration.database); const redisOptions: RedisOptions = { @@ -62,16 +52,6 @@ export function createProductionInfrastructure(configuration: ApplicationConfigu notifier: new StreamNotifier(notificationLog, logger), notificationLog, rateLimitRedis: redis, - emailSender: createEmailSender(configuration, logger), - captchaVerifier: - configuration.verification.turnstileSecretKey === undefined - ? new DisabledCaptchaVerifier() - : new TurnstileVerifier( - configuration.verification.turnstileSecretKey, - configuration.security.corsOrigins.map((origin) => new URL(origin).hostname), - logger - ), - mailDomainChecker: new DnsMailDomainChecker(), dispose: async (): Promise => { await eventBus.close(); await redis.quit(); diff --git a/apps/api/src/Composition/ServiceContainer.ts b/apps/api/src/Composition/ServiceContainer.ts index e29e8b5..7a88ff4 100644 --- a/apps/api/src/Composition/ServiceContainer.ts +++ b/apps/api/src/Composition/ServiceContainer.ts @@ -2,9 +2,6 @@ import type { FastifyBaseLogger } from "fastify"; import type { Redis } from "ioredis"; import type { ApplicationConfiguration } from "../Configuration/ApplicationConfiguration.js"; import type { KeyValueStore } from "../Infrastructure/Cache/KeyValueStore.js"; -import type { CaptchaVerifier } from "../Infrastructure/Captcha/CaptchaVerifier.js"; -import type { EmailSender } from "../Infrastructure/Email/EmailSender.js"; -import type { MailDomainChecker } from "../Infrastructure/Email/MailDomainChecker.js"; import type { Database } from "../Infrastructure/Database/Database.js"; import type { DiscordOAuthClient } from "../Infrastructure/Discord/DiscordOAuthClient.js"; import type { PresenceProvider } from "../Infrastructure/Discord/PresenceProvider.js"; @@ -22,8 +19,6 @@ import { RoundsService } from "../Modules/Rounds/RoundsService.js"; import { ReviewsService } from "../Modules/Shots/ReviewsService.js"; import { ShotsService } from "../Modules/Shots/ShotsService.js"; import { RaidMonitor, type RaidMonitorOptions } from "../Modules/Telemetry/RaidMonitor.js"; -import { DocumentsService } from "../Modules/Documents/DocumentsService.js"; -import { VerificationService } from "../Modules/Verification/VerificationService.js"; import { UsersService } from "../Modules/Users/UsersService.js"; export interface Infrastructure { @@ -37,9 +32,6 @@ export interface Infrastructure { readonly notifier: Notifier; readonly notificationLog: NotificationLog; readonly rateLimitRedis: Redis | undefined; - readonly emailSender: EmailSender; - readonly captchaVerifier: CaptchaVerifier; - readonly mailDomainChecker: MailDomainChecker; dispose(): Promise; } @@ -59,8 +51,6 @@ export interface ServiceContainer extends Infrastructure { readonly raidMonitor: RaidMonitor; readonly shotsService: ShotsService; readonly reviewsService: ReviewsService; - readonly verificationService: VerificationService; - readonly documentsService: DocumentsService; } export function createServiceContainer( @@ -72,7 +62,6 @@ export function createServiceContainer( const { database, keyValueStore, eventBus, notifier, objectStorage } = infrastructure; const leaderboardCache = new LeaderboardCache(keyValueStore); const tokenService = new TokenService(database, configuration.security, logger); - const documentsService = new DocumentsService(database, notifier); const raidMonitor = new RaidMonitor(database, keyValueStore, eventBus, notifier, leaderboardCache, logger, options.raidMonitor); return { @@ -92,24 +81,13 @@ export function createServiceContainer( configuration.roleAssignments, logger ), - usersService: new UsersService(database, notifier, leaderboardCache, documentsService), + usersService: new UsersService(database, notifier, leaderboardCache), roundsService: new RoundsService(database, notifier, leaderboardCache), - leaderboardService: new LeaderboardService(database, leaderboardCache, eventBus, notifier, objectStorage), + leaderboardService: new LeaderboardService(database, leaderboardCache, eventBus, notifier), entriesService: new EntriesService(database, notifier, objectStorage, configuration.storage, leaderboardCache), - ballotsService: new BallotsService(database, keyValueStore, eventBus, notifier, raidMonitor), + ballotsService: new BallotsService(database, keyValueStore, eventBus, notifier, raidMonitor, configuration.security.appKey), raidMonitor, shotsService: new ShotsService(database, notifier, objectStorage, configuration.storage), - reviewsService: new ReviewsService(database, notifier, objectStorage), - documentsService, - verificationService: new VerificationService( - database, - keyValueStore, - infrastructure.emailSender, - infrastructure.captchaVerifier, - infrastructure.mailDomainChecker, - configuration.security.appKey, - logger, - notifier - ) + reviewsService: new ReviewsService(database, notifier, objectStorage) }; } diff --git a/apps/api/src/Configuration/ApplicationConfiguration.ts b/apps/api/src/Configuration/ApplicationConfiguration.ts index fc33ac8..7dc435d 100644 --- a/apps/api/src/Configuration/ApplicationConfiguration.ts +++ b/apps/api/src/Configuration/ApplicationConfiguration.ts @@ -44,7 +44,6 @@ export interface DiscordConfiguration { } export interface RoleAssignmentConfiguration { - readonly superAdmins: readonly string[]; readonly admins: readonly string[]; readonly supervisors: readonly string[]; readonly moderators: readonly string[]; @@ -63,15 +62,6 @@ export interface StorageConfiguration { readonly deliverableMaxBytes: number; } -export interface EmailConfiguration { - readonly resendApiKey: string | undefined; - readonly from: string | undefined; -} - -export interface VerificationConfiguration { - readonly turnstileSecretKey: string | undefined; -} - export interface ApplicationConfiguration { readonly environment: RuntimeEnvironment; readonly server: ServerConfiguration; @@ -81,8 +71,6 @@ export interface ApplicationConfiguration { readonly discord: DiscordConfiguration; readonly roleAssignments: RoleAssignmentConfiguration; readonly storage: StorageConfiguration; - readonly email: EmailConfiguration; - readonly verification: VerificationConfiguration; } export function createConfiguration(environment: Environment): ApplicationConfiguration { @@ -125,7 +113,6 @@ export function createConfiguration(environment: Environment): ApplicationConfig redirectUri: environment.DISCORD_REDIRECT_URI }, roleAssignments: { - superAdmins: environment.SUPER_ADMIN_DISCORD_IDS, admins: environment.ADMIN_DISCORD_IDS, supervisors: environment.SUPERVISOR_DISCORD_IDS, moderators: environment.MODERATOR_DISCORD_IDS, @@ -141,13 +128,6 @@ export function createConfiguration(environment: Environment): ApplicationConfig mediaPublicUrl: environment.S3_MEDIA_PUBLIC_URL, mediaMaxBytes: environment.MEDIA_MAX_BYTES, deliverableMaxBytes: environment.DELIVERABLE_MAX_BYTES - }, - email: { - resendApiKey: environment.RESEND_API_KEY, - from: environment.EMAIL_FROM - }, - verification: { - turnstileSecretKey: environment.TURNSTILE_SECRET_KEY } }; } diff --git a/apps/api/src/Configuration/Environment.ts b/apps/api/src/Configuration/Environment.ts index 886649b..0c8762c 100644 --- a/apps/api/src/Configuration/Environment.ts +++ b/apps/api/src/Configuration/Environment.ts @@ -1,5 +1,4 @@ import { z } from "zod"; -import { maximumSuperAdmins } from "../Domain/Roles.js"; const optionalString = z .string() @@ -80,9 +79,6 @@ const environmentObject = z.object({ DISCORD_CLIENT_SECRET: z.string().min(1), DISCORD_REDIRECT_URI: z.url({ protocol: /^https?$/u }), - SUPER_ADMIN_DISCORD_IDS: snowflakeList.pipe( - z.array(snowflake).max(maximumSuperAdmins, `must list at most ${maximumSuperAdmins} users`) - ), ADMIN_DISCORD_IDS: snowflakeList, SUPERVISOR_DISCORD_IDS: snowflakeList, MODERATOR_DISCORD_IDS: snowflakeList, @@ -106,9 +102,6 @@ const environmentObject = z.object({ .int() .min(1024) .default(5 * 1024 * 1024), - RESEND_API_KEY: optionalString, - EMAIL_FROM: optionalString, - TURNSTILE_SECRET_KEY: optionalString, DELIVERABLE_MAX_BYTES: z.coerce .number() .int() @@ -134,10 +127,8 @@ export const environmentSchema = environmentObject.superRefine((value, context) if (insecure.length > 0) { context.addIssue({ code: "custom", path: ["APP_URL"], message: `production URLs must use https: ${insecure.join(", ")}` }); } - for (const key of ["REDIS_PASSWORD", "RESEND_API_KEY", "EMAIL_FROM", "TURNSTILE_SECRET_KEY"] as const) { - if (value[key] === undefined) { - context.addIssue({ code: "custom", path: [key], message: "is required in production" }); - } + if (value.REDIS_PASSWORD === undefined) { + context.addIssue({ code: "custom", path: ["REDIS_PASSWORD"], message: "is required in production" }); } }); diff --git a/apps/api/src/Domain/Roles.ts b/apps/api/src/Domain/Roles.ts index c975d55..99dbdd0 100644 --- a/apps/api/src/Domain/Roles.ts +++ b/apps/api/src/Domain/Roles.ts @@ -1,52 +1,17 @@ import { maximumSpecialties, Role, type Specialty } from "@platform/contracts"; -export { - adminSpecialties, - assignableSpecialties, - exclusiveSpecialties, - maximumSpecialties, - Role, - selfSelectableSpecialties, - Specialty, - specialtyLabel, - supervisorSpecialties, - teamSpecialties -} from "@platform/contracts"; +export { maximumSpecialties, Role, Specialty } from "@platform/contracts"; const roleRanks: Readonly> = Object.freeze({ - [Role.Member]: 0, [Role.Voter]: 1, [Role.Contributor]: 2, [Role.SeniorContributor]: 3, [Role.Moderator]: 4, - [Role.Supervisor]: 4, - [Role.Admin]: 5, - [Role.SuperAdmin]: 6 + [Role.Supervisor]: 5, + [Role.Admin]: 6 }); -const specialtyRoles: ReadonlySet = new Set([ - Role.SuperAdmin, - Role.Admin, - Role.Supervisor, - Role.Moderator, - Role.SeniorContributor, - Role.Contributor, - Role.Voter, - Role.Member -]); - -export const maximumSuperAdmins = 2; - -export function settleRole(role: Role, isVerified: boolean, currentRole: Role | null): Role { - if (role === Role.Voter && !isVerified && currentRole !== Role.Voter) { - return Role.Member; - } - return role; -} - -export function isGrantable(role: Role): boolean { - return role !== Role.SuperAdmin; -} +const specialtyRoles: ReadonlySet = new Set([Role.Contributor, Role.SeniorContributor, Role.Supervisor]); export function rankOf(role: Role): number { return roleRanks[role]; diff --git a/apps/api/src/Infrastructure/Captcha/CaptchaVerifier.ts b/apps/api/src/Infrastructure/Captcha/CaptchaVerifier.ts deleted file mode 100644 index 88bd151..0000000 --- a/apps/api/src/Infrastructure/Captcha/CaptchaVerifier.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface CaptchaVerifier { - verify(token: string, action: string): Promise; -} diff --git a/apps/api/src/Infrastructure/Captcha/TurnstileVerifier.ts b/apps/api/src/Infrastructure/Captcha/TurnstileVerifier.ts deleted file mode 100644 index b37a0e3..0000000 --- a/apps/api/src/Infrastructure/Captcha/TurnstileVerifier.ts +++ /dev/null @@ -1,47 +0,0 @@ -import type { FastifyBaseLogger } from "fastify"; -import { z } from "zod"; -import type { CaptchaVerifier } from "./CaptchaVerifier.js"; - -const endpoint = "https://challenges.cloudflare.com/turnstile/v0/siteverify"; -const timeoutMs = 8_000; - -const responseSchema = z.object({ - success: z.boolean(), - action: z.string().optional(), - hostname: z.string().optional() -}); - -export class TurnstileVerifier implements CaptchaVerifier { - public constructor( - private readonly secretKey: string, - private readonly allowedHostnames: readonly string[], - private readonly logger: FastifyBaseLogger - ) {} - - public async verify(token: string, action: string): Promise { - try { - const response = await fetch(endpoint, { - method: "POST", - headers: { "Content-Type": "application/x-www-form-urlencoded" }, - body: new URLSearchParams({ secret: this.secretKey, response: token }), - signal: AbortSignal.timeout(timeoutMs) - }); - const parsed = responseSchema.safeParse(await response.json()); - if (!parsed.success || !parsed.data.success) { - return false; - } - return ( - parsed.data.action === action && parsed.data.hostname !== undefined && this.allowedHostnames.includes(parsed.data.hostname) - ); - } catch (error: unknown) { - this.logger.warn({ err: error }, "turnstile verification failed"); - return false; - } - } -} - -export class DisabledCaptchaVerifier implements CaptchaVerifier { - public verify(): Promise { - return Promise.resolve(true); - } -} diff --git a/apps/api/src/Infrastructure/Database/Schema.ts b/apps/api/src/Infrastructure/Database/Schema.ts index 8de4ffa..4419017 100644 --- a/apps/api/src/Infrastructure/Database/Schema.ts +++ b/apps/api/src/Infrastructure/Database/Schema.ts @@ -45,7 +45,7 @@ export const users = pgTable( discordId: varchar("discord_id", { length: 20 }).notNull().unique(), discordUsername: varchar("discord_username", { length: 64 }).notNull(), discordAvatar: varchar("discord_avatar", { length: 64 }), - role: roleEnum("role").notNull(), + role: roleEnum("role").notNull().default(Role.Voter), specialties: specialtyEnum("specialties") .array() .notNull() @@ -53,16 +53,11 @@ export const users = pgTable( isBlacklisted: boolean("is_blacklisted").notNull().default(false), blacklistReason: varchar("blacklist_reason", { length: 500 }), blacklistedAt: timestamp("blacklisted_at", { withTimezone: true }), - onboardedAt: timestamp("onboarded_at", { withTimezone: true }), - termsVersion: varchar("terms_version", { length: 32 }), - termsAcceptedAt: timestamp("terms_accepted_at", { withTimezone: true }), - verifiedEmailHash: varchar("verified_email_hash", { length: 64 }).unique(), - emailVerifiedAt: timestamp("email_verified_at", { withTimezone: true }), ...timestamps }, (table) => [ index("users_created_at_idx").on(table.createdAt), - check("users_specialties_limit", sql`cardinality(${table.specialties}) <= 3`) + check("users_specialties_limit", sql`cardinality(${table.specialties}) <= 2`) ] ); @@ -114,7 +109,6 @@ export const entries = pgTable( status: entryStatusEnum("status").notNull().default(EntryStatus.PendingReview), mediaKey: varchar("media_key", { length: 255 }), isQuarantined: boolean("is_quarantined").notNull().default(false), - aiFlags: jsonb("ai_flags").$type().notNull().default([]), ...timestamps }, (table) => [index("entries_round_status_idx").on(table.roundId, table.status, table.createdAt)] @@ -209,10 +203,6 @@ export const shots = pgTable( claimedAt: timestamp("claimed_at", { withTimezone: true }), deadlineAt: timestamp("deadline_at", { withTimezone: true }), seniorPriorityUntil: timestamp("senior_priority_until", { withTimezone: true }), - imageKeys: text("image_keys") - .array() - .notNull() - .default(sql`'{}'`), ...timestamps }, (table) => [ @@ -225,7 +215,6 @@ export const shots = pgTable( .on(table.claimedBy) .where(sql`${table.status} IN ('claimed', 'submitted')`), check("shots_scene_number_positive", sql`${table.sceneNumber} > 0`), - check("shots_image_keys_limit", sql`cardinality(${table.imageKeys}) <= 4`), check( "shots_active_claim_consistency", sql`${table.status} NOT IN ('claimed', 'submitted') OR (${table.claimedBy} IS NOT NULL AND ${table.claimedAt} IS NOT NULL)` @@ -251,7 +240,6 @@ export const submissions = pgTable( supervisorNotes: varchar("supervisor_notes", { length: 2000 }), reviewedBy: uuid("reviewed_by").references(() => users.id, { onDelete: "set null" }), reviewedAt: timestamp("reviewed_at", { withTimezone: true }), - aiFlags: jsonb("ai_flags").$type().notNull().default([]), ...timestamps }, (table) => [ @@ -269,75 +257,7 @@ export const shotThreadMaps = pgTable("shot_thread_maps", { ...timestamps }); -export const pipelineProgress = pgTable( - "pipeline_progress", - { - id: integer("id").primaryKey().default(1), - stepIndex: integer("step_index").notNull(), - stepId: varchar("step_id", { length: 32 }).notNull(), - stepTitle: varchar("step_title", { length: 128 }).notNull(), - phaseNumber: integer("phase_number").notNull(), - phaseTitle: varchar("phase_title", { length: 128 }).notNull(), - progressPercent: doublePrecision("progress_percent").notNull(), - isPhaseTransition: boolean("is_phase_transition").notNull(), - updatedBy: uuid("updated_by").references(() => users.id, { onDelete: "set null" }), - ...timestamps - }, - (table) => [ - check("pipeline_progress_singleton", sql`${table.id} = 1`), - check("pipeline_progress_percent_range", sql`${table.progressPercent} BETWEEN 0 AND 100`) - ] -); - -export interface StoredDocumentSection { - readonly id: string; - readonly title: string; - readonly html: string; -} - -export const documents = pgTable("documents", { - slug: varchar("slug", { length: 32 }).primaryKey(), - title: varchar("title", { length: 200 }).notNull(), - sections: jsonb("sections").$type().notNull(), - revision: integer("revision").notNull(), - acceptanceVersion: varchar("acceptance_version", { length: 32 }), - updatedBy: uuid("updated_by").references(() => users.id, { onDelete: "set null" }), - ...timestamps -}); - -export const documentRevisions = pgTable( - "document_revisions", - { - id: uuid("id").primaryKey().defaultRandom(), - slug: varchar("slug", { length: 32 }) - .notNull() - .references(() => documents.slug, { onDelete: "cascade" }), - revision: integer("revision").notNull(), - title: varchar("title", { length: 200 }).notNull(), - sections: jsonb("sections").$type().notNull(), - requiresReacceptance: boolean("requires_reacceptance").notNull().default(false), - note: varchar("note", { length: 500 }), - authorId: uuid("author_id").references(() => users.id, { onDelete: "set null" }), - createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow() - }, - (table) => [uniqueIndex("document_revisions_slug_revision").on(table.slug, table.revision)] -); - -export const deletedStorageObjects = pgTable( - "deleted_storage_objects", - { - id: uuid("id").primaryKey().defaultRandom(), - bucket: varchar("bucket", { length: 32 }).notNull(), - objectKey: varchar("object_key", { length: 512 }).notNull(), - scheduledDeleteAt: timestamp("scheduled_delete_at", { withTimezone: true }).notNull(), - createdAt: timestamp("created_at", { withTimezone: true }).notNull().defaultNow() - }, - (table) => [index("deleted_storage_objects_scheduled_idx").on(table.scheduledDeleteAt)] -); - export type UserRecord = typeof users.$inferSelect; -export type DocumentRecord = typeof documents.$inferSelect; -export type DocumentRevisionRecord = typeof documentRevisions.$inferSelect; export type VotingRoundRecord = typeof votingRounds.$inferSelect; export type EntryRecord = typeof entries.$inferSelect; export type BallotRecord = typeof ballots.$inferSelect; @@ -346,5 +266,3 @@ export type RoundResultRecord = typeof roundResults.$inferSelect; export type ShotRecord = typeof shots.$inferSelect; export type SubmissionRecord = typeof submissions.$inferSelect; export type ShotThreadMapRecord = typeof shotThreadMaps.$inferSelect; -export type PipelineProgressRecord = typeof pipelineProgress.$inferSelect; -export type DeletedStorageObjectRecord = typeof deletedStorageObjects.$inferSelect; diff --git a/apps/api/src/Infrastructure/Discord/DiscordOAuthClient.ts b/apps/api/src/Infrastructure/Discord/DiscordOAuthClient.ts index d9fd86b..0835d34 100644 --- a/apps/api/src/Infrastructure/Discord/DiscordOAuthClient.ts +++ b/apps/api/src/Infrastructure/Discord/DiscordOAuthClient.ts @@ -52,7 +52,7 @@ export class HttpDiscordOAuthClient implements DiscordOAuthClient { response_type: "code", scope: "identify", state, - prompt: "consent" + prompt: "none" }).toString(); return url.toString(); } diff --git a/apps/api/src/Infrastructure/Email/EmailSender.ts b/apps/api/src/Infrastructure/Email/EmailSender.ts deleted file mode 100644 index 6f543c4..0000000 --- a/apps/api/src/Infrastructure/Email/EmailSender.ts +++ /dev/null @@ -1,22 +0,0 @@ -export interface EmailMessage { - readonly to: string; - readonly subject: string; - readonly text: string; - readonly html: string; - readonly idempotencyKey: string; -} - -export interface EmailSender { - isEnabled(): boolean; - send(message: EmailMessage): Promise; -} - -export class EmailDeliveryError extends Error { - public constructor( - message: string, - public readonly status: number - ) { - super(message); - this.name = "EmailDeliveryError"; - } -} diff --git a/apps/api/src/Infrastructure/Email/LogEmailSender.ts b/apps/api/src/Infrastructure/Email/LogEmailSender.ts deleted file mode 100644 index f4ee337..0000000 --- a/apps/api/src/Infrastructure/Email/LogEmailSender.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { FastifyBaseLogger } from "fastify"; -import type { EmailMessage, EmailSender } from "./EmailSender.js"; - -export class LogEmailSender implements EmailSender { - public constructor(private readonly logger: FastifyBaseLogger) {} - - public isEnabled(): boolean { - return true; - } - - public send(message: EmailMessage): Promise { - this.logger.warn( - { to: message.to, subject: message.subject, text: message.text }, - "email delivery disabled, logging message instead" - ); - return Promise.resolve(); - } -} diff --git a/apps/api/src/Infrastructure/Email/MailDomainChecker.ts b/apps/api/src/Infrastructure/Email/MailDomainChecker.ts deleted file mode 100644 index 900075e..0000000 --- a/apps/api/src/Infrastructure/Email/MailDomainChecker.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { resolveMx } from "node:dns/promises"; - -export interface MailDomainChecker { - acceptsMail(domain: string): Promise; -} - -const timeoutMs = 5_000; - -export class DnsMailDomainChecker implements MailDomainChecker { - public async acceptsMail(domain: string): Promise { - try { - const records = await Promise.race([ - resolveMx(domain), - new Promise((_, reject) => { - setTimeout(() => { - reject(new Error("MX lookup timed out")); - }, timeoutMs).unref(); - }) - ]); - return records.some((record) => record.exchange.length > 0 && record.exchange !== "."); - } catch { - return false; - } - } -} diff --git a/apps/api/src/Infrastructure/Email/ResendEmailSender.ts b/apps/api/src/Infrastructure/Email/ResendEmailSender.ts deleted file mode 100644 index 4cfbc70..0000000 --- a/apps/api/src/Infrastructure/Email/ResendEmailSender.ts +++ /dev/null @@ -1,33 +0,0 @@ -import type { EmailConfiguration } from "../../Configuration/ApplicationConfiguration.js"; -import { EmailDeliveryError, type EmailMessage, type EmailSender } from "./EmailSender.js"; - -const endpoint = "https://api.resend.com/emails"; -const timeoutMs = 10_000; - -export class ResendEmailSender implements EmailSender { - public constructor(private readonly configuration: EmailConfiguration) {} - - public isEnabled(): boolean { - return this.configuration.resendApiKey !== undefined && this.configuration.from !== undefined; - } - - public async send(message: EmailMessage): Promise { - const { resendApiKey, from } = this.configuration; - if (resendApiKey === undefined || from === undefined) { - throw new EmailDeliveryError("Email delivery is not configured.", 503); - } - const response = await fetch(endpoint, { - method: "POST", - headers: { - Authorization: `Bearer ${resendApiKey}`, - "Content-Type": "application/json", - "Idempotency-Key": message.idempotencyKey - }, - body: JSON.stringify({ from, to: [message.to], subject: message.subject, text: message.text, html: message.html }), - signal: AbortSignal.timeout(timeoutMs) - }); - if (!response.ok) { - throw new EmailDeliveryError(`Resend rejected the message with status ${response.status}.`, response.status); - } - } -} diff --git a/apps/api/src/Infrastructure/Storage/ObjectStorage.ts b/apps/api/src/Infrastructure/Storage/ObjectStorage.ts index 940ab4f..e7c8329 100644 --- a/apps/api/src/Infrastructure/Storage/ObjectStorage.ts +++ b/apps/api/src/Infrastructure/Storage/ObjectStorage.ts @@ -20,8 +20,6 @@ export interface ObjectStorage { isEnabled(bucket: StorageBucket): boolean; createUpload(bucket: StorageBucket, key: string, contentType: string, sizeBytes: number): Promise; getMetadata(bucket: StorageBucket, key: string): Promise; - getObject(bucket: StorageBucket, key: string, maxBytes?: number): Promise; createDownloadUrl(bucket: StorageBucket, key: string): Promise; getPublicUrl(bucket: StorageBucket, key: string): string | null; - deleteObject(bucket: StorageBucket, key: string): Promise; } diff --git a/apps/api/src/Infrastructure/Storage/S3ObjectStorage.ts b/apps/api/src/Infrastructure/Storage/S3ObjectStorage.ts index 7b3163b..62cd589 100644 --- a/apps/api/src/Infrastructure/Storage/S3ObjectStorage.ts +++ b/apps/api/src/Infrastructure/Storage/S3ObjectStorage.ts @@ -1,12 +1,4 @@ -import { - DeleteObjectCommand, - GetObjectCommand, - HeadObjectCommand, - NotFound, - PutObjectCommand, - S3Client, - S3ServiceException -} from "@aws-sdk/client-s3"; +import { GetObjectCommand, HeadObjectCommand, NotFound, PutObjectCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3"; import { getSignedUrl } from "@aws-sdk/s3-request-presigner"; import type { StorageConfiguration } from "../../Configuration/ApplicationConfiguration.js"; import { ServiceUnavailableError } from "../../Common/Errors/ApplicationError.js"; @@ -72,29 +64,6 @@ export class S3ObjectStorage implements ObjectStorage { } } - public async getObject(bucket: StorageBucket, key: string, maxBytes?: number): Promise { - const { client, name } = this.resolve(bucket); - try { - const result = await client.send( - new GetObjectCommand({ - Bucket: name, - Key: key, - Range: maxBytes !== undefined && maxBytes > 0 ? `bytes=0-${maxBytes - 1}` : undefined - }) - ); - if (result.Body === undefined) { - return null; - } - const byteArray = await result.Body.transformToByteArray(); - return Buffer.from(byteArray); - } catch (error: unknown) { - if (error instanceof NotFound || (error instanceof S3ServiceException && error.$metadata.httpStatusCode === 404)) { - return null; - } - throw error; - } - } - public async createDownloadUrl(bucket: StorageBucket, key: string): Promise { const { client, name } = this.resolve(bucket); const fileName = key.slice(key.lastIndexOf("/") + 1); @@ -114,21 +83,6 @@ export class S3ObjectStorage implements ObjectStorage { return `${base}/${key.split("/").map(encodeURIComponent).join("/")}`; } - public async deleteObject(bucket: StorageBucket, key: string): Promise { - if (!this.isEnabled(bucket)) { - return; - } - const { client, name } = this.resolve(bucket); - try { - await client.send(new DeleteObjectCommand({ Bucket: name, Key: key })); - } catch (error: unknown) { - if (error instanceof NotFound || (error instanceof S3ServiceException && error.$metadata.httpStatusCode === 404)) { - return; - } - throw error; - } - } - private resolve(bucket: StorageBucket): { client: S3Client; name: string } { const name = this.buckets.get(bucket); if (this.client === null || name === undefined) { diff --git a/apps/api/src/Jobs/MaintenanceScheduler.ts b/apps/api/src/Jobs/MaintenanceScheduler.ts index 0672861..db682c5 100644 --- a/apps/api/src/Jobs/MaintenanceScheduler.ts +++ b/apps/api/src/Jobs/MaintenanceScheduler.ts @@ -2,7 +2,6 @@ import type { FastifyBaseLogger } from "fastify"; import type { KeyValueStore } from "../Infrastructure/Cache/KeyValueStore.js"; import type { TokenService } from "../Modules/Auth/TokenService.js"; import type { ShotsService } from "../Modules/Shots/ShotsService.js"; -import type { LeaderboardService } from "../Modules/Leaderboards/LeaderboardService.js"; interface ScheduledJob { readonly name: string; @@ -17,7 +16,6 @@ export class MaintenanceScheduler { public constructor( shotsService: ShotsService, tokenService: TokenService, - leaderboardService: LeaderboardService, private readonly store: KeyValueStore, private readonly logger: FastifyBaseLogger ) { @@ -38,16 +36,6 @@ export class MaintenanceScheduler { run: async (): Promise => { await tokenService.purgeExpired(); } - }, - { - name: "finalize-expired-rounds", - intervalMs: 60 * 1000, - run: async (): Promise => { - const result = await leaderboardService.finalizeExpired(); - if (result.finalizedCount > 0) { - this.logger.info({ finalized: result.roundIds }, "auto-finalized expired voting rounds"); - } - } } ]; } diff --git a/apps/api/src/Main.ts b/apps/api/src/Main.ts index 4e83a64..1133fca 100644 --- a/apps/api/src/Main.ts +++ b/apps/api/src/Main.ts @@ -13,7 +13,7 @@ async function main(): Promise { const logger = createLogger(configuration.server.logLevel, configuration.server.logFormat === "pretty"); const services = createServiceContainer(configuration, createProductionInfrastructure(configuration, logger), logger); const application = await buildApplication(services, logger); - const scheduler = new MaintenanceScheduler(services.shotsService, services.tokenService, services.leaderboardService, services.keyValueStore, logger); + const scheduler = new MaintenanceScheduler(services.shotsService, services.tokenService, services.keyValueStore, logger); let shuttingDown = false; const shutdown = async (signal: string): Promise => { diff --git a/apps/api/src/Modules/Auth/AuthService.ts b/apps/api/src/Modules/Auth/AuthService.ts index a968012..6d33ba9 100644 --- a/apps/api/src/Modules/Auth/AuthService.ts +++ b/apps/api/src/Modules/Auth/AuthService.ts @@ -129,21 +129,20 @@ export class AuthService { public async syncUser(profile: DiscordProfile): Promise { const assignedRole = this.assignedRoleFor(profile.id); - const retainedRole = sql`CASE WHEN ${users.role} = ${Role.SuperAdmin} THEN (CASE WHEN ${users.emailVerifiedAt} IS NULL THEN ${Role.Member} ELSE ${Role.Voter} END)::user_role ELSE ${users.role} END`; const [user] = await this.database .insert(users) .values({ discordId: profile.id, discordUsername: profile.username, discordAvatar: profile.avatar, - role: assignedRole ?? Role.Member + role: assignedRole }) .onConflictDoUpdate({ target: users.discordId, set: { discordUsername: profile.username, discordAvatar: profile.avatar, - role: assignedRole ?? retainedRole, + role: sql`GREATEST(${users.role}, excluded.role)`, updatedAt: new Date() } }) @@ -172,11 +171,8 @@ export class AuthService { } } - private assignedRoleFor(discordId: string): Role | null { + private assignedRoleFor(discordId: string): Role { const assignments = this.roleAssignments; - if (assignments.superAdmins.includes(discordId)) { - return Role.SuperAdmin; - } if (assignments.admins.includes(discordId)) { return Role.Admin; } @@ -189,7 +185,7 @@ export class AuthService { if (assignments.seniorContributors.includes(discordId)) { return Role.SeniorContributor; } - return null; + return Role.Voter; } private defaultTarget(): ReturnTarget { diff --git a/apps/api/src/Modules/Auth/TokenService.ts b/apps/api/src/Modules/Auth/TokenService.ts index 033f6da..e28a2e6 100644 --- a/apps/api/src/Modules/Auth/TokenService.ts +++ b/apps/api/src/Modules/Auth/TokenService.ts @@ -47,9 +47,7 @@ export class TokenService { discordId: users.discordId, discordUsername: users.discordUsername, role: users.role, - isBlacklisted: users.isBlacklisted, - termsVersion: users.termsVersion, - emailVerifiedAt: users.emailVerifiedAt + isBlacklisted: users.isBlacklisted }) .from(accessTokens) .innerJoin(users, eq(users.id, accessTokens.userId)) @@ -79,9 +77,7 @@ export class TokenService { discordId: row.discordId, discordUsername: row.discordUsername, role: row.role, - isBlacklisted: row.isBlacklisted, - termsVersion: row.termsVersion, - isVerified: row.emailVerifiedAt !== null + isBlacklisted: row.isBlacklisted } }; } @@ -93,29 +89,12 @@ export class TokenService { discordId: users.discordId, discordUsername: users.discordUsername, role: users.role, - isBlacklisted: users.isBlacklisted, - termsVersion: users.termsVersion, - emailVerifiedAt: users.emailVerifiedAt + isBlacklisted: users.isBlacklisted }) .from(users) .where(eq(users.discordId, discordId)) .limit(1); - return user === undefined - ? null - : { - kind: "user", - tokenId: null, - isDelegated: true, - user: { - id: user.id, - discordId: user.discordId, - discordUsername: user.discordUsername, - role: user.role, - isBlacklisted: user.isBlacklisted, - termsVersion: user.termsVersion, - isVerified: user.emailVerifiedAt !== null - } - }; + return user === undefined ? null : { kind: "user", tokenId: null, isDelegated: true, user }; } public async revoke(tokenId: string): Promise { diff --git a/apps/api/src/Modules/Ballots/BallotsRoutes.ts b/apps/api/src/Modules/Ballots/BallotsRoutes.ts index b362f73..10dad76 100644 --- a/apps/api/src/Modules/Ballots/BallotsRoutes.ts +++ b/apps/api/src/Modules/Ballots/BallotsRoutes.ts @@ -2,8 +2,7 @@ import { ballotSchema, ledgerBallotSchema as ledgerRowSchema } from "@platform/c import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; import { z } from "zod"; import { dataEnvelope, errorResponses, pageEnvelope, paginationQuerySchema, toIso, uuidSchema } from "../../Common/Http/Schemas.js"; -import { currentUser, requireParticipant, requireRole, requireUser } from "../../Common/Security/Authorization.js"; -import { Role } from "../../Domain/Roles.js"; +import { currentUser, requireUser } from "../../Common/Security/Authorization.js"; import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; import type { BallotRecord } from "../../Infrastructure/Database/Schema.js"; import { picksOf } from "./BallotsService.js"; @@ -21,22 +20,19 @@ export const ballotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } application.get( "/rounds/:roundId/ballots", { - preHandler: requireRole(Role.Supervisor), schema: { tags: ["Ballots"], - summary: "Supervisor ballot ledger for audit and verification.", - security, + summary: "Public, pseudonymous ballot ledger for independent verification.", params: roundParams, querystring: paginationQuerySchema, response: { 200: pageEnvelope(ledgerRowSchema), ...errorResponses } } }, async (request) => { - const page = await ballotsService.ledger(request.params.roundId, request.query, currentUser(request)); + const page = await ballotsService.ledger(request.params.roundId, request.query); return { data: page.data.map((row) => ({ - discordId: row.discordId, - discordUsername: row.discordUsername, + voter: row.voter, picks: [...row.picks], castAt: toIso(row.castAt), updatedAt: toIso(row.updatedAt) @@ -64,7 +60,7 @@ export const ballotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } application.put( "/rounds/:roundId/ballots/me", { - preHandler: requireParticipant(Role.Member, services.documentsService), + preHandler: requireUser(), config: { rateLimit: { max: 20, timeWindow: "1 minute" } }, schema: { tags: ["Ballots"], diff --git a/apps/api/src/Modules/Ballots/BallotsService.ts b/apps/api/src/Modules/Ballots/BallotsService.ts index 9d967dc..51dda0f 100644 --- a/apps/api/src/Modules/Ballots/BallotsService.ts +++ b/apps/api/src/Modules/Ballots/BallotsService.ts @@ -3,20 +3,18 @@ import { and, asc, count, eq } from "drizzle-orm"; import { ConflictError, ErrorCode, ForbiddenError, NotFoundError, UnprocessableError } from "../../Common/Errors/ApplicationError.js"; import { createPage, offsetOf, type Page, type PaginationQuery } from "../../Common/Http/Schemas.js"; import type { AuthenticatedUser } from "../../Common/Security/Principal.js"; -import { EntryStatus, RoundStatus } from "../../Domain/Enums.js"; -import { Role } from "../../Domain/Roles.js"; +import { hmacHex } from "../../Common/Security/Secrets.js"; +import { EntryStatus } from "../../Domain/Enums.js"; import type { KeyValueStore } from "../../Infrastructure/Cache/KeyValueStore.js"; import type { Database } from "../../Infrastructure/Database/Database.js"; -import { ballots, entries, users, votingRounds, type BallotRecord, type UserRecord } from "../../Infrastructure/Database/Schema.js"; +import { ballots, entries, users, votingRounds, type BallotRecord } from "../../Infrastructure/Database/Schema.js"; import { RoundEventType, type EventBus } from "../../Infrastructure/Events/EventBus.js"; import { NotificationType, personOfUser, roundReferenceOf, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; import { isAcceptingVotes } from "../Rounds/RoundPresenter.js"; -import { canSeeDrafts } from "../Rounds/RoundVisibility.js"; import type { RaidMonitor } from "../Telemetry/RaidMonitor.js"; export interface LedgerRow { - readonly discordId: string; - readonly discordUsername: string; + readonly voter: string; readonly picks: readonly string[]; readonly castAt: Date; readonly updatedAt: Date; @@ -35,7 +33,8 @@ export class BallotsService { private readonly store: KeyValueStore, private readonly eventBus: EventBus, private readonly notifier: Notifier, - private readonly raidMonitor: RaidMonitor + private readonly raidMonitor: RaidMonitor, + private readonly pseudonymKey: string ) {} public async cast(voter: AuthenticatedUser, roundId: string, picks: readonly string[]): Promise { @@ -44,7 +43,7 @@ export class BallotsService { throw new ForbiddenError("Your account is blacklisted from voting.", ErrorCode.UserBlacklisted); } - const { ballot, roundTitle, pollType, promotedUser } = await this.database.transaction(async (transaction) => { + const { ballot, roundTitle, pollType, titles } = await this.database.transaction(async (transaction) => { const [round] = await transaction.select().from(votingRounds).where(eq(votingRounds.id, roundId)).limit(1).for("share"); if (round === undefined) { throw new NotFoundError("Round"); @@ -54,7 +53,7 @@ export class BallotsService { } const eligible = await transaction - .select({ id: entries.id }) + .select({ id: entries.id, title: entries.title }) .from(entries) .where(and(eq(entries.roundId, roundId), eq(entries.status, EntryStatus.Approved), eq(entries.isQuarantined, false))); const scheme = getScoringScheme(round.pollType); @@ -84,35 +83,14 @@ export class BallotsService { if (saved === undefined) { throw new Error("Ballot upsert returned no row."); } - - let promotedUser: UserRecord | undefined; - if (voter.role === Role.Member) { - const [updated] = await transaction - .update(users) - .set({ role: Role.Voter, updatedAt: new Date() }) - .where(and(eq(users.id, voter.id), eq(users.role, Role.Member))) - .returning(); - promotedUser = updated; - } - return { ballot: saved, roundTitle: round.title, pollType: round.pollType, - promotedUser + titles: new Map(eligible.map((entry) => [entry.id, entry.title])) }; }); - if (promotedUser !== undefined) { - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(promotedUser), - role: promotedUser.role, - specialties: promotedUser.specialties, - actor: personOfUser(promotedUser) - }); - } - this.raidMonitor.schedule(roundId, picks); await this.eventBus.publish({ type: RoundEventType.BallotSubmitted, @@ -127,6 +105,7 @@ export class BallotsService { type: NotificationType.BallotSubmitted, round: { id: roundId, title: roundTitle, pollType }, voter: personOfUser(voter), + picks: picks.map((pick) => ({ id: pick, title: titles.get(pick) ?? pick })), isChange: ballot.createdAt.getTime() !== ballot.updatedAt.getTime() }); return ballot; @@ -144,21 +123,16 @@ export class BallotsService { return ballot; } - public async ledger(roundId: string, query: PaginationQuery, viewer: AuthenticatedUser | null = null): Promise> { - const [round] = await this.database - .select({ id: votingRounds.id, status: votingRounds.status }) - .from(votingRounds) - .where(eq(votingRounds.id, roundId)) - .limit(1); - if (round === undefined || (round.status === RoundStatus.Draft && !canSeeDrafts(viewer))) { + public async ledger(roundId: string, query: PaginationQuery): Promise> { + const [round] = await this.database.select({ id: votingRounds.id }).from(votingRounds).where(eq(votingRounds.id, roundId)).limit(1); + if (round === undefined) { throw new NotFoundError("Round"); } const filter = and(eq(ballots.roundId, roundId), eq(users.isBlacklisted, false)); const [rows, totals] = await Promise.all([ this.database .select({ - discordId: users.discordId, - discordUsername: users.discordUsername, + voterId: ballots.voterId, rank1EntryId: ballots.rank1EntryId, rank2EntryId: ballots.rank2EntryId, rank3EntryId: ballots.rank3EntryId, @@ -175,8 +149,7 @@ export class BallotsService { ]); return createPage( rows.map((row) => ({ - discordId: row.discordId, - discordUsername: row.discordUsername, + voter: hmacHex(this.pseudonymKey, `${roundId}:${row.voterId}`, 32), picks: picksOf(row), castAt: row.createdAt, updatedAt: row.updatedAt diff --git a/apps/api/src/Modules/Documents/DefaultDocuments.ts b/apps/api/src/Modules/Documents/DefaultDocuments.ts deleted file mode 100644 index 975904d..0000000 --- a/apps/api/src/Modules/Documents/DefaultDocuments.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { DocumentSlug } from "@platform/contracts"; -import type { StoredDocumentSection } from "../../Infrastructure/Database/Schema.js"; - -export interface DefaultDocument { - readonly title: string; - readonly sections: readonly StoredDocumentSection[]; -} - -export const defaultDocuments: Readonly> = { - [DocumentSlug.Guidelines]: { - title: "Guidelines", - sections: [ - { - id: "overview", - title: "Overview & Roles", - html: "

Project Stairway is an open community-made 3D animated film. At the helm of this project is MattSquared, CEO of Squared Media (creators of Songs of War), teaming up with experienced community artists and leads to bring the vision of a community-made movie to life.

Project Stairway has two core goals:

  1. Produce a community-made animated movie of the highest quality in Blender.
  2. Create a positive, safe, and free learning community where anyone can level up their skills, whether you are sharing work in Discord to get feedback from experienced artists, voting on major production choices, or claiming 3D shots as a contributor.

Curated Democracy: Not every single production decision can be voted on (otherwise the movie would take forever to make). To balance production speed with community agency, the leadership team curates community pitches down to the top 5 feasible options or less so you can vote on solid, achievable directions without getting overwhelmed.

Here is how the roles work:

  • Member: Anyone who joins and accepts the terms. You can browse active rounds, check the grabbox, and view community submissions.
  • Voter: As soon as you cast a vote in any active voting round, you automatically get the Voter role. It is an indicator badge to show you actively vote (no permission overhead, just shows you participate).
  • Contributor: As soon as you submit work for a grabbox task or have an approved round entry, you automatically get the Contributor role.
  • Supervisors & Admins: Studio leads and department heads. Supervisors have actual permission overhead: they create rounds, curate submissions, set up grabbox shots, QA incoming .blend project files, give feedback in Discord, and merge approved shots into the master production timeline.
" - }, - { - id: "voting", - title: "Voting System", - html: "

We run two different types of voting rounds depending on what we are deciding for production:

1. Ranked 3-2-1 Choice (Borda Count)

Used for open creative pitches, character concepts, soundtrack directions, and story proposals where the community pitches multiple entries (curated to 5 options or less).

Step-by-step flow:

  1. Pitches open: A round starts in the Open stage where members submit concept entries with descriptions and preview media.
  2. Review & shortlist: Supervisors review submitted pitches and approve the strongest 5 entries for the voting ballot.
  3. Voting opens: The round transitions to Voting. You browse the entries and pick your top 3 favorites in order (1st, 2nd, and 3rd).
  4. Point calculation: Every ballot distributes 6 total points across your picks: 1st pick gets 3 points, 2nd pick gets 2 points, and 3rd pick gets 1 point.
Score = (3 × 1st_picks) + (2 × 2nd_picks) + (1 × 3rd_picks)

Read more about Borda count on Wikipedia

Bayesian Score Smoothing: When a round just opens, if only a couple people vote, an entry could shoot up to 100% and look artificially boosted. To prevent early volatility, we apply Bayesian score smoothing. It adds a small prior weight (K) based on the round average so standings stay stable and reflect genuine consensus as more ballots roll in.

Smoothed Score = (Total Points + K × Average Score) / (Total Ballots + K)

Read more about Bayesian average on Wikipedia

Round closes & winner decided: Once the timer ends, results are locked and the highest-scoring concept wins the round and moves into the production grabbox.

2. Binary Choice (Either / Or)

Used for fast production decisions where we need a direct call between two specific choices (like choosing between two lighting setups, color palettes, or storyboard options).

Step-by-step flow:

  1. Creation: A Supervisor sets up the round with exactly two pre-filled options (Option A and Option B), complete with descriptions and preview media. There is no open pitch stage.
  2. Voting: The round goes straight to Voting. You pick either Option A or Option B.
  3. Majority calculation: Each vote counts directly toward that option percentage.
Option Percentage = (Option Votes / Total Votes) × 100%

Read more about Majority rule on Wikipedia

Outcome: When voting closes, the option with the majority of votes wins and the decision is immediately applied to the scene in production.

" - }, - { - id: "fair-play", - title: "Fair Play & Anti-Cheat", - html: "

We want production decisions to reflect what the real community wants, not who has the most Discord alts or scripts. Here are the ground rules:

  1. 1 person = 1 account: You can only vote from your single primary account. Using alternate accounts, bot scripts, or puppet profiles to stack votes on an option is strictly forbidden.
  2. Automated bot & ring detection: Active rounds run live checks for suspicious behavior. If an option suddenly gets a wave of fresh accounts voting in a tight cluster or ballot stuffing is detected, it gets flagged for supervisor audit.
  3. Blacklisting: If an account is caught cheating, brigading, or exploiting, it gets blacklisted. Blacklisted users cannot vote on rounds, propose entries, or claim grabbox tasks, and any active claimed shots are immediately released back to the grabbox.
" - }, - { - id: "grab-box", - title: "Grab-Box System", - html: "

The grabbox is where 3D artists pick up production shots to work on.

How the grab-box works:

  1. Finding available shots: Browse open shots and filter by department (layout, 3D modeling, rigging, animation, lighting, comp, audio).
  2. Difficulty tiers & timers: Each shot has an assigned difficulty tier with a fixed turnaround deadline:
    • Tier 1: 1-2 days (quick prop fixes, cleanup, basic layout).
    • Tier 2: 3-4 days (character props, environment assets, secondary animation).
    • Tier 3: 5-7 days (hero character animation, complex scene lighting, detailed set dressing).
    • Tier 4: 10-14 days (multi-character sequences, hero shots, heavy simulations).
    Note: Senior-locked shots have a brief priority window for experienced contributors before opening to everyone.
  3. Claiming a shot: When you claim a shot, you are the only one working on it. Your deadline countdown starts immediately.
  4. Releasing a shot: If something comes up and you cannot finish the task in time, release it early so another contributor can grab it without stalling production.
  5. Required deliverables: Every grabbox submission requires two files:
    • The inspectable .blend project source file (clean collections, proper naming, packed textures/assets).
    • A compressed video preview (MP4/WebM) showing viewport playback or render.
" - }, - { - id: "pipeline", - title: "Production Pipeline", - html: "

Here is the step-by-step lifecycle of how a community idea moves from a vote all the way into the final film:

  1. Community decision: A voting round concludes, locking in the winning concept, storyline direction, or asset choice.
  2. Shot breakdown: Supervisors break down the winning idea into individual 3D tasks and publish them to the grabbox with scene notes, storyboard references, and blender templates.
  3. Task execution: A contributor claims the shot, builds the assets or animation in Blender, and submits the .blend file and video preview.
  4. QA & Discord feedback: When a task is submitted, a dedicated review thread opens automatically in the studio Discord. Supervisors inspect the scene file, check technical standards, and provide feedback or requested tweaks.
  5. Approval & master integration: Once approved by a supervisor, the contributor receives the Contributor role badge, the shot is marked complete, and the assets are merged directly into the master film edit.
" - } - ] - }, - [DocumentSlug.Terms]: { - title: "Terms of Service", - sections: [ - { - id: "agreement", - title: "Agreement", - html: '

By using Project Stairway you agree to these terms, the Privacy Policy and the Acceptable Use Policy.

' - }, - { - id: "accounts", - title: "Accounts", - html: "

One account per person. Verify your email to vote.

" - }, - { - id: "content", - title: "Your content", - html: "

You keep ownership of what you submit and let the project use it.

" - }, - { - id: "contact", - title: "Contact", - html: "

[Contact details]

" - } - ] - }, - [DocumentSlug.Privacy]: { - title: "Privacy Policy", - sections: [ - { - id: "data", - title: "What we collect", - html: "

Your Discord ID, username and avatar, and what you do on the platform. We don't store your email address, only a hash of it.

" - }, - { - id: "contact", - title: "Contact", - html: "

[Contact details]

" - } - ] - }, - [DocumentSlug.AcceptableUse]: { - title: "Acceptable Use Policy", - sections: [ - { - id: "rules", - title: "Rules", - html: "

Be respectful. No bots, alternate accounts or vote manipulation.

" - } - ] - } -}; diff --git a/apps/api/src/Modules/Documents/DocumentSanitizer.ts b/apps/api/src/Modules/Documents/DocumentSanitizer.ts deleted file mode 100644 index bf2317e..0000000 --- a/apps/api/src/Modules/Documents/DocumentSanitizer.ts +++ /dev/null @@ -1,81 +0,0 @@ -import sanitizeHtml from "sanitize-html"; - -const internalLink = /^(?:\/(?![/\\])|#)[^\s]*$/u; -const externalLink = /^(?:https?:\/\/|mailto:)[^\s]+$/iu; - -const options: sanitizeHtml.IOptions = { - allowedTags: [ - "p", - "br", - "h2", - "h3", - "h4", - "strong", - "b", - "em", - "i", - "u", - "s", - "code", - "pre", - "blockquote", - "ul", - "ol", - "li", - "a", - "img", - "hr", - "table", - "thead", - "tbody", - "tr", - "th", - "td", - "colgroup", - "col" - ], - allowedAttributes: { - a: ["href", "target", "rel"], - img: ["src", "alt", "title", "class", "width", "height"], - p: ["class"], - ol: ["start"], - th: ["colspan", "rowspan"], - td: ["colspan", "rowspan"] - }, - allowedSchemes: ["http", "https", "mailto"], - allowedSchemesAppliedToAttributes: ["href", "src"], - allowProtocolRelative: false, - disallowedTagsMode: "discard", - enforceHtmlBoundary: false, - transformTags: { - b: "strong", - i: "em", - a: (tagName, attributes): sanitizeHtml.Tag => { - const href = (attributes.href ?? "").trim(); - if (internalLink.test(href)) { - return { tagName, attribs: { href } }; - } - if (externalLink.test(href)) { - return { tagName, attribs: { href, target: "_blank", rel: "noopener noreferrer nofollow" } }; - } - return { tagName: "span", attribs: {} }; - }, - img: (tagName, attributes): sanitizeHtml.Tag => { - const src = (attributes.src ?? "").trim(); - if (internalLink.test(src) || externalLink.test(src)) { - const attribs: Record = { src }; - if (attributes.alt !== undefined) attribs.alt = attributes.alt; - if (attributes.title !== undefined) attribs.title = attributes.title; - if (attributes.class !== undefined) attribs.class = attributes.class; - if (attributes.width !== undefined) attribs.width = attributes.width; - if (attributes.height !== undefined) attribs.height = attributes.height; - return { tagName, attribs }; - } - return { tagName: "span", attribs: {} }; - } - } -}; - -export function sanitizeDocumentHtml(html: string): string { - return sanitizeHtml(html, options).trim(); -} diff --git a/apps/api/src/Modules/Documents/DocumentsRoutes.ts b/apps/api/src/Modules/Documents/DocumentsRoutes.ts deleted file mode 100644 index 000d856..0000000 --- a/apps/api/src/Modules/Documents/DocumentsRoutes.ts +++ /dev/null @@ -1,133 +0,0 @@ -import { - documentRevisionSchema, - documentRevisionSummarySchema, - documentSchema, - DocumentSlug, - documentUpdateSchema, - legalAcceptanceSchema, - type DocumentDto, - type DocumentRevisionSummaryDto -} from "@platform/contracts"; -import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; -import { z } from "zod"; -import { dataEnvelope, errorResponses, toIso } from "../../Common/Http/Schemas.js"; -import { requireRole, userActorOf } from "../../Common/Security/Authorization.js"; -import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; -import { Role } from "../../Domain/Roles.js"; -import { toUserSummary } from "../Users/UserPresenter.js"; -import type { DocumentView, RevisionView } from "./DocumentsService.js"; - -const slugParams = z.object({ slug: z.enum(DocumentSlug) }); -const revisionParams = slugParams.extend({ revision: z.coerce.number().int().positive() }); - -function presentDocument(document: DocumentView): DocumentDto { - return { - slug: document.slug, - title: document.title, - sections: [...document.sections], - revision: document.revision, - updatedAt: toIso(document.updatedAt), - updatedBy: document.updatedBy === null ? null : toUserSummary(document.updatedBy) - }; -} - -function presentRevision({ record, author }: RevisionView): DocumentRevisionSummaryDto { - return { - revision: record.revision, - title: record.title, - note: record.note, - requiresReacceptance: record.requiresReacceptance, - author: author === null ? null : toUserSummary(author), - createdAt: toIso(record.createdAt) - }; -} - -export const documentsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { - const { documentsService } = services; - const security = [{ bearer: [] }]; - const editor = requireRole(Role.Supervisor); - - application.get( - "/legal/acceptance", - { - schema: { - tags: ["Documents"], - summary: "The terms version users must have accepted.", - response: { 200: dataEnvelope(legalAcceptanceSchema), ...errorResponses } - } - }, - async (_request, reply) => { - void reply.header('Cache-Control', 'public, max-age=60'); - return { data: { version: await documentsService.currentAcceptanceVersion() } }; - } - ); - - application.get( - "/documents/:slug", - { - schema: { - tags: ["Documents"], - summary: "Get the published guidelines or a legal document.", - params: slugParams, - response: { 200: dataEnvelope(documentSchema), ...errorResponses } - } - }, - async (request, reply) => { - void reply.header('Cache-Control', 'public, max-age=300, stale-while-revalidate=600'); - return { data: presentDocument(await documentsService.get(request.params.slug)) }; - } - ); - - application.put( - "/documents/:slug", - { - preHandler: editor, - bodyLimit: 5 * 1024 * 1024, - config: { rateLimit: { max: 20, timeWindow: "1 minute" } }, - schema: { - tags: ["Documents"], - summary: "Publish a new revision of a document.", - security, - params: slugParams, - body: documentUpdateSchema, - response: { 200: dataEnvelope(documentSchema), ...errorResponses } - } - }, - async (request) => ({ - data: presentDocument(await documentsService.publish(userActorOf(request), request.params.slug, request.body)) - }) - ); - - application.get( - "/documents/:slug/revisions", - { - preHandler: editor, - schema: { - tags: ["Documents"], - summary: "List a document's published revisions.", - security, - params: slugParams, - response: { 200: dataEnvelope(z.array(documentRevisionSummarySchema)), ...errorResponses } - } - }, - async (request) => ({ data: (await documentsService.revisions(request.params.slug)).map(presentRevision) }) - ); - - application.get( - "/documents/:slug/revisions/:revision", - { - preHandler: editor, - schema: { - tags: ["Documents"], - summary: "Get one published revision in full.", - security, - params: revisionParams, - response: { 200: dataEnvelope(documentRevisionSchema), ...errorResponses } - } - }, - async (request) => { - const view = await documentsService.revision(request.params.slug, request.params.revision); - return { data: { ...presentRevision(view), sections: view.record.sections } }; - } - ); -}; diff --git a/apps/api/src/Modules/Documents/DocumentsService.ts b/apps/api/src/Modules/Documents/DocumentsService.ts deleted file mode 100644 index 21fbba2..0000000 --- a/apps/api/src/Modules/Documents/DocumentsService.ts +++ /dev/null @@ -1,190 +0,0 @@ -import { initialTermsVersion, legalDocumentSlugs, NotificationType, type DocumentSectionDto, type DocumentSlug } from "@platform/contracts"; -import { and, desc, eq, inArray, max } from "drizzle-orm"; -import { BadRequestError, ConflictError, ErrorCode, NotFoundError } from "../../Common/Errors/ApplicationError.js"; -import type { UserActor } from "../../Common/Security/Principal.js"; -import type { Database } from "../../Infrastructure/Database/Database.js"; -import type { Notifier } from "../../Infrastructure/Notifications/Notification.js"; -import { - documentRevisions, - documents, - users, - type DocumentRecord, - type DocumentRevisionRecord, - type StoredDocumentSection, - type UserRecord -} from "../../Infrastructure/Database/Schema.js"; -import { defaultDocuments } from "./DefaultDocuments.js"; -import { sanitizeDocumentHtml } from "./DocumentSanitizer.js"; - -type Author = Pick; - -export interface DocumentView { - readonly slug: DocumentSlug; - readonly title: string; - readonly sections: readonly StoredDocumentSection[]; - readonly revision: number; - readonly updatedAt: Date | null; - readonly updatedBy: Author | null; -} - -export interface RevisionView { - readonly record: DocumentRevisionRecord; - readonly author: Author | null; -} - -export interface DocumentUpdate { - readonly title: string; - readonly sections: readonly DocumentSectionDto[]; - readonly expectedRevision: number; - readonly requireReacceptance: boolean; - readonly note: string | null; -} - -export interface LegalAcceptance { - currentAcceptanceVersion(): Promise; -} - -const acceptanceCacheMs = 15_000; - -const authorColumns = { - id: users.id, - discordId: users.discordId, - discordUsername: users.discordUsername, - discordAvatar: users.discordAvatar -}; - -export function isLegalDocument(slug: DocumentSlug): boolean { - return legalDocumentSlugs.includes(slug); -} - -export class DocumentsService implements LegalAcceptance { - private cachedAcceptance: { readonly version: string; readonly expiresAt: number } | null = null; - - public constructor( - private readonly database: Database, - private readonly notifier?: Notifier - ) {} - - public async get(slug: DocumentSlug): Promise { - const [row] = await this.database - .select({ document: documents, author: authorColumns }) - .from(documents) - .leftJoin(users, eq(users.id, documents.updatedBy)) - .where(eq(documents.slug, slug)) - .limit(1); - if (row === undefined) { - const fallback = defaultDocuments[slug]; - return { slug, title: fallback.title, sections: fallback.sections, revision: 0, updatedAt: null, updatedBy: null }; - } - return this.toView(row.document, row.author); - } - - public async currentAcceptanceVersion(): Promise { - const now = Date.now(); - if (this.cachedAcceptance !== null && this.cachedAcceptance.expiresAt > now) { - return this.cachedAcceptance.version; - } - const [row] = await this.database - .select({ version: max(documents.acceptanceVersion) }) - .from(documents) - .where(inArray(documents.slug, [...legalDocumentSlugs])); - const version = row?.version ?? initialTermsVersion; - this.cachedAcceptance = { version, expiresAt: now + acceptanceCacheMs }; - return version; - } - - public async publish(actor: UserActor, slug: DocumentSlug, update: DocumentUpdate): Promise { - const sections = this.prepareSections(update.sections); - if (update.requireReacceptance && !isLegalDocument(slug)) { - throw new BadRequestError("Only legal documents can require re-acceptance.", ErrorCode.ValidationFailed); - } - const published = await this.database.transaction(async (transaction) => { - const [current] = await transaction.select().from(documents).where(eq(documents.slug, slug)).limit(1).for("update"); - const currentRevision = current?.revision ?? 0; - if (update.expectedRevision !== currentRevision) { - throw new ConflictError("Someone else published this document while you were editing. Reload to see their changes."); - } - const revision = currentRevision + 1; - const acceptanceVersion = update.requireReacceptance ? new Date().toISOString() : (current?.acceptanceVersion ?? null); - const values = { title: update.title, sections, revision, acceptanceVersion, updatedBy: actor.userId }; - const [saved] = await transaction - .insert(documents) - .values({ slug, ...values }) - .onConflictDoUpdate({ target: documents.slug, set: { ...values, updatedAt: new Date() } }) - .returning(); - await transaction.insert(documentRevisions).values({ - slug, - revision, - title: update.title, - sections, - requiresReacceptance: update.requireReacceptance, - note: update.note, - authorId: actor.userId - }); - if (saved === undefined) { - throw new Error("Document upsert returned no row."); - } - return saved; - }); - if (update.requireReacceptance) { - this.cachedAcceptance = null; - } - const [author] = await this.database.select(authorColumns).from(users).where(eq(users.id, actor.userId)).limit(1); - this.notifier?.notify({ - type: NotificationType.DocumentUpdated, - slug, - revision: published.revision, - title: published.title, - sections: published.sections.map((s) => ({ id: s.id, title: s.title, html: s.html })), - actor: { discordId: author?.discordId ?? null, username: author?.discordUsername ?? "SuperAdmin" }, - note: update.note - }); - return this.toView(published, author ?? null); - } - - public async revisions(slug: DocumentSlug): Promise { - const rows = await this.database - .select({ record: documentRevisions, author: authorColumns }) - .from(documentRevisions) - .leftJoin(users, eq(users.id, documentRevisions.authorId)) - .where(eq(documentRevisions.slug, slug)) - .orderBy(desc(documentRevisions.revision)) - .limit(100); - return rows.map((row) => ({ record: row.record, author: row.author })); - } - - public async revision(slug: DocumentSlug, revision: number): Promise { - const [row] = await this.database - .select({ record: documentRevisions, author: authorColumns }) - .from(documentRevisions) - .leftJoin(users, eq(users.id, documentRevisions.authorId)) - .where(and(eq(documentRevisions.slug, slug), eq(documentRevisions.revision, revision))) - .limit(1); - if (row === undefined) { - throw new NotFoundError("Revision"); - } - return { record: row.record, author: row.author }; - } - - private prepareSections(sections: readonly DocumentSectionDto[]): StoredDocumentSection[] { - const seen = new Set(); - return sections.map((section) => { - if (seen.has(section.id)) { - throw new BadRequestError(`Two sections share the anchor "${section.id}". Rename one of them.`, ErrorCode.ValidationFailed); - } - seen.add(section.id); - return { id: section.id, title: section.title.trim(), html: sanitizeDocumentHtml(section.html) }; - }); - } - - private toView(document: DocumentRecord, author: Author | null): DocumentView { - return { - slug: document.slug as DocumentSlug, - title: document.title, - sections: document.sections, - revision: document.revision, - updatedAt: document.updatedAt, - updatedBy: author - }; - } -} diff --git a/apps/api/src/Modules/Entries/EntriesRoutes.ts b/apps/api/src/Modules/Entries/EntriesRoutes.ts index d189e3f..c506589 100644 --- a/apps/api/src/Modules/Entries/EntriesRoutes.ts +++ b/apps/api/src/Modules/Entries/EntriesRoutes.ts @@ -1,27 +1,30 @@ -import { entrySchema, fieldRules } from "@platform/contracts"; +import { entrySchema } from "@platform/contracts"; import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; import { z } from "zod"; -import { dataEnvelope, errorResponses, pageEnvelope, paginationQuerySchema, toIso, uuidSchema } from "../../Common/Http/Schemas.js"; -import { actorOf, currentUser, optionalUser, requireParticipant, requireRole, requireUser } from "../../Common/Security/Authorization.js"; +import { + dataEnvelope, + errorResponses, + pageEnvelope, + paginationQuerySchema, + toIso, + trimmedText, + uuidSchema +} from "../../Common/Http/Schemas.js"; +import { actorOf, currentUser, optionalUser, requireRole, requireUser } from "../../Common/Security/Authorization.js"; import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; import { EntryStatus } from "../../Domain/Enums.js"; import { Role } from "../../Domain/Roles.js"; import type { EntryRecord } from "../../Infrastructure/Database/Schema.js"; import { StorageBucket, type ObjectStorage } from "../../Infrastructure/Storage/ObjectStorage.js"; -import { toUserSummary } from "../Users/UserPresenter.js"; -import type { EntryWithAuthor } from "./EntriesService.js"; const roundParams = z.object({ roundId: uuidSchema }); const entryParams = z.object({ roundId: uuidSchema, entryId: uuidSchema }); const mediaKeySchema = z.string().max(255); -const pitchSchema = fieldRules.entryTitle; -const descriptionSchema = fieldRules.entryDescription; - export const entriesRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { const { entriesService, objectStorage } = services; const security = [{ bearer: [] }]; - const present = (entry: EntryWithAuthor | EntryRecord): z.infer => toEntryResponse(entry, objectStorage); + const present = (entry: EntryRecord): z.infer => toEntryResponse(entry, objectStorage); application.get( "/rounds/:roundId/entries", @@ -58,7 +61,7 @@ export const entriesRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } application.post( "/rounds/:roundId/entries", { - preHandler: requireParticipant(Role.Member, services.documentsService), + preHandler: requireUser(), config: { rateLimit: { max: 10, timeWindow: "1 minute" } }, schema: { tags: ["Entries"], @@ -66,8 +69,8 @@ export const entriesRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } security, params: roundParams, body: z.object({ - title: pitchSchema, - description: descriptionSchema.default(null), + title: trimmedText(255), + description: trimmedText(1500).nullable().default(null), mediaKey: mediaKeySchema.nullable().default(null) }), response: { 201: dataEnvelope(entrySchema), ...errorResponses } @@ -90,17 +93,15 @@ export const entriesRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } params: entryParams, body: z .object({ - title: pitchSchema.optional(), - description: descriptionSchema.optional(), + title: trimmedText(255).optional(), + description: trimmedText(1500).nullable().optional(), mediaKey: mediaKeySchema.nullable().optional() }) .refine((body) => Object.keys(body).length > 0, "at least one field is required"), response: { 200: dataEnvelope(entrySchema), ...errorResponses } } }, - async (request) => ({ - data: present(await entriesService.update(actorOf(request), request.params.roundId, request.params.entryId, request.body)) - }) + async (request) => ({ data: present(await entriesService.update(request.params.roundId, request.params.entryId, request.body)) }) ); application.patch( @@ -153,36 +154,13 @@ export const entriesRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer } } }, async (request, reply) => { - await entriesService.delete(actorOf(request), request.params.roundId, request.params.entryId); + await entriesService.delete(request.params.roundId, request.params.entryId); return reply.status(204).send(null); } ); - - application.get( - "/users/me/entries", - { - preHandler: requireUser(), - schema: { - tags: ["Entries"], - summary: "List all entries submitted by the authenticated user across rounds.", - security, - response: { 200: dataEnvelope(z.array(entrySchema)), ...errorResponses } - } - }, - async (request) => { - const user = currentUser(request); - const rows = await entriesService.listByAuthor(user.id); - return { data: rows.map(present) }; - } - ); }; -export function toEntryResponse( - item: EntryWithAuthor | EntryRecord, - storage: ObjectStorage -): z.infer { - const entry = "entry" in item ? item.entry : item; - const author = "author" in item && item.author !== null ? toUserSummary(item.author) : null; +export function toEntryResponse(entry: EntryRecord, storage: ObjectStorage): z.infer { return { id: entry.id, roundId: entry.roundId, @@ -191,9 +169,7 @@ export function toEntryResponse( status: entry.status, isQuarantined: entry.isQuarantined, mediaUrl: entry.mediaKey === null ? null : storage.getPublicUrl(StorageBucket.Media, entry.mediaKey), - aiFlags: entry.aiFlags ?? [], submittedBy: entry.submittedBy, - author, createdAt: toIso(entry.createdAt), updatedAt: toIso(entry.updatedAt) }; diff --git a/apps/api/src/Modules/Entries/EntriesService.ts b/apps/api/src/Modules/Entries/EntriesService.ts index caab7ec..e88496d 100644 --- a/apps/api/src/Modules/Entries/EntriesService.ts +++ b/apps/api/src/Modules/Entries/EntriesService.ts @@ -1,19 +1,12 @@ -import { and, count, desc, eq, inArray, ne, type SQL } from "drizzle-orm"; +import { and, count, desc, eq, type SQL } from "drizzle-orm"; import { ConflictError, ErrorCode, ForbiddenError, NotFoundError } from "../../Common/Errors/ApplicationError.js"; import { createPage, offsetOf, type Page, type PaginationQuery } from "../../Common/Http/Schemas.js"; import type { Actor, AuthenticatedUser } from "../../Common/Security/Principal.js"; -import { EntryStatus, PollType, RoundStatus } from "../../Domain/Enums.js"; +import { EntryStatus, RoundStatus } from "../../Domain/Enums.js"; import { hasAtLeast, Role } from "../../Domain/Roles.js"; import type { StorageConfiguration } from "../../Configuration/ApplicationConfiguration.js"; import { isForeignKeyViolation, type Database, type Transaction } from "../../Infrastructure/Database/Database.js"; -import { - deletedStorageObjects, - entries, - users, - votingRounds, - type EntryRecord, - type VotingRoundRecord -} from "../../Infrastructure/Database/Schema.js"; +import { entries, users, votingRounds, type EntryRecord, type VotingRoundRecord } from "../../Infrastructure/Database/Schema.js"; import { NotificationType, personOfActor, @@ -21,10 +14,9 @@ import { roundReferenceOf, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; -import { StorageBucket, type ObjectStorage } from "../../Infrastructure/Storage/ObjectStorage.js"; +import type { ObjectStorage } from "../../Infrastructure/Storage/ObjectStorage.js"; import type { LeaderboardCache } from "../Leaderboards/LeaderboardCache.js"; import { canSeeDrafts } from "../Rounds/RoundVisibility.js"; -import { inspectMediaAiSignatures } from "../Uploads/AiMetadataDetector.js"; import { assertUploadedMedia } from "../Uploads/MediaPolicy.js"; export interface EntryListQuery extends PaginationQuery { @@ -43,25 +35,7 @@ export interface UpdateEntryInput { readonly mediaKey?: string | null; } -const submissionStatuses: readonly RoundStatus[] = [RoundStatus.Open]; -const maxApprovedEntriesPerRound = 5; - -export interface EntryWithAuthor { - readonly entry: EntryRecord; - readonly author: { - readonly id: string; - readonly discordId: string | null; - readonly discordUsername: string; - readonly discordAvatar: string | null; - } | null; -} - -const authorColumns = { - id: users.id, - discordId: users.discordId, - discordUsername: users.discordUsername, - discordAvatar: users.discordAvatar -}; +const submissionStatuses: readonly RoundStatus[] = [RoundStatus.Draft, RoundStatus.Open]; export class EntriesService { public constructor( @@ -72,7 +46,7 @@ export class EntriesService { private readonly leaderboardCache: LeaderboardCache ) {} - public async list(roundId: string, query: EntryListQuery, viewer: AuthenticatedUser | null): Promise> { + public async list(roundId: string, query: EntryListQuery, viewer: AuthenticatedUser | null): Promise> { const round = await this.requireRound(this.database, roundId); if (round.status === RoundStatus.Draft && !canSeeDrafts(viewer)) { throw new NotFoundError("Round"); @@ -87,9 +61,8 @@ export class EntriesService { const filter = and(...conditions); const [rows, totals] = await Promise.all([ this.database - .select({ entry: entries, author: authorColumns }) + .select() .from(entries) - .leftJoin(users, eq(users.id, entries.submittedBy)) .where(filter) .orderBy(desc(entries.createdAt), desc(entries.id)) .limit(query.perPage) @@ -99,75 +72,32 @@ export class EntriesService { return createPage(rows, totals[0]?.total ?? 0, query); } - public async get(roundId: string, entryId: string, viewer: AuthenticatedUser | null): Promise { + public async get(roundId: string, entryId: string, viewer: AuthenticatedUser | null): Promise { const round = await this.requireRound(this.database, roundId); - const [row] = await this.database - .select({ entry: entries, author: authorColumns }) - .from(entries) - .leftJoin(users, eq(users.id, entries.submittedBy)) - .where(and(eq(entries.roundId, roundId), eq(entries.id, entryId))) - .limit(1); - if (row === undefined) { - throw new NotFoundError("Entry"); - } + const entry = await this.requireEntry(this.database, roundId, entryId); const isVisible = - (row.entry.status === EntryStatus.Approved && - !row.entry.isQuarantined && + (entry.status === EntryStatus.Approved && + !entry.isQuarantined && (round.status !== RoundStatus.Draft || canSeeDrafts(viewer))) || - (viewer !== null && (hasAtLeast(viewer.role, Role.Moderator) || row.entry.submittedBy === viewer.id)); + (viewer !== null && (hasAtLeast(viewer.role, Role.Moderator) || entry.submittedBy === viewer.id)); if (!isVisible) { throw new NotFoundError("Entry"); } - return row; - } - - public async listByAuthor(userId: string): Promise { - return this.database - .select({ entry: entries, author: authorColumns }) - .from(entries) - .leftJoin(users, eq(users.id, entries.submittedBy)) - .where(eq(entries.submittedBy, userId)) - .orderBy(desc(entries.createdAt)); + return entry; } public async create(author: AuthenticatedUser, roundId: string, input: CreateEntryInput): Promise { if (author.isBlacklisted) { throw new ForbiddenError("Your account is blacklisted from participating in rounds.", ErrorCode.UserBlacklisted); } - let aiFlags: string[] = []; - let aiSnippet: string | null = null; if (input.mediaKey !== null) { await assertUploadedMedia(this.storage, input.mediaKey, author.id, this.storageConfiguration.mediaMaxBytes); - const buffer = await this.storage.getObject(StorageBucket.Media, input.mediaKey, 524288); - const detection = inspectMediaAiSignatures(buffer); - if (detection.flagged) { - aiFlags = [...detection.flags]; - aiSnippet = detection.snippet; - } } + const isStaff = hasAtLeast(author.role, Role.Supervisor); const { entry, round } = await this.database.transaction(async (transaction) => { const lockedRound = await this.requireRound(transaction, roundId, true); - if (lockedRound.pollType === PollType.Binary) { - throw new ForbiddenError("Binary rounds do not accept external entry proposals.", ErrorCode.Forbidden); - } if (!submissionStatuses.includes(lockedRound.status)) { - throw new ConflictError("Entries can only be submitted once the round is open.", ErrorCode.RoundNotOpen); - } - if (!hasAtLeast(author.role, Role.Admin)) { - const [existingActive] = await transaction - .select({ id: entries.id }) - .from(entries) - .where( - and( - eq(entries.roundId, roundId), - eq(entries.submittedBy, author.id), - inArray(entries.status, [EntryStatus.PendingReview, EntryStatus.Approved]) - ) - ) - .limit(1); - if (existingActive !== undefined) { - throw new ConflictError("You already have an active entry for this round.", ErrorCode.Conflict); - } + throw new ConflictError("This round is no longer accepting entries.", ErrorCode.RoundNotOpen); } const [created] = await transaction .insert(entries) @@ -177,8 +107,7 @@ export class EntriesService { description: input.description, mediaKey: input.mediaKey, submittedBy: author.id, - status: EntryStatus.PendingReview, - aiFlags + status: isStaff ? EntryStatus.Approved : EntryStatus.PendingReview }) .returning(); if (created === undefined) { @@ -187,105 +116,50 @@ export class EntriesService { return { entry: created, round: lockedRound }; }); - const mediaUrl = entry.mediaKey === null ? null : this.storage.getPublicUrl(StorageBucket.Media, entry.mediaKey); - + if (entry.status === EntryStatus.Approved) { + await this.leaderboardCache.invalidateRound(roundId); + } this.notifier.notify({ type: NotificationType.EntrySubmitted, round: roundReferenceOf(round), - entry: { id: entry.id, title: entry.title, mediaUrl }, + entry: { id: entry.id, title: entry.title }, status: entry.status, author: personOfUser(author) }); - - if (aiFlags.length > 0) { - this.notifier.notify({ - type: NotificationType.MediaFlaggedAi, - mediaKind: "entry", - targetId: entry.id, - title: entry.title, - author: personOfUser(author), - flags: aiFlags, - snippet: aiSnippet - }); - } return entry; } - public async update(actor: Actor, roundId: string, entryId: string, input: UpdateEntryInput): Promise { - let aiFlags: string[] | undefined = undefined; - let aiSnippet: string | null = null; - if (input.mediaKey !== undefined) { - if (input.mediaKey !== null) { - await assertUploadedMedia(this.storage, input.mediaKey, null, this.storageConfiguration.mediaMaxBytes); - const buffer = await this.storage.getObject(StorageBucket.Media, input.mediaKey, 524288); - const detection = inspectMediaAiSignatures(buffer); - aiFlags = [...detection.flags]; - aiSnippet = detection.snippet; - } else { - aiFlags = []; - } + public async update(roundId: string, entryId: string, input: UpdateEntryInput): Promise { + if (input.mediaKey !== undefined && input.mediaKey !== null) { + await assertUploadedMedia(this.storage, input.mediaKey, null, this.storageConfiguration.mediaMaxBytes); } - const { entry, round } = await this.mutate(roundId, entryId, async (transaction) => { + const entry = await this.mutate(roundId, entryId, async (transaction) => { const [updated] = await transaction .update(entries) .set({ ...(input.title === undefined ? {} : { title: input.title }), ...(input.description === undefined ? {} : { description: input.description }), - ...(input.mediaKey === undefined ? {} : { mediaKey: input.mediaKey }), - ...(aiFlags === undefined ? {} : { aiFlags }) + ...(input.mediaKey === undefined ? {} : { mediaKey: input.mediaKey }) }) .where(eq(entries.id, entryId)) .returning(); return updated; }); await this.leaderboardCache.invalidateRound(roundId); - const mediaUrl = entry.mediaKey === null ? null : this.storage.getPublicUrl(StorageBucket.Media, entry.mediaKey); - this.notifier.notify({ - type: NotificationType.EntryUpdated, - round: roundReferenceOf(round), - entry: { id: entry.id, title: entry.title, mediaUrl }, - actor: personOfActor(actor) - }); - - if (aiFlags !== undefined && aiFlags.length > 0) { - const author = await this.authorOf(entry); - this.notifier.notify({ - type: NotificationType.MediaFlaggedAi, - mediaKind: "entry", - targetId: entry.id, - title: entry.title, - author: author === null ? personOfActor(actor) : { discordId: author.discordId, username: author.discordUsername }, - flags: aiFlags, - snippet: aiSnippet - }); - } - return entry; + return entry.entry; } public async setStatus(actor: Actor, roundId: string, entryId: string, status: EntryStatus): Promise { const { entry, round } = await this.mutate(roundId, entryId, async (transaction) => { - if (status === EntryStatus.Approved) { - const [approvedCount] = await transaction - .select({ total: count() }) - .from(entries) - .where(and(eq(entries.roundId, roundId), eq(entries.status, EntryStatus.Approved), ne(entries.id, entryId))); - if ((approvedCount?.total ?? 0) >= maxApprovedEntriesPerRound) { - throw new ConflictError( - `A round can have a maximum of ${maxApprovedEntriesPerRound} approved entries.`, - ErrorCode.Conflict - ); - } - } const [updated] = await transaction.update(entries).set({ status }).where(eq(entries.id, entryId)).returning(); return updated; }); await this.leaderboardCache.invalidateRound(roundId); const author = await this.authorOf(entry); - const mediaUrl = entry.mediaKey === null ? null : this.storage.getPublicUrl(StorageBucket.Media, entry.mediaKey); this.notifier.notify({ type: NotificationType.EntryStatusChanged, round: roundReferenceOf(round), - entry: { id: entry.id, title: entry.title, mediaUrl }, + entry: { id: entry.id, title: entry.title }, status, author: author === null ? null : personOfUser(author), actor: personOfActor(actor) @@ -295,16 +169,6 @@ export class EntriesService { public async reinstate(actor: Actor, roundId: string, entryId: string): Promise { const { entry, round } = await this.mutate(roundId, entryId, async (transaction) => { - const [approvedCount] = await transaction - .select({ total: count() }) - .from(entries) - .where(and(eq(entries.roundId, roundId), eq(entries.status, EntryStatus.Approved), ne(entries.id, entryId))); - if ((approvedCount?.total ?? 0) >= maxApprovedEntriesPerRound) { - throw new ConflictError( - `A round can have a maximum of ${maxApprovedEntriesPerRound} approved entries.`, - ErrorCode.Conflict - ); - } const [updated] = await transaction .update(entries) .set({ status: EntryStatus.Approved, isQuarantined: false }) @@ -313,33 +177,21 @@ export class EntriesService { return updated; }); await this.leaderboardCache.invalidateRound(roundId); - const mediaUrl = entry.mediaKey === null ? null : this.storage.getPublicUrl(StorageBucket.Media, entry.mediaKey); this.notifier.notify({ type: NotificationType.EntryReinstated, round: roundReferenceOf(round), - entry: { id: entry.id, title: entry.title, mediaUrl }, + entry: { id: entry.id, title: entry.title }, actor: personOfActor(actor) }); return entry; } - public async delete(actor: Actor, roundId: string, entryId: string): Promise { - let deletedEntry: EntryRecord | undefined; - let parentRound: VotingRoundRecord | undefined; + public async delete(roundId: string, entryId: string): Promise { try { - const result = await this.mutate(roundId, entryId, async (transaction, round) => { - if (round.pollType === PollType.Binary) { - throw new ConflictError( - "Entries cannot be individually deleted from binary rounds. Edit the options or delete the round.", - ErrorCode.Conflict - ); - } - const [target] = await transaction.select().from(entries).where(eq(entries.id, entryId)).limit(1); + await this.mutate(roundId, entryId, async (transaction) => { const [deleted] = await transaction.delete(entries).where(eq(entries.id, entryId)).returning(); - return target ?? deleted; + return deleted; }); - deletedEntry = result.entry; - parentRound = result.round; } catch (error: unknown) { if (isForeignKeyViolation(error)) { throw new ConflictError( @@ -350,23 +202,6 @@ export class EntriesService { throw error; } await this.leaderboardCache.invalidateRound(roundId); - if (deletedEntry !== undefined && parentRound !== undefined) { - if (deletedEntry.mediaKey !== null) { - // hold orphaned media for 48h recovery buffer before bucket prune - const scheduledDeleteAt = new Date(Date.now() + 48 * 60 * 60 * 1000); - await this.database.insert(deletedStorageObjects).values({ - bucket: StorageBucket.Media, - objectKey: deletedEntry.mediaKey, - scheduledDeleteAt - }); - } - this.notifier.notify({ - type: NotificationType.EntryDeleted, - round: roundReferenceOf(parentRound), - entry: { id: deletedEntry.id, title: deletedEntry.title, mediaUrl: null }, - actor: personOfActor(actor) - }); - } } private async authorOf(entry: EntryRecord): Promise<{ discordId: string; discordUsername: string } | null> { @@ -384,7 +219,7 @@ export class EntriesService { private async mutate( roundId: string, entryId: string, - operation: (transaction: Transaction, round: VotingRoundRecord) => Promise + operation: (transaction: Transaction) => Promise ): Promise<{ entry: EntryRecord; round: VotingRoundRecord }> { return this.database.transaction(async (transaction) => { const round = await this.requireRound(transaction, roundId, true); @@ -392,7 +227,7 @@ export class EntriesService { throw new ConflictError("Entries of a finalized round cannot be changed.", ErrorCode.RoundFinalized); } await this.requireEntry(transaction, roundId, entryId); - const entry = await operation(transaction, round); + const entry = await operation(transaction); if (entry === undefined) { throw new NotFoundError("Entry"); } diff --git a/apps/api/src/Modules/Health/HealthRoutes.ts b/apps/api/src/Modules/Health/HealthRoutes.ts index bb836ab..89c71d2 100644 --- a/apps/api/src/Modules/Health/HealthRoutes.ts +++ b/apps/api/src/Modules/Health/HealthRoutes.ts @@ -25,46 +25,6 @@ async function withinTimeout(probe: () => Promise): Promise { } } -const detailedHealthSchema = z.object({ - status: z.enum(["ok", "degraded", "unavailable"]), - uptimeSeconds: z.number(), - database: z.object({ - status: z.enum(["ok", "error"]), - latencyMs: z.number() - }), - redis: z.object({ - status: z.enum(["ok", "error"]), - latencyMs: z.number() - }), - discord: z.object({ - status: z.enum(["ok", "error"]), - latencyMs: z.number().nullable() - }), - timestamp: z.string() -}); - -async function timedProbe(probe: () => Promise): Promise<{ status: "ok" | "error"; latencyMs: number }> { - const start = performance.now(); - let timer: NodeJS.Timeout | undefined; - try { - await Promise.race([ - probe(), - new Promise((_resolve, reject) => { - timer = setTimeout(() => { - reject(new Error("probe timed out")); - }, probeTimeoutMs); - }) - ]); - const latencyMs = Math.round((performance.now() - start) * 100) / 100; - return { status: "ok", latencyMs }; - } catch { - const latencyMs = Math.round((performance.now() - start) * 100) / 100; - return { status: "error", latencyMs }; - } finally { - clearTimeout(timer); - } -} - export const healthRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { application.get( "/health/live", @@ -98,83 +58,4 @@ export const healthRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> return reply.status(503).send({ status: "unavailable" as const }); } ); - - application.post( - "/health/bot-heartbeat", - { - config: { rateLimit: false }, - logLevel: "warn", - schema: { - tags: ["Health"], - summary: "Heartbeat check-in from the Discord bot.", - body: z.object({ - wsPingMs: z.number().min(0).max(60000) - }), - response: { 200: z.object({ status: z.literal("ok") }) } - } - }, - async (request) => { - const data = JSON.stringify({ - wsPingMs: request.body.wsPingMs, - recordedAt: Date.now() - }); - await services.keyValueStore.set("health:bot-heartbeat", data, 60); - return { status: "ok" as const }; - } - ); - - application.get( - "/health/detailed", - { - config: { rateLimit: false }, - logLevel: "warn", - schema: { - tags: ["Health"], - summary: "Detailed infrastructure probe with latency breakdown.", - response: { 200: detailedHealthSchema, 503: detailedHealthSchema } - } - }, - async (_request, reply) => { - const [dbResult, redisResult, botHeartbeatRaw] = await Promise.all([ - timedProbe(services.databasePing), - timedProbe(() => services.keyValueStore.ping()), - services.keyValueStore.get("health:bot-heartbeat").catch(() => null) - ]); - - let discordResult: { status: "ok" | "error"; latencyMs: number | null } = { - status: "error", - latencyMs: null - }; - - if (botHeartbeatRaw !== null) { - try { - const parsed = JSON.parse(botHeartbeatRaw) as { wsPingMs?: number; recordedAt?: number }; - const isFresh = typeof parsed.recordedAt === "number" && Date.now() - parsed.recordedAt < 30_000; - if (isFresh && typeof parsed.wsPingMs === "number") { - discordResult = { status: "ok", latencyMs: parsed.wsPingMs }; - } - } catch { - // fall back to error status on corrupted cache value - } - } - - const isAllOk = dbResult.status === "ok" && redisResult.status === "ok" && discordResult.status === "ok"; - const isAnyOk = dbResult.status === "ok" || redisResult.status === "ok"; - const overallStatus = isAllOk ? "ok" : isAnyOk ? "degraded" : "unavailable"; - - const payload = { - status: overallStatus as "ok" | "degraded" | "unavailable", - uptimeSeconds: Math.floor(process.uptime()), - database: dbResult, - redis: redisResult, - discord: discordResult, - timestamp: new Date().toISOString() - }; - - if (!isAllOk && !isAnyOk) { - return reply.status(503).send(payload); - } - return payload; - } - ); }; diff --git a/apps/api/src/Modules/Leaderboards/LeaderboardService.ts b/apps/api/src/Modules/Leaderboards/LeaderboardService.ts index 18995ed..ef7fcb4 100644 --- a/apps/api/src/Modules/Leaderboards/LeaderboardService.ts +++ b/apps/api/src/Modules/Leaderboards/LeaderboardService.ts @@ -7,12 +7,11 @@ import { type Ballot, type EntryScoreBreakdown } from "@platform/scoring"; -import { and, eq, isNotNull, lte } from "drizzle-orm"; +import { and, eq } from "drizzle-orm"; import { ConflictError, ErrorCode, NotFoundError } from "../../Common/Errors/ApplicationError.js"; import type { AuthenticatedUser, UserActor } from "../../Common/Security/Principal.js"; import { canSeeDrafts } from "../Rounds/RoundVisibility.js"; import { EntryStatus, RoundStatus } from "../../Domain/Enums.js"; -import { Role } from "../../Domain/Roles.js"; import type { Database, DatabaseExecutor } from "../../Infrastructure/Database/Database.js"; import { ballots, @@ -25,7 +24,6 @@ import { } from "../../Infrastructure/Database/Schema.js"; import { RoundEventType, type EventBus } from "../../Infrastructure/Events/EventBus.js"; import { NotificationType, personOfActor, roundReferenceOf, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; -import { StorageBucket, type ObjectStorage } from "../../Infrastructure/Storage/ObjectStorage.js"; import type { LeaderboardCache } from "./LeaderboardCache.js"; import type { Leaderboard, LeaderboardItem } from "./LeaderboardTypes.js"; @@ -43,8 +41,7 @@ export class LeaderboardService { private readonly database: Database, private readonly cache: LeaderboardCache, private readonly eventBus: EventBus, - private readonly notifier: Notifier, - private readonly storage?: ObjectStorage + private readonly notifier: Notifier ) {} public async getLive(roundId: string, viewer: AuthenticatedUser | null): Promise { @@ -87,8 +84,8 @@ export class LeaderboardService { if (locked.status === RoundStatus.Finalized) { throw new ConflictError("The round has already been finalized.", ErrorCode.RoundFinalized); } - if (locked.status !== RoundStatus.Voting) { - throw new ConflictError("The round must be in voting status before finalizing it.", ErrorCode.RoundNotClosed); + if (locked.status !== RoundStatus.Closed) { + throw new ConflictError("Close the round before finalizing it.", ErrorCode.RoundNotClosed); } const standings = await this.computeStandings(transaction, locked); @@ -128,17 +125,6 @@ export class LeaderboardService { }); const winner = result.leaderboard[0]; - let winnerMediaUrl: string | null = null; - if (winner !== undefined && this.storage !== undefined) { - const [winnerEntry] = await this.database - .select({ mediaKey: entries.mediaKey }) - .from(entries) - .where(eq(entries.id, winner.entryId)) - .limit(1); - if (winnerEntry?.mediaKey) { - winnerMediaUrl = this.storage.getPublicUrl(StorageBucket.Media, winnerEntry.mediaKey); - } - } this.notifier.notify({ type: NotificationType.RoundFinalized, round: roundReferenceOf(round), @@ -149,7 +135,6 @@ export class LeaderboardService { : { entryId: winner.entryId, title: winner.title, - mediaUrl: winnerMediaUrl, rawScore: winner.rawScore, voteSharePercentage: winner.voteSharePercentage, regularizedTotalScore: winner.regularizedTotalScore @@ -159,38 +144,6 @@ export class LeaderboardService { return result; } - public async finalizeExpired(): Promise<{ finalizedCount: number; roundIds: string[] }> { - const now = new Date(); - const expired = await this.database - .select({ id: votingRounds.id, createdBy: votingRounds.createdBy }) - .from(votingRounds) - .where( - and( - eq(votingRounds.status, RoundStatus.Voting), - isNotNull(votingRounds.closesAt), - lte(votingRounds.closesAt, now) - ) - ); - - const finalizedRoundIds: string[] = []; - for (const round of expired) { - try { - // system actor for automated round conclusion - const systemActor: UserActor = { - userId: round.createdBy, - role: Role.Admin, - displayName: "System", - discordId: "0" - }; - await this.finalize(systemActor, round.id); - finalizedRoundIds.push(round.id); - } catch { - // skip if already finalized or locked concurrently - } - } - return { finalizedCount: finalizedRoundIds.length, roundIds: finalizedRoundIds }; - } - private async computeStandings(executor: DatabaseExecutor, round: VotingRoundRecord): Promise { const scheme = getScoringScheme(round.pollType); const [entryRows, ballotRows] = await Promise.all([ diff --git a/apps/api/src/Modules/Pipeline/PipelineRoutes.ts b/apps/api/src/Modules/Pipeline/PipelineRoutes.ts deleted file mode 100644 index 768c886..0000000 --- a/apps/api/src/Modules/Pipeline/PipelineRoutes.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { NotificationType, pipelineProgressSchema } from "@platform/contracts"; -import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; -import { z } from "zod"; -import { dataEnvelope, errorResponses } from "../../Common/Http/Schemas.js"; -import { actorOf, optionalUser, requireRoleOrService } from "../../Common/Security/Authorization.js"; -import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; -import { Role } from "../../Domain/Roles.js"; -import { pipelineProgress, type PipelineProgressRecord } from "../../Infrastructure/Database/Schema.js"; -import { personOfActor } from "../../Infrastructure/Notifications/Notification.js"; - -const defaultProgress = { - stepIndex: 0, - stepId: "0.1", - stepTitle: "Story Pitching", - phaseNumber: 0, - phaseTitle: "Phase 0: Pre-Production", - progressPercent: 3, - isPhaseTransition: false, - updatedAt: null -}; - -function toPipelineProgressResponse(record: PipelineProgressRecord): z.infer { - return { - stepIndex: record.stepIndex, - stepId: record.stepId, - stepTitle: record.stepTitle, - phaseNumber: record.phaseNumber, - phaseTitle: record.phaseTitle, - progressPercent: record.progressPercent, - isPhaseTransition: record.isPhaseTransition, - updatedAt: record.updatedAt.toISOString() - }; -} - -export const updatePipelineProgressSchema = z.object({ - stepIndex: z.number().int().min(0), - stepId: z.string().max(32), - stepTitle: z.string().max(128), - phaseNumber: z.number().int().min(0), - phaseTitle: z.string().max(128), - progressPercent: z.number().min(0).max(100), - isPhaseTransition: z.boolean() -}); - -export const pipelineRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { - const { database, notifier } = services; - const security = [{ bearer: [] }]; - const supervisor = requireRoleOrService(Role.Supervisor); - - application.get( - "/pipeline", - { - schema: { - tags: ["Pipeline"], - summary: "Current production roadmap progress.", - response: { 200: dataEnvelope(pipelineProgressSchema), ...errorResponses } - } - }, - async () => { - const [record] = await database.select().from(pipelineProgress).limit(1); - return { data: record === undefined ? defaultProgress : toPipelineProgressResponse(record) }; - } - ); - - application.post( - "/pipeline/progress", - { - preHandler: supervisor, - schema: { - tags: ["Pipeline"], - summary: "Advance the production pipeline stage and broadcast Discord announcement.", - security, - body: updatePipelineProgressSchema, - response: { 200: dataEnvelope(pipelineProgressSchema), ...errorResponses } - } - }, - async (request) => { - const values = { ...request.body, updatedBy: optionalUser(request)?.id ?? null }; - const [record] = await database - .insert(pipelineProgress) - .values({ id: 1, ...values }) - .onConflictDoUpdate({ target: pipelineProgress.id, set: { ...values, updatedAt: new Date() } }) - .returning(); - if (record === undefined) { - throw new Error("Pipeline progress upsert returned no row."); - } - - notifier.notify({ - type: NotificationType.PipelineUpdated, - stepId: record.stepId, - stepTitle: record.stepTitle, - phaseNumber: record.phaseNumber, - phaseTitle: record.phaseTitle, - progressPercent: record.progressPercent, - isPhaseTransition: record.isPhaseTransition, - actor: personOfActor(actorOf(request)) - }); - - return { data: toPipelineProgressResponse(record) }; - } - ); -}; diff --git a/apps/api/src/Modules/Rounds/RoundPresenter.ts b/apps/api/src/Modules/Rounds/RoundPresenter.ts index 05fbcc4..900dd9b 100644 --- a/apps/api/src/Modules/Rounds/RoundPresenter.ts +++ b/apps/api/src/Modules/Rounds/RoundPresenter.ts @@ -7,7 +7,7 @@ export { roundDetailSchema, roundSchema }; export function isAcceptingVotes(round: Pick, now: Date = new Date()): boolean { return ( - round.status === RoundStatus.Voting && + round.status === RoundStatus.Open && (round.opensAt === null || round.opensAt.getTime() <= now.getTime()) && (round.closesAt === null || round.closesAt.getTime() > now.getTime()) ); diff --git a/apps/api/src/Modules/Rounds/RoundVisibility.ts b/apps/api/src/Modules/Rounds/RoundVisibility.ts index fdae747..d887cf9 100644 --- a/apps/api/src/Modules/Rounds/RoundVisibility.ts +++ b/apps/api/src/Modules/Rounds/RoundVisibility.ts @@ -2,5 +2,5 @@ import type { AuthenticatedUser } from "../../Common/Security/Principal.js"; import { hasAtLeast, Role } from "../../Domain/Roles.js"; export function canSeeDrafts(viewer: AuthenticatedUser | null): boolean { - return viewer !== null && hasAtLeast(viewer.role, Role.Supervisor); + return viewer !== null && hasAtLeast(viewer.role, Role.Moderator); } diff --git a/apps/api/src/Modules/Rounds/RoundsRoutes.ts b/apps/api/src/Modules/Rounds/RoundsRoutes.ts index e66ced3..f2c989c 100644 --- a/apps/api/src/Modules/Rounds/RoundsRoutes.ts +++ b/apps/api/src/Modules/Rounds/RoundsRoutes.ts @@ -1,4 +1,3 @@ -import { fieldRules } from "@platform/contracts"; import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; import { z } from "zod"; import { @@ -8,6 +7,7 @@ import { paginationQuerySchema, timestampSchema, toIso, + trimmedText, uuidSchema } from "../../Common/Http/Schemas.js"; import { actorOf, optionalUser, requireRole, userActorOf } from "../../Common/Security/Authorization.js"; @@ -20,7 +20,7 @@ import { roundDetailSchema, roundSchema, toRoundResponse } from "./RoundPresente const roundParams = z.object({ roundId: uuidSchema }); const dateInput = timestampSchema.transform((value) => new Date(value)); -const editableStatus = z.enum(RoundStatus); +const editableStatus = z.enum([RoundStatus.Draft, RoundStatus.Open, RoundStatus.Closed]); function toRoundResultResponse(result: RoundResultRecord): RoundResultResponse { return { @@ -36,19 +36,6 @@ function toRoundResultResponse(result: RoundResultRecord): RoundResultResponse { }; } -const createBinaryChoiceSchema = z.object({ - title: fieldRules.entryTitle, - description: fieldRules.entryDescription.default(null), - mediaKey: z.string().max(255).nullable().default(null) -}); - -const updateBinaryChoiceSchema = z.object({ - id: uuidSchema.optional(), - title: fieldRules.entryTitle, - description: fieldRules.entryDescription.default(null), - mediaKey: z.string().max(255).nullable().optional() -}); - export const roundsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { const { roundsService, leaderboardService } = services; const security = [{ bearer: [] }]; @@ -101,23 +88,12 @@ export const roundsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> tags: ["Rounds"], summary: "Create a voting round in draft status.", security, - body: z - .object({ - title: fieldRules.roundTitle, - pollType: z.enum(PollType).default(PollType.RankedChoice), - opensAt: dateInput.nullable().default(null), - closesAt: dateInput.nullable().default(null), - binaryEntries: z.tuple([createBinaryChoiceSchema, createBinaryChoiceSchema]).optional() - }) - .superRefine((data, ctx) => { - if (data.pollType === PollType.Binary && (!data.binaryEntries || data.binaryEntries.length !== 2)) { - ctx.addIssue({ - code: z.ZodIssueCode.custom, - message: "Binary rounds require exactly two choices (Option A and Option B).", - path: ["binaryEntries"] - }); - } - }), + body: z.object({ + title: trimmedText(255), + pollType: z.enum(PollType).default(PollType.RankedChoice), + opensAt: dateInput.nullable().default(null), + closesAt: dateInput.nullable().default(null) + }), response: { 201: dataEnvelope(roundSchema), ...errorResponses } } }, @@ -138,12 +114,11 @@ export const roundsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> params: roundParams, body: z .object({ - title: fieldRules.roundTitle.optional(), + title: trimmedText(255).optional(), pollType: z.enum(PollType).optional(), status: editableStatus.optional(), opensAt: dateInput.nullable().optional(), - closesAt: dateInput.nullable().optional(), - binaryEntries: z.tuple([updateBinaryChoiceSchema, updateBinaryChoiceSchema]).optional() + closesAt: dateInput.nullable().optional() }) .refine((body) => Object.keys(body).length > 0, "at least one field is required"), response: { 200: dataEnvelope(roundSchema), ...errorResponses } @@ -168,7 +143,7 @@ export const roundsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> } }, async (request, reply) => { - await roundsService.delete(actorOf(request), request.params.roundId); + await roundsService.delete(request.params.roundId); return reply.status(204).send(null); } ); diff --git a/apps/api/src/Modules/Rounds/RoundsService.ts b/apps/api/src/Modules/Rounds/RoundsService.ts index 1908d86..87ea50a 100644 --- a/apps/api/src/Modules/Rounds/RoundsService.ts +++ b/apps/api/src/Modules/Rounds/RoundsService.ts @@ -1,13 +1,11 @@ -import { validateRoundWindow } from "@platform/contracts"; import { and, count, desc, eq, ne, type SQL } from "drizzle-orm"; -import { ConflictError, ErrorCode, ForbiddenError, NotFoundError, UnprocessableError } from "../../Common/Errors/ApplicationError.js"; +import { ConflictError, ErrorCode, NotFoundError, UnprocessableError } from "../../Common/Errors/ApplicationError.js"; import { createPage, offsetOf, toIso, type Page, type PaginationQuery } from "../../Common/Http/Schemas.js"; import type { Actor, AuthenticatedUser, UserActor } from "../../Common/Security/Principal.js"; import { canSeeDrafts } from "./RoundVisibility.js"; -import { EntryStatus, PollType, RoundStatus } from "../../Domain/Enums.js"; -import { hasAtLeast, Role } from "../../Domain/Roles.js"; +import { EntryStatus, type PollType, RoundStatus } from "../../Domain/Enums.js"; import type { Database, DatabaseExecutor } from "../../Infrastructure/Database/Database.js"; -import { ballots, entries, roundResults, users, votingRounds, type VotingRoundRecord } from "../../Infrastructure/Database/Schema.js"; +import { ballots, entries, users, votingRounds, type VotingRoundRecord } from "../../Infrastructure/Database/Schema.js"; import { NotificationType, personOfActor, roundReferenceOf, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; import type { LeaderboardCache } from "../Leaderboards/LeaderboardCache.js"; @@ -15,34 +13,19 @@ export interface RoundListQuery extends PaginationQuery { readonly status?: RoundStatus; } -export interface BinaryEntryInput { - readonly title: string; - readonly description?: string | null; - readonly mediaKey?: string | null; -} - -export interface BinaryEntryUpdateInput { - readonly id?: string; - readonly title: string; - readonly description?: string | null; - readonly mediaKey?: string | null; -} - export interface CreateRoundInput { readonly title: string; readonly pollType: PollType; readonly opensAt: Date | null; readonly closesAt: Date | null; - readonly binaryEntries?: readonly [BinaryEntryInput, BinaryEntryInput]; } export interface UpdateRoundInput { readonly title?: string; readonly pollType?: PollType; - readonly status?: RoundStatus; + readonly status?: RoundStatus.Draft | RoundStatus.Open | RoundStatus.Closed; readonly opensAt?: Date | null; readonly closesAt?: Date | null; - readonly binaryEntries?: readonly [BinaryEntryUpdateInput, BinaryEntryUpdateInput]; } export interface RoundDetail { @@ -52,18 +35,12 @@ export interface RoundDetail { readonly warnings: readonly string[]; } -function isAllowedTransition(pollType: PollType, from: RoundStatus, to: RoundStatus): boolean { - if (pollType === PollType.Binary) { - if (from === RoundStatus.Draft && (to === RoundStatus.Voting || to === RoundStatus.Open)) return true; - if (from === RoundStatus.Open && to === RoundStatus.Voting) return true; - if (from === RoundStatus.Voting && to === RoundStatus.Finalized) return true; - return false; - } - if (from === RoundStatus.Draft && to === RoundStatus.Open) return true; - if (from === RoundStatus.Open && to === RoundStatus.Voting) return true; - if (from === RoundStatus.Voting && to === RoundStatus.Finalized) return true; - return false; -} +const allowedTransitions: Readonly> = { + [RoundStatus.Draft]: [RoundStatus.Open, RoundStatus.Closed], + [RoundStatus.Open]: [RoundStatus.Closed], + [RoundStatus.Closed]: [RoundStatus.Open], + [RoundStatus.Finalized]: [] +}; const recommendedMaximumEntries = 5; @@ -131,43 +108,20 @@ export class RoundsService { } public async create(actor: UserActor, input: CreateRoundInput): Promise { - this.assertCanInitiate(actor, input.pollType); - this.assertWindow(input.opensAt, input.closesAt, true); - if (input.pollType === PollType.Binary) { - if (!input.binaryEntries || input.binaryEntries.length !== 2) { - throw new UnprocessableError("Binary rounds require exactly 2 entries upon creation.", ErrorCode.ValidationFailed); - } + this.assertWindow(input.opensAt, input.closesAt); + const [round] = await this.database + .insert(votingRounds) + .values({ + title: input.title, + pollType: input.pollType, + opensAt: input.opensAt, + closesAt: input.closesAt, + createdBy: actor.userId + }) + .returning(); + if (round === undefined) { + throw new Error("Round insert returned no row."); } - const round = await this.database.transaction(async (transaction) => { - const [created] = await transaction - .insert(votingRounds) - .values({ - title: input.title, - pollType: input.pollType, - opensAt: input.opensAt, - closesAt: input.closesAt, - createdBy: actor.userId - }) - .returning(); - if (created === undefined) { - throw new Error("Round insert returned no row."); - } - if (input.pollType === PollType.Binary && input.binaryEntries) { - for (const choice of input.binaryEntries) { - await transaction.insert(entries).values({ - roundId: created.id, - title: choice.title, - description: choice.description ?? null, - mediaKey: choice.mediaKey ?? null, - submittedBy: actor.userId, - status: EntryStatus.Approved, - isQuarantined: false - }); - } - } - return created; - }); - this.notifier.notify({ type: NotificationType.RoundCreated, round: roundReferenceOf(round), @@ -184,96 +138,25 @@ export class RoundsService { if (current === undefined) { throw new NotFoundError("Round"); } - if (current.status === RoundStatus.Finalized && !hasAtLeast(actor.role, Role.Admin)) { + if (current.status === RoundStatus.Finalized) { throw new ConflictError("Finalized rounds cannot be modified.", ErrorCode.RoundFinalized); } if ( input.status !== undefined && input.status !== current.status && - !isAllowedTransition(current.pollType, current.status, input.status) + !allowedTransitions[current.status].includes(input.status) ) { - if (!hasAtLeast(actor.role, Role.Admin)) { - throw new ConflictError( - `A round cannot move from ${current.status} to ${input.status}. Backtracking round states is not allowed.`, - ErrorCode.InvalidStatusTransition - ); - } - } - if (current.status === RoundStatus.Finalized && input.status !== undefined && input.status !== RoundStatus.Finalized) { - // remove stale certified results when un-finalizing - await transaction.delete(roundResults).where(eq(roundResults.roundId, roundId)); - } - if (input.status === RoundStatus.Voting && (current.status === RoundStatus.Open || current.status === RoundStatus.Draft)) { - const [approvedCount] = await transaction - .select({ total: count() }) - .from(entries) - .where(and(eq(entries.roundId, roundId), eq(entries.status, EntryStatus.Approved), eq(entries.isQuarantined, false))); - const totalApproved = approvedCount?.total ?? 0; - if (current.pollType === PollType.Binary && totalApproved !== 2) { - throw new ConflictError( - "A binary round requires exactly 2 approved entries to proceed to voting.", - ErrorCode.Conflict - ); - } - if (current.pollType === PollType.RankedChoice && totalApproved !== 5) { - throw new ConflictError( - "A ranked-choice round requires exactly 5 approved entries to proceed to voting.", - ErrorCode.Conflict - ); - } - } - if (input.pollType !== undefined && input.pollType !== current.pollType) { - if (current.status !== RoundStatus.Draft && !hasAtLeast(actor.role, Role.Admin)) { - throw new ConflictError( - "The poll type can only be changed while the round is a draft.", - ErrorCode.InvalidStatusTransition - ); - } - this.assertCanInitiate(actor, input.pollType); + throw new ConflictError( + `A round cannot move from ${current.status} to ${input.status}.`, + ErrorCode.InvalidStatusTransition + ); } - if ( - input.opensAt !== undefined && - current.status !== RoundStatus.Draft && - input.opensAt?.getTime() !== current.opensAt?.getTime() - ) { - if (!hasAtLeast(actor.role, Role.Admin)) { - throw new ConflictError("Start date cannot be modified once a round leaves draft.", ErrorCode.InvalidStatusTransition); - } + if (input.pollType !== undefined && input.pollType !== current.pollType && current.status !== RoundStatus.Draft) { + throw new ConflictError("The poll type can only be changed while the round is a draft.", ErrorCode.InvalidStatusTransition); } const opensAt = input.opensAt === undefined ? current.opensAt : input.opensAt; const closesAt = input.closesAt === undefined ? current.closesAt : input.closesAt; - this.assertWindow(opensAt, closesAt, current.status === RoundStatus.Draft || hasAtLeast(actor.role, Role.Admin)); - - if (input.binaryEntries !== undefined) { - if (current.pollType !== PollType.Binary) { - throw new ConflictError("Option pairs can only be updated for binary rounds.", ErrorCode.Conflict); - } - if (current.status === RoundStatus.Finalized && !hasAtLeast(actor.role, Role.Admin)) { - throw new ConflictError("Finalized rounds cannot be modified.", ErrorCode.RoundFinalized); - } - const currentEntries = await transaction - .select() - .from(entries) - .where(eq(entries.roundId, roundId)) - .orderBy(entries.createdAt, entries.id); - - if (currentEntries.length === 2) { - for (let i = 0; i < 2; i++) { - const entryRecord = currentEntries[i]; - const updateItem = input.binaryEntries[i]; - if (entryRecord && updateItem) { - await transaction - .update(entries) - .set({ - title: updateItem.title, - description: updateItem.description ?? null, - ...(updateItem.mediaKey !== undefined ? { mediaKey: updateItem.mediaKey } : {}) - }) - .where(eq(entries.id, updateItem.id ?? entryRecord.id)); - } - } - } - } + this.assertWindow(opensAt, closesAt); const [updated] = await transaction .update(votingRounds) @@ -293,21 +176,6 @@ export class RoundsService { }); await this.leaderboardCache.invalidateRound(roundId); - const metadataChanged = - before.title !== after.title || - before.pollType !== after.pollType || - before.opensAt?.getTime() !== after.opensAt?.getTime() || - before.closesAt?.getTime() !== after.closesAt?.getTime(); - - if (metadataChanged) { - this.notifier.notify({ - type: NotificationType.RoundUpdated, - round: roundReferenceOf(after), - actor: personOfActor(actor), - opensAt: toIso(after.opensAt), - closesAt: toIso(after.closesAt) - }); - } if (before.status !== after.status) { this.notifier.notify({ type: NotificationType.RoundStatusChanged, @@ -320,42 +188,28 @@ export class RoundsService { return after; } - public async delete(actor: Actor, roundId: string): Promise { - let deletedRound: VotingRoundRecord | undefined; + public async delete(roundId: string): Promise { await this.database.transaction(async (transaction) => { const [current] = await transaction.select().from(votingRounds).where(eq(votingRounds.id, roundId)).limit(1).for("update"); if (current === undefined) { throw new NotFoundError("Round"); } - if (current.status === RoundStatus.Finalized && !hasAtLeast(actor.role, Role.Admin)) { + if (current.status === RoundStatus.Finalized) { throw new ConflictError( "Finalized rounds are part of the permanent record and cannot be deleted.", ErrorCode.RoundFinalized ); } await transaction.delete(votingRounds).where(eq(votingRounds.id, roundId)); - deletedRound = current; }); await this.leaderboardCache.invalidateRound(roundId); - if (deletedRound !== undefined) { - this.notifier.notify({ - type: NotificationType.RoundDeleted, - round: roundReferenceOf(deletedRound), - actor: personOfActor(actor) - }); - } - } - - private assertCanInitiate(actor: Actor, pollType: PollType): void { - if (pollType === PollType.Binary && !hasAtLeast(actor.role, Role.Supervisor)) { - throw new ForbiddenError("Binary voting rounds can only be initiated by supervisors and administrators."); - } } - private assertWindow(opensAt: Date | null, closesAt: Date | null, isDraft: boolean): void { - const problem = validateRoundWindow(opensAt, closesAt, { isDraft }); - if (problem !== null) { - throw new UnprocessableError(problem, ErrorCode.ValidationFailed, [{ path: "body.closesAt", message: problem }]); + private assertWindow(opensAt: Date | null, closesAt: Date | null): void { + if (opensAt !== null && closesAt !== null && closesAt.getTime() <= opensAt.getTime()) { + throw new UnprocessableError("closesAt must be later than opensAt.", ErrorCode.ValidationFailed, [ + { path: "body.closesAt", message: "must be later than opensAt" } + ]); } } } diff --git a/apps/api/src/Modules/Shots/ShotsRoutes.ts b/apps/api/src/Modules/Shots/ShotsRoutes.ts index 063b4e9..81bf659 100644 --- a/apps/api/src/Modules/Shots/ShotsRoutes.ts +++ b/apps/api/src/Modules/Shots/ShotsRoutes.ts @@ -1,8 +1,16 @@ -import { fieldRules, reviewQueueItemSchema, shotDetailSchema, shotSchema, submissionSchema } from "@platform/contracts"; +import { reviewQueueItemSchema, shotDetailSchema, shotSchema, submissionSchema } from "@platform/contracts"; import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; import { z } from "zod"; -import { dataEnvelope, errorResponses, pageEnvelope, paginationQuerySchema, toIso, uuidSchema } from "../../Common/Http/Schemas.js"; -import { currentUser, optionalUser, requireRole, requireUser, userActorOf } from "../../Common/Security/Authorization.js"; +import { + dataEnvelope, + errorResponses, + pageEnvelope, + paginationQuerySchema, + toIso, + trimmedText, + uuidSchema +} from "../../Common/Http/Schemas.js"; +import { currentUser, optionalUser, requireRole, userActorOf } from "../../Common/Security/Authorization.js"; import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; import { DeliverableKind, DifficultyTier, ReviewDecision, ShotStatus } from "../../Domain/Enums.js"; import { Role } from "../../Domain/Roles.js"; @@ -12,17 +20,13 @@ import { toPresignedUploadResponse } from "../Uploads/UploadsRoutes.js"; import { presignedUploadSchema } from "@platform/contracts"; import { consumeUploadQuota, UploadQuota } from "../Uploads/UploadQuota.js"; import { deliverableContentTypes, tierDaysOf } from "./DeliverablePolicy.js"; -import { StorageBucket, type ObjectStorage } from "../../Infrastructure/Storage/ObjectStorage.js"; import type { ShotListItem, SubmissionView } from "./ShotsService.js"; import type { ReviewQueueItem } from "./ReviewsService.js"; const shotParams = z.object({ shotId: uuidSchema }); const allDeliverableTypes = [...new Set(Object.values(deliverableContentTypes).flat())] as [string, ...string[]]; -function toShotCore( - shot: ShotRecord, - storage: ObjectStorage -): Omit, "claimer" | "latestSubmission" | "isSeniorLocked"> { +function toShotCore(shot: ShotRecord): Omit, "claimer" | "latestSubmission" | "isSeniorLocked"> { return { id: shot.id, roundId: shot.roundId, @@ -36,17 +40,14 @@ function toShotCore( claimedAt: toIso(shot.claimedAt), deadlineAt: toIso(shot.deadlineAt), seniorPriorityUntil: toIso(shot.seniorPriorityUntil), - imageUrls: (shot.imageKeys ?? []) - .map((key) => storage.getPublicUrl(StorageBucket.Media, key)) - .filter((url): url is string => url !== null), createdAt: toIso(shot.createdAt), updatedAt: toIso(shot.updatedAt) }; } -function toShotResponse(item: ShotListItem, storage: ObjectStorage): z.infer { +function toShotResponse(item: ShotListItem): z.infer { return { - ...toShotCore(item.shot, storage), + ...toShotCore(item.shot), claimer: item.claimer === null ? null : toUserSummary(item.claimer), isSeniorLocked: item.isSeniorLocked, latestSubmission: item.latestSubmission @@ -69,19 +70,19 @@ function toSubmissionResponse( reviewedAt: toIso(submission.reviewedAt), videoUrl: view.videoUrl, blendUrl: view.blendUrl, - aiFlags: submission.aiFlags ?? [], createdAt: toIso(submission.createdAt) }; } -function toReviewQueueResponse(item: ReviewQueueItem, storage: ObjectStorage): z.infer { - return { ...toSubmissionResponse({ ...item, reviewer: null }), shot: toShotCore(item.shot, storage) }; +function toReviewQueueResponse(item: ReviewQueueItem): z.infer { + return { ...toSubmissionResponse({ ...item, reviewer: null }), shot: toShotCore(item.shot) }; } export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { - const { shotsService, reviewsService, objectStorage, configuration } = services; + const { shotsService, reviewsService, configuration } = services; const security = [{ bearer: [] }]; const supervisor = requireRole(Role.Supervisor); + const contributor = requireRole(Role.Contributor); application.get( "/shots", @@ -99,24 +100,7 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> }, async (request) => { const page = await shotsService.list(request.query, optionalUser(request)); - return { data: page.data.map((item) => toShotResponse(item, objectStorage)), meta: page.meta }; - } - ); - - application.get( - "/shots/by-code/:shotCode", - { - schema: { - tags: ["Shots"], - summary: "Get a shot by code.", - params: z.object({ shotCode: z.string().min(1).max(50) }), - response: { 200: dataEnvelope(shotSchema), ...errorResponses } - } - }, - async (request, reply) => { - const item = await shotsService.getByCode(request.params.shotCode, optionalUser(request)); - void reply.header("Cache-Control", "private, no-store"); - return { data: toShotResponse(item, objectStorage) }; + return { data: page.data.map(toShotResponse), meta: page.meta }; } ); @@ -133,12 +117,7 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> async (request, reply) => { const detail = await shotsService.getDetail(request.params.shotId, optionalUser(request)); void reply.header("Cache-Control", "private, no-store"); - return { - data: { - ...toShotResponse(detail, objectStorage), - submissions: detail.submissions.map(toSubmissionResponse) - } - }; + return { data: { ...toShotResponse(detail), submissions: detail.submissions.map(toSubmissionResponse) } }; } ); @@ -153,21 +132,18 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> body: z.object({ roundId: uuidSchema.nullable().default(null), sceneNumber: z.number().int().positive().max(100_000), - shotCode: fieldRules.shotCode, - title: fieldRules.shotTitle, - description: fieldRules.shotDescription.default(null), + shotCode: trimmedText(50), + title: trimmedText(255), + description: trimmedText(5000).nullable().default(null), difficultyTier: z.enum(DifficultyTier), - seniorPriorityHours: z.number().int().min(0).max(168).default(0), - imageKeys: fieldRules.shotImageKeys.default([]) + seniorPriorityHours: z.number().int().min(0).max(168).default(0) }), response: { 201: dataEnvelope(shotSchema), ...errorResponses } } }, async (request, reply) => { const shot = await shotsService.create(request.body); - return reply.status(201).send({ - data: toShotResponse({ shot, claimer: null, latestSubmission: null, isSeniorLocked: false }, objectStorage) - }); + return reply.status(201).send({ data: toShotResponse({ shot, claimer: null, latestSubmission: null, isSeniorLocked: false }) }); } ); @@ -184,11 +160,10 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> .object({ roundId: uuidSchema.nullable().optional(), sceneNumber: z.number().int().positive().max(100_000).optional(), - shotCode: fieldRules.shotCode.optional(), - title: fieldRules.shotTitle.optional(), - description: fieldRules.shotDescription.optional(), - difficultyTier: z.enum(DifficultyTier).optional(), - imageKeys: fieldRules.shotImageKeys.optional() + shotCode: trimmedText(50).optional(), + title: trimmedText(255).optional(), + description: trimmedText(5000).nullable().optional(), + difficultyTier: z.enum(DifficultyTier).optional() }) .refine((body) => Object.keys(body).length > 0, "at least one field is required"), response: { 200: dataEnvelope(shotSchema), ...errorResponses } @@ -196,9 +171,7 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> }, async (request) => { await shotsService.update(request.params.shotId, request.body); - return { - data: toShotResponse(await shotsService.getDetail(request.params.shotId, currentUser(request)), objectStorage) - }; + return { data: toShotResponse(await shotsService.getDetail(request.params.shotId, currentUser(request))) }; } ); @@ -223,10 +196,10 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> application.post( "/shots/:shotId/claim", { - preHandler: requireUser(), + preHandler: contributor, schema: { tags: ["Shots"], - summary: "Claim an available shot. Users may hold one active claim at a time.", + summary: "Claim an available shot. Contributors may hold one active claim at a time.", security, params: shotParams, response: { 200: dataEnvelope(shotSchema), ...errorResponses } @@ -235,34 +208,34 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> async (request) => { const user = currentUser(request); await shotsService.claim(user, request.params.shotId); - return { data: toShotResponse(await shotsService.getDetail(request.params.shotId, user), objectStorage) }; + return { data: toShotResponse(await shotsService.getDetail(request.params.shotId, user)) }; } ); application.post( "/shots/:shotId/release", { - preHandler: requireUser(), + preHandler: contributor, schema: { tags: ["Shots"], summary: "Return a claimed shot to the pool.", security, params: shotParams, - body: z.object({ reason: fieldRules.reason.default(null) }).default({ reason: null }), + body: z.object({ reason: trimmedText(500).nullable().default(null) }).default({ reason: null }), response: { 200: dataEnvelope(shotSchema), ...errorResponses } } }, async (request) => { const user = currentUser(request); await shotsService.release(user, request.params.shotId, request.body.reason); - return { data: toShotResponse(await shotsService.getDetail(request.params.shotId, user), objectStorage) }; + return { data: toShotResponse(await shotsService.getDetail(request.params.shotId, user)) }; } ); application.post( "/shots/:shotId/uploads", { - preHandler: requireUser(), + preHandler: contributor, config: { rateLimit: { max: 30, timeWindow: "1 minute" } }, schema: { tags: ["Shots"], @@ -289,16 +262,16 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> application.post( "/shots/:shotId/submissions", { - preHandler: requireUser(), + preHandler: contributor, schema: { tags: ["Shots"], - summary: "Submit uploaded deliverables for review. Submitting grants the contributor role.", + summary: "Submit uploaded deliverables for review.", security, params: shotParams, body: z.object({ videoKey: z.string().min(1).max(512), - blendKey: z.string().min(1).max(512), - notes: fieldRules.workNotes.default(null) + blendKey: z.string().min(1).max(512).nullable().default(null), + notes: trimmedText(2000).nullable().default(null) }), response: { 201: dataEnvelope(submissionSchema), ...errorResponses } } @@ -349,7 +322,7 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> async (request, reply) => { const page = await reviewsService.queue(request.query); void reply.header("Cache-Control", "private, no-store"); - return { data: page.data.map((item) => toReviewQueueResponse(item, objectStorage)), meta: page.meta }; + return { data: page.data.map(toReviewQueueResponse), meta: page.meta }; } ); @@ -362,7 +335,7 @@ export const shotsRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> summary: "Approve a submission or request a revision.", security, params: z.object({ submissionId: uuidSchema }), - body: z.object({ decision: z.enum(ReviewDecision), notes: fieldRules.reviewNotes.default(null) }), + body: z.object({ decision: z.enum(ReviewDecision), notes: trimmedText(2000).nullable().default(null) }), response: { 200: dataEnvelope(submissionSchema), ...errorResponses } } }, diff --git a/apps/api/src/Modules/Shots/ShotsService.ts b/apps/api/src/Modules/Shots/ShotsService.ts index 3a69088..66a767e 100644 --- a/apps/api/src/Modules/Shots/ShotsService.ts +++ b/apps/api/src/Modules/Shots/ShotsService.ts @@ -12,10 +12,9 @@ import { import { createPage, offsetOf, type Page, type PaginationQuery } from "../../Common/Http/Schemas.js"; import type { AuthenticatedUser } from "../../Common/Security/Principal.js"; import { DeliverableKind, type DifficultyTier, ShotStatus } from "../../Domain/Enums.js"; -import { hasAtLeast, rankOf, Role } from "../../Domain/Roles.js"; +import { hasAtLeast, Role } from "../../Domain/Roles.js"; import { isUniqueViolation, type Database, type Transaction } from "../../Infrastructure/Database/Database.js"; import { - deletedStorageObjects, shots, submissions, users, @@ -34,7 +33,6 @@ import { seniorPriorityTiers, tierDaysOf } from "./DeliverablePolicy.js"; -import { inspectMediaAiSignatures } from "../Uploads/AiMetadataDetector.js"; type UserSummaryRecord = Pick; @@ -71,7 +69,6 @@ export interface CreateShotInput { readonly description: string | null; readonly difficultyTier: DifficultyTier; readonly seniorPriorityHours: number; - readonly imageKeys?: readonly string[]; } export interface UpdateShotInput { @@ -81,7 +78,6 @@ export interface UpdateShotInput { readonly title?: string; readonly description?: string | null; readonly difficultyTier?: DifficultyTier; - readonly imageKeys?: readonly string[]; } export interface DeliverableUploadInput { @@ -93,7 +89,7 @@ export interface DeliverableUploadInput { export interface SubmitWorkInput { readonly videoKey: string; - readonly blendKey: string; + readonly blendKey: string | null; readonly notes: string | null; } @@ -226,25 +222,6 @@ export class ShotsService { }; } - public async getByCode(shotCode: string, viewer: AuthenticatedUser | null): Promise { - const [row] = await this.database - .select({ shot: shots, claimer: userSummaryColumns }) - .from(shots) - .leftJoin(users, eq(users.id, shots.claimedBy)) - .where(eq(shots.shotCode, shotCode)) - .limit(1); - if (row === undefined) { - throw new NotFoundError("Shot"); - } - - return { - shot: row.shot, - claimer: row.claimer, - latestSubmission: null, - isSeniorLocked: this.isSeniorLocked(row.shot, viewer, new Date()) - }; - } - public async create(input: CreateShotInput): Promise { if (input.roundId !== null) { await this.requireRound(input.roundId); @@ -260,8 +237,7 @@ export class ShotsService { title: input.title, description: input.description, difficultyTier: input.difficultyTier, - seniorPriorityUntil, - imageKeys: input.imageKeys === undefined ? [] : [...input.imageKeys] + seniorPriorityUntil }) .returning(); if (shot === undefined) { @@ -278,17 +254,8 @@ export class ShotsService { if (input.roundId !== undefined && input.roundId !== null) { await this.requireRound(input.roundId); } - const values: Partial = { - ...(input.roundId !== undefined ? { roundId: input.roundId } : {}), - ...(input.sceneNumber !== undefined ? { sceneNumber: input.sceneNumber } : {}), - ...(input.shotCode !== undefined ? { shotCode: input.shotCode } : {}), - ...(input.title !== undefined ? { title: input.title } : {}), - ...(input.description !== undefined ? { description: input.description } : {}), - ...(input.difficultyTier !== undefined ? { difficultyTier: input.difficultyTier } : {}), - ...(input.imageKeys !== undefined ? { imageKeys: [...input.imageKeys] } : {}) - }; try { - const [shot] = await this.database.update(shots).set(values).where(eq(shots.id, shotId)).returning(); + const [shot] = await this.database.update(shots).set(input).where(eq(shots.id, shotId)).returning(); if (shot === undefined) { throw new NotFoundError("Shot"); } @@ -304,24 +271,10 @@ export class ShotsService { if (deleted === undefined) { throw new NotFoundError("Shot"); } - if (deleted.imageKeys && deleted.imageKeys.length > 0) { - // hold orphaned media for 48h recovery buffer before bucket prune - const scheduledDeleteAt = new Date(Date.now() + 48 * 60 * 60 * 1000); - await this.database.insert(deletedStorageObjects).values( - deleted.imageKeys.map((key) => ({ - bucket: StorageBucket.Media, - objectKey: key, - scheduledDeleteAt - })) - ); - } this.notifier.notify({ type: NotificationType.ShotDeleted, shot: shotReferenceOf(deleted) }); } public async claim(user: AuthenticatedUser, shotId: string): Promise { - if (user.isBlacklisted) { - throw new ForbiddenError("Your account cannot claim tasks.", ErrorCode.UserBlacklisted); - } const now = new Date(); let claimed: ShotRecord; try { @@ -398,9 +351,6 @@ export class ShotsService { } public async createDeliverableUpload(user: AuthenticatedUser, shotId: string, input: DeliverableUploadInput): Promise { - if (user.isBlacklisted) { - throw new ForbiddenError("Your account cannot upload task deliverables.", ErrorCode.UserBlacklisted); - } if (!this.storage.isEnabled(StorageBucket.Deliverables)) { throw new ServiceUnavailableError("Deliverable uploads are not configured on this server."); } @@ -426,18 +376,13 @@ export class ShotsService { } public async submit(user: AuthenticatedUser, shotId: string, input: SubmitWorkInput): Promise { - if (user.isBlacklisted) { - throw new ForbiddenError("Your account cannot submit tasks.", ErrorCode.UserBlacklisted); - } const maxBytes = this.storageConfiguration.deliverableMaxBytes; await assertDeliverable(this.storage, input.videoKey, DeliverableKind.Video, shotId, user.id, maxBytes, "videoKey"); - await assertDeliverable(this.storage, input.blendKey, DeliverableKind.Blend, shotId, user.id, maxBytes, "blendKey"); - - const buffer = await this.storage.getObject(StorageBucket.Deliverables, input.videoKey, 524288); - const detection = inspectMediaAiSignatures(buffer); - const aiFlags = detection.flagged ? [...detection.flags] : []; + if (input.blendKey !== null) { + await assertDeliverable(this.storage, input.blendKey, DeliverableKind.Blend, shotId, user.id, maxBytes, "blendKey"); + } - const { submission, shot, promotedUser } = await this.database.transaction(async (transaction) => { + const { submission, shot } = await this.database.transaction(async (transaction) => { const locked = await this.lockShot(transaction, shotId); this.assertActiveClaim(locked, user); const [latest] = await transaction @@ -454,37 +399,16 @@ export class ShotsService { version: (latest?.version ?? 0) + 1, videoKey: input.videoKey, blendKey: input.blendKey, - notes: input.notes, - aiFlags + notes: input.notes }) .returning(); await transaction.update(shots).set({ status: ShotStatus.Submitted }).where(eq(shots.id, shotId)); - let promotedUser: UserRecord | undefined; - if (rankOf(user.role) < rankOf(Role.Contributor)) { - // submitting work earns contributor standing - const [updated] = await transaction - .update(users) - .set({ role: Role.Contributor, updatedAt: new Date() }) - .where(eq(users.id, user.id)) - .returning(); - promotedUser = updated; - } if (created === undefined) { throw new Error("Submission insert returned no row."); } - return { submission: created, shot: locked, promotedUser }; + return { submission: created, shot: locked }; }); - if (promotedUser !== undefined) { - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(promotedUser), - role: promotedUser.role, - specialties: promotedUser.specialties, - actor: personOfUser(promotedUser) - }); - } - this.notifier.notify({ type: NotificationType.SubmissionCreated, shot: shotReferenceOf(shot), @@ -493,18 +417,6 @@ export class ShotsService { contributor: personOfUser(user), notes: submission.notes }); - - if (aiFlags.length > 0) { - this.notifier.notify({ - type: NotificationType.MediaFlaggedAi, - mediaKind: "task_submission", - targetId: submission.id, - title: `${shot.shotCode} (v${submission.version})`, - author: personOfUser(user), - flags: aiFlags, - snippet: detection.snippet - }); - } return submission; } diff --git a/apps/api/src/Modules/ThreadMaps/ThreadMapsRoutes.ts b/apps/api/src/Modules/ThreadMaps/ThreadMapsRoutes.ts index 751a369..8120d2e 100644 --- a/apps/api/src/Modules/ThreadMaps/ThreadMapsRoutes.ts +++ b/apps/api/src/Modules/ThreadMaps/ThreadMapsRoutes.ts @@ -17,17 +17,14 @@ function toThreadMapResponse(map: ShotThreadMapRecord): z.infer = async (application, { services }) => { const { database } = services; const security = [{ bearer: [] }]; - const reader = requireRoleOrService(Role.Moderator); const writer = requireRoleOrService(Role.Supervisor); application.get( "/shot-thread-maps", { - preHandler: reader, schema: { tags: ["Shot threads"], summary: "All shot to Discord thread bindings.", - security, response: { 200: dataEnvelope(z.array(threadMapSchema)), ...errorResponses } } }, @@ -40,11 +37,9 @@ export const threadMapsRoutes: FastifyPluginAsyncZod<{ services: ServiceContaine application.get( "/shot-thread-maps/by-thread/:threadId", { - preHandler: reader, schema: { tags: ["Shot threads"], summary: "Resolve the shot bound to a Discord thread.", - security, params: z.object({ threadId: snowflakeSchema }), response: { 200: dataEnvelope(threadMapSchema), ...errorResponses } } diff --git a/apps/api/src/Modules/Uploads/AiMetadataDetector.ts b/apps/api/src/Modules/Uploads/AiMetadataDetector.ts deleted file mode 100644 index ad6dfea..0000000 --- a/apps/api/src/Modules/Uploads/AiMetadataDetector.ts +++ /dev/null @@ -1,253 +0,0 @@ -import { inflateSync } from "node:zlib"; - -export interface AiDetectionResult { - readonly flagged: boolean; - readonly flags: readonly string[]; - readonly snippet: string | null; -} - -interface KeywordRule { - readonly pattern: RegExp; - readonly flagName: string; -} - -const aiTextRules: readonly KeywordRule[] = [ - // automatic1111 / stable diffusion parameters - { pattern: /\b(?:Steps:\s*\d+,\s*Sampler:\s*[^,\n]+,\s*CFG scale:\s*[\d.]+)/iu, flagName: "Stable Diffusion generation parameters" }, - { pattern: /\bNegative prompt:\s*[^,\n]+/iu, flagName: "Negative prompt parameter" }, - { pattern: /\bModel hash:\s*[0-9a-f]{8,12}\b/iu, flagName: "Model hash parameter" }, - { pattern: /\bCivitai resources:\s*\[/iu, flagName: "Civitai resource tag" }, - - // comfyui graph metadata - { pattern: /"(?:class_type|type)":\s*"(?:KSampler|VAEDecode|CLIPTextEncode|CheckpointLoaderSimple|LoraLoader)"/iu, flagName: "ComfyUI workflow graph" }, - { pattern: /"client_id":\s*"[^"]+",\s*"prompt":\s*\{/iu, flagName: "ComfyUI prompt payload" }, - - // midjourney / dall-e / novelai / fooocus / invokeai signatures - { pattern: /\b(?:Midjourney|niji(?:journey)?)\b/iu, flagName: "Midjourney signature" }, - { pattern: /\bDALL[-·]E(?:\s*[23])?\b/iu, flagName: "DALL-E signature" }, - { pattern: /\bNovelAI\b/iu, flagName: "NovelAI signature" }, - { pattern: /\bFooocus\b/iu, flagName: "Fooocus signature" }, - { pattern: /\bInvokeAI\b/iu, flagName: "InvokeAI signature" }, - { pattern: /\bAdobe Firefly\b/iu, flagName: "Adobe Firefly signature" }, - { pattern: /\bFlux(?:\.1)?\s*(?:\[dev\]|\[schnell\]|\[pro\])?\b/iu, flagName: "Flux generation signature" }, - { pattern: /\bLeonardo(?:\.Ai)?\b/iu, flagName: "Leonardo.Ai signature" }, - { pattern: /\bIdeogram\b/iu, flagName: "Ideogram signature" }, - - // c2pa and provenance assertions for generative ai - { pattern: /c2pa\.(?:actions\.created|trainedAlgorithmicData|claim_generator)/iu, flagName: "C2PA algorithmic data assertion" }, - { pattern: /trainedAlgorithmicMedia/iu, flagName: "IPTC trained algorithmic media declaration" }, - { pattern: /"digitalSourceType":\s*"[^"]*trainedAlgorithmicMedia"/iu, flagName: "Digital source type: algorithmic media" }, - - // generative ai video tools - { pattern: /\b(?:Runway(?:ML)?|Gen-2|Gen-3(?:\s*Alpha)?)\b/iu, flagName: "Runway AI video signature" }, - { pattern: /\bPika(?:\s*Labs)?\b/iu, flagName: "Pika video signature" }, - { pattern: /\bOpenAI\s*Sora\b|\bSora(?:\s*Video)?\b/iu, flagName: "Sora video signature" }, - { pattern: /\bLuma(?:\s*Dream\s*Machine|\s*AI)\b/iu, flagName: "Luma Dream Machine signature" }, - { pattern: /\bKling(?:\s*AI)?\b/iu, flagName: "Kling AI video signature" }, - { pattern: /\bHaiper(?:\s*AI)?\b/iu, flagName: "Haiper AI video signature" }, - { pattern: /\bAnimateDiff\b/iu, flagName: "AnimateDiff video signature" }, - { pattern: /\bCogVideoX?\b/iu, flagName: "CogVideo signature" }, - { pattern: /\bStable Video Diffusion\b|\bSVD[-_]xt\b/iu, flagName: "Stable Video Diffusion signature" } -]; - -const pngKeywords = new Set([ - "parameters", - "prompt", - "workflow", - "generation_data", - "sd-metadata", - "software", - "comment", - "description", - "xml:com.adobe.xmp", - "civitai" -]); - -function extractSnippet(text: string): string | null { - const trimmed = text.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/gu, " ").trim(); - if (trimmed.length === 0) { - return null; - } - // pull out first meaningful prompt sentence or json segment - const sdMatch = /^(.*?)(?:Negative prompt:|Steps:|$)/su.exec(trimmed); - const candidate = sdMatch !== null && sdMatch[1]?.trim() ? sdMatch[1].trim() : trimmed; - return candidate.length > 280 ? `${candidate.slice(0, 277)}...` : candidate; -} - -function scanText(content: string, flags: Set, snippetRef: { current: string | null }): void { - for (const rule of aiTextRules) { - if (rule.pattern.test(content)) { - flags.add(rule.flagName); - if (snippetRef.current === null) { - const match = rule.pattern.exec(content); - if (match !== null) { - const start = Math.max(0, match.index - 40); - const end = Math.min(content.length, match.index + 240); - snippetRef.current = extractSnippet(content.slice(start, end)); - } - } - } - } -} - -function inspectPng(buffer: Buffer, flags: Set, snippetRef: { current: string | null }): void { - let offset = 8; - while (offset + 8 <= buffer.length) { - const length = buffer.readUInt32BE(offset); - const type = buffer.subarray(offset + 4, offset + 8).toString("ascii"); - const dataStart = offset + 8; - const dataEnd = Math.min(dataStart + length, buffer.length); - const data = buffer.subarray(dataStart, dataEnd); - - if (type === "tEXt" || type === "zTXt" || type === "iTXt") { - try { - const nullIdx = data.indexOf(0); - if (nullIdx !== -1) { - const keyword = data.subarray(0, nullIdx).toString("latin1").toLowerCase(); - let textContent = ""; - - if (type === "tEXt") { - textContent = data.subarray(nullIdx + 1).toString("utf-8"); - } else if (type === "zTXt" && data.length > nullIdx + 2) { - // skip 1 byte compression method - const compressed = data.subarray(nullIdx + 2); - textContent = inflateSync(compressed).toString("utf-8"); - } else if (type === "iTXt" && data.length > nullIdx + 3) { - const compFlag = data[nullIdx + 1]; - const nullIdx2 = data.indexOf(0, nullIdx + 3); // language tag - if (nullIdx2 !== -1) { - const nullIdx3 = data.indexOf(0, nullIdx2 + 1); // trans keyword - if (nullIdx3 !== -1) { - const textRaw = data.subarray(nullIdx3 + 1); - textContent = compFlag === 1 ? inflateSync(textRaw).toString("utf-8") : textRaw.toString("utf-8"); - } - } - } - - if (pngKeywords.has(keyword)) { - if (keyword === "parameters") { - flags.add("PNG parameters chunk (Stable Diffusion / WebUI)"); - if (snippetRef.current === null && textContent.length > 0) { - snippetRef.current = extractSnippet(textContent); - } - } else if (keyword === "workflow" || keyword === "prompt") { - flags.add(`PNG ${keyword} chunk`); - } - } - - if (textContent.length > 0) { - scanText(textContent, flags, snippetRef); - } - } - } catch { - // skip corrupted chunks gracefully - } - } - - if (type === "IEND") { - break; - } - - offset += 12 + length; - if (length < 0 || offset > buffer.length + 1024 * 1024) { - break; - } - } -} - -function inspectJpeg(buffer: Buffer, flags: Set, snippetRef: { current: string | null }): void { - let offset = 2; - while (offset + 4 <= buffer.length) { - if (buffer[offset] !== 0xff) { - break; - } - const marker = buffer[offset + 1]; - if (marker === undefined || marker === 0xda || marker === 0xd9) { - break; // start of scan or end of image - } - if (marker === 0x00 || (marker >= 0xd0 && marker <= 0xd7)) { - offset += 2; - continue; - } - - const segLen = buffer.readUInt16BE(offset + 2); - const segData = buffer.subarray(offset + 4, Math.min(offset + 2 + segLen, buffer.length)); - - // app1 (exif/xmp), app2 (c2pa/flashpix), app13 (iptc), com (comment) - if (marker === 0xe1 || marker === 0xe2 || marker === 0xed || marker === 0xfe) { - const segStr = segData.toString("latin1"); - scanText(segStr, flags, snippetRef); - try { - const utf8Str = segData.toString("utf-8"); - scanText(utf8Str, flags, snippetRef); - } catch { - // ignore invalid utf8 sequences - } - } - - offset += 2 + segLen; - } -} - -function inspectQuickTimeOrMp4(buffer: Buffer, flags: Set, snippetRef: { current: string | null }): void { - // scan atoms for metadata tags - let offset = 0; - while (offset + 8 <= buffer.length) { - const atomSize = buffer.readUInt32BE(offset); - - if (atomSize === 0) { - break; - } - - const effectiveSize = atomSize === 1 && offset + 16 <= buffer.length ? Number(buffer.readBigUInt64BE(offset + 8)) : atomSize; - if (effectiveSize < 8) { - break; - } - - const atomData = buffer.subarray(offset, Math.min(offset + effectiveSize, buffer.length)); - const atomStr = atomData.toString("latin1"); - scanText(atomStr, flags, snippetRef); - - offset += effectiveSize; - } -} - -export function inspectMediaAiSignatures(buffer: Buffer | null | undefined): AiDetectionResult { - if (buffer === null || buffer === undefined || buffer.length < 12) { - return { flagged: false, flags: [], snippet: null }; - } - - const flags = new Set(); - const snippetRef: { current: string | null } = { current: null }; - - try { - const isPng = buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4e && buffer[3] === 0x47; - const isJpeg = buffer[0] === 0xff && buffer[1] === 0xd8; - const isRiffWebp = buffer.subarray(0, 4).toString("ascii") === "RIFF" && buffer.subarray(8, 12).toString("ascii") === "WEBP"; - const isMp4 = buffer.subarray(4, 8).toString("ascii") === "ftyp" || buffer.subarray(4, 8).toString("ascii") === "moov"; - - if (isPng) { - inspectPng(buffer, flags, snippetRef); - } else if (isJpeg) { - inspectJpeg(buffer, flags, snippetRef); - } else if (isRiffWebp) { - const rawStr = buffer.toString("latin1"); - scanText(rawStr, flags, snippetRef); - } else if (isMp4) { - inspectQuickTimeOrMp4(buffer, flags, snippetRef); - } else { - // fallback raw text search for other containers / formats - const rawStr = buffer.subarray(0, Math.min(buffer.length, 65536)).toString("latin1"); - scanText(rawStr, flags, snippetRef); - } - } catch { - // keep upload flow resilient against parser anomalies - } - - const flagArray = Array.from(flags); - return { - flagged: flagArray.length > 0, - flags: flagArray, - snippet: snippetRef.current - }; -} diff --git a/apps/api/src/Modules/Users/UserPresenter.ts b/apps/api/src/Modules/Users/UserPresenter.ts index 48e3af3..af2a011 100644 --- a/apps/api/src/Modules/Users/UserPresenter.ts +++ b/apps/api/src/Modules/Users/UserPresenter.ts @@ -28,9 +28,6 @@ export function toUserResponse(user: UserRecord): UserDto { role: user.role, specialties: user.specialties, isBlacklisted: user.isBlacklisted, - isOnboarded: user.onboardedAt !== null, - termsVersion: user.termsVersion, - isVerified: user.emailVerifiedAt !== null, createdAt: toIso(user.createdAt) }; } @@ -43,15 +40,10 @@ export function toModeratedUserResponse(user: UserRecord): ModeratedUserDto { }; } -export function toUserSummary(user: { - readonly id: string; - readonly discordId: string | null; - readonly discordUsername: string; - readonly discordAvatar: string | null; -}): UserSummaryDto { +export function toUserSummary(user: Pick): UserSummaryDto { return { id: user.id, username: user.discordUsername, - avatarUrl: user.discordId !== null ? avatarUrlOf(user.discordId, user.discordAvatar) : null + avatarUrl: avatarUrlOf(user.discordId, user.discordAvatar) }; } diff --git a/apps/api/src/Modules/Users/UsersRoutes.ts b/apps/api/src/Modules/Users/UsersRoutes.ts index 1706124..6187009 100644 --- a/apps/api/src/Modules/Users/UsersRoutes.ts +++ b/apps/api/src/Modules/Users/UsersRoutes.ts @@ -1,40 +1,27 @@ -import { fieldRules, specialtyHoldersSchema } from "@platform/contracts"; import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; import { z } from "zod"; -import { NotFoundError } from "../../Common/Errors/ApplicationError.js"; import { dataEnvelope, errorResponses, pageEnvelope, paginationQuerySchema, snowflakeSchema, + trimmedText, uuidSchema } from "../../Common/Http/Schemas.js"; -import { - actorOf, - currentUser, - requireRole, - requireRoleOrService, - requireService, - requireUser -} from "../../Common/Security/Authorization.js"; +import { actorOf, requireRole, requireRoleOrService, requireService, requireUser } from "../../Common/Security/Authorization.js"; import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; -import { maximumSpecialties, Role, selfSelectableSpecialties, Specialty } from "../../Domain/Roles.js"; +import { maximumSpecialties, Role, Specialty } from "../../Domain/Roles.js"; import { PresenceStatus } from "../../Infrastructure/Discord/PresenceProvider.js"; import { moderatedUserSchema, toModeratedUserResponse, toUserResponse, userSchema } from "./UserPresenter.js"; import type { UserReference } from "./UsersService.js"; const roleChangeSchema = z.object({ role: z.enum(Role), - specialties: z.array(z.enum(Specialty)).max(maximumSpecialties).optional(), - transfer: z.boolean().optional() -}); - -const ownSpecialtiesSchema = z.object({ - specialties: z.array(z.enum(selfSelectableSpecialties)).max(maximumSpecialties) + specialties: z.array(z.enum(Specialty)).max(maximumSpecialties).optional() }); -const blacklistSchema = z.object({ reason: fieldRules.reason.default(null) }); +const blacklistSchema = z.object({ reason: trimmedText(500).nullable().default(null) }); const userIdParams = z.object({ userId: uuidSchema }); const discordIdParams = z.object({ discordId: snowflakeSchema }); @@ -44,14 +31,13 @@ export const usersRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> const security = [{ bearer: [] }]; const staff = requireRole(Role.Supervisor); const staffOrService = requireRoleOrService(Role.Supervisor); - const moderatorOrService = requireRoleOrService(Role.Moderator); const byId = (params: { userId: string }): UserReference => ({ kind: "id", id: params.userId }); const byDiscord = (params: { discordId: string }): UserReference => ({ kind: "discord", discordId: params.discordId }); application.get( "/users", { - preHandler: moderatorOrService, + preHandler: requireRole(Role.Moderator), schema: { tags: ["Users"], summary: "List registered users.", @@ -66,52 +52,6 @@ export const usersRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> } ); - application.get( - "/users/specialty-holders", - { - preHandler: moderatorOrService, - schema: { - tags: ["Users"], - summary: "List current holders of exclusive supervisor and admin specialties.", - security, - response: { 200: dataEnvelope(specialtyHoldersSchema), ...errorResponses } - } - }, - async () => ({ data: await usersService.getSpecialtyHolders() }) - ); - - application.put( - "/users/me/terms", - { - preHandler: requireUser(), - schema: { - tags: ["Users"], - summary: "Accept the current terms of service and privacy policy.", - security, - body: z.object({ version: z.string().min(1).max(32) }), - response: { 200: dataEnvelope(userSchema), ...errorResponses } - } - }, - async (request) => ({ data: toUserResponse(await usersService.acceptTerms(currentUser(request).id, request.body.version)) }) - ); - - application.put( - "/users/me/specialties", - { - preHandler: requireUser(), - schema: { - tags: ["Users"], - summary: "Choose your own specialties and complete onboarding.", - security, - body: ownSpecialtiesSchema, - response: { 200: dataEnvelope(userSchema), ...errorResponses } - } - }, - async (request) => ({ - data: toUserResponse(await usersService.chooseOwnSpecialties(currentUser(request).id, request.body.specialties)) - }) - ); - application.get( "/users/presence", { @@ -171,7 +111,7 @@ export const usersRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> summary: "Set a user's role by Discord ID, creating the user if needed.", security, params: discordIdParams, - body: roleChangeSchema.extend({ discordUsername: fieldRules.username.optional() }), + body: roleChangeSchema.extend({ discordUsername: trimmedText(64).optional() }), response: { 200: dataEnvelope(userSchema), ...errorResponses } } }, @@ -218,27 +158,6 @@ export const usersRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> } ); - application.get( - "/users/by-discord/:discordId", - { - preHandler: staffOrService, - schema: { - tags: ["Users"], - summary: "Get a user by Discord ID.", - security, - params: discordIdParams, - response: { 200: dataEnvelope(moderatedUserSchema), ...errorResponses } - } - }, - async (request) => { - const user = await usersService.findByDiscordId(request.params.discordId); - if (user === null) { - throw new NotFoundError("User"); - } - return { data: toModeratedUserResponse(user) }; - } - ); - application.put( "/users/by-discord/:discordId/profile", { @@ -249,7 +168,7 @@ export const usersRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> security, params: discordIdParams, body: z.object({ - username: fieldRules.username, + username: trimmedText(64), avatar: z .string() .regex(/^(?:a_)?[a-f0-9]{32}$/u) diff --git a/apps/api/src/Modules/Users/UsersService.ts b/apps/api/src/Modules/Users/UsersService.ts index 7861e46..58eab07 100644 --- a/apps/api/src/Modules/Users/UsersService.ts +++ b/apps/api/src/Modules/Users/UsersService.ts @@ -1,24 +1,11 @@ -import { and, asc, count, desc, eq, inArray, ne, sql } from "drizzle-orm"; +import { asc, count, desc, eq, inArray } from "drizzle-orm"; import { ConflictError, ErrorCode, ForbiddenError, NotFoundError } from "../../Common/Errors/ApplicationError.js"; import { createPage, offsetOf, type Page, type PaginationQuery } from "../../Common/Http/Schemas.js"; import type { Actor } from "../../Common/Security/Principal.js"; -import { - exclusiveSpecialties, - hasAtLeast, - isGrantable, - isHigherThan, - maximumSpecialties, - normalizeSpecialties, - Role, - selfSelectableSpecialties, - settleRole, - Specialty, - specialtyLabel -} from "../../Domain/Roles.js"; +import { isHigherThan, normalizeSpecialties, Role, type Specialty } from "../../Domain/Roles.js"; import type { Database, Transaction } from "../../Infrastructure/Database/Database.js"; import { users, type UserRecord } from "../../Infrastructure/Database/Schema.js"; import { NotificationType, personOfActor, personOfUser, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; -import type { LegalAcceptance } from "../Documents/DocumentsService.js"; import type { LeaderboardCache } from "../Leaderboards/LeaderboardCache.js"; export type UserReference = { readonly kind: "id"; readonly id: string } | { readonly kind: "discord"; readonly discordId: string }; @@ -27,7 +14,6 @@ export interface RoleChange { readonly role: Role; readonly specialties?: readonly Specialty[]; readonly discordUsername?: string; - readonly transfer?: boolean; } export interface UserListQuery extends PaginationQuery { @@ -38,8 +24,7 @@ export class UsersService { public constructor( private readonly database: Database, private readonly notifier: Notifier, - private readonly leaderboardCache: LeaderboardCache, - private readonly legal: LegalAcceptance + private readonly leaderboardCache: LeaderboardCache ) {} public async findById(userId: string): Promise { @@ -47,40 +32,6 @@ export class UsersService { return user ?? null; } - public async findByDiscordId(discordId: string): Promise { - const [user] = await this.database.select().from(users).where(eq(users.discordId, discordId)).limit(1); - return user ?? null; - } - - public async getSpecialtyHolders(): Promise> { - const rows = await this.database - .select({ - id: users.id, - username: users.discordUsername, - discordId: users.discordId, - specialties: users.specialties - }) - .from(users) - .where(sql`cardinality(${users.specialties}) > 0`); - - const holders = Object.fromEntries( - Object.values(Specialty).map((s) => [s, null as { id: string; username: string; discordId: string } | null]) - ) as Record; - - for (const row of rows) { - for (const specialty of row.specialties) { - if (exclusiveSpecialties.includes(specialty)) { - holders[specialty] = { - id: row.id, - username: row.username, - discordId: row.discordId - }; - } - } - } - return holders; - } - public async list(query: UserListQuery): Promise> { const filter = query.role === undefined ? undefined : eq(users.role, query.role); const [rows, totals] = await Promise.all([ @@ -97,24 +48,20 @@ export class UsersService { } public async changeRole(actor: Actor, reference: UserReference, change: RoleChange, createIfMissing: boolean): Promise { - const transferredHolders: UserRecord[] = []; - const user = await this.database.transaction(async (transaction) => { + return this.database.transaction(async (transaction) => { const { actor: current, target } = await this.lockParticipants(transaction, actor, reference); + this.assertCanGrant(current, change.role); if (target === null) { - this.assertCanGrant(current, change.role); if (!createIfMissing || reference.kind !== "discord") { throw new NotFoundError("User"); } - const initialRole = settleRole(change.role, false, null); - const initialSpecialties = normalizeSpecialties(change.role, change.specialties ?? []); - await this.enforceSpecialtyExclusivity(transaction, null, initialSpecialties, change.transfer, transferredHolders); const [created] = await transaction .insert(users) .values({ discordId: reference.discordId, discordUsername: change.discordUsername ?? `discord_${reference.discordId}`, - role: initialRole, - specialties: initialSpecialties + role: change.role, + specialties: normalizeSpecialties(change.role, change.specialties ?? []) }) .onConflictDoNothing({ target: users.discordId }) .returning(); @@ -124,19 +71,12 @@ export class UsersService { return created; } - if (change.role !== target.role) { - this.assertCanGrant(current, change.role); - this.assertCanManage(current, target); - } else { - this.assertCanManageSecondary(current, target); - } - const role = settleRole(change.role, target.emailVerifiedAt !== null, target.role); - const specialties = normalizeSpecialties(role, change.specialties ?? target.specialties); - await this.enforceSpecialtyExclusivity(transaction, target.id, specialties, change.transfer, transferredHolders); + this.assertCanManage(current, target); + const specialties = normalizeSpecialties(change.role, change.specialties ?? target.specialties); const [updated] = await transaction .update(users) .set({ - role, + role: change.role, specialties, ...(change.discordUsername === undefined ? {} : { discordUsername: change.discordUsername }) }) @@ -144,63 +84,6 @@ export class UsersService { .returning(); return this.required(updated); }); - - for (const transferred of transferredHolders) { - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(transferred), - role: transferred.role, - specialties: transferred.specialties, - actor: personOfActor(actor) - }); - } - - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(user), - role: user.role, - specialties: user.specialties, - actor: personOfActor(actor) - }); - return user; - } - - public async acceptTerms(userId: string, version: string): Promise { - if (version !== (await this.legal.currentAcceptanceVersion())) { - throw new ConflictError("The terms have changed. Reload the page and review them again."); - } - const [updated] = await this.database - .update(users) - .set({ termsVersion: version, termsAcceptedAt: new Date() }) - .where(eq(users.id, userId)) - .returning(); - return this.required(updated); - } - - public async chooseOwnSpecialties(userId: string, chosen: readonly Specialty[]): Promise { - const user = await this.database.transaction(async (transaction) => { - const [user] = await transaction.select().from(users).where(eq(users.id, userId)).limit(1).for("update"); - const current = this.required(user); - const assigned = current.specialties.filter((specialty) => !selfSelectableSpecialties.includes(specialty)); - const selected = chosen.filter((specialty) => selfSelectableSpecialties.includes(specialty)).slice(0, maximumSpecialties); - const [updated] = await transaction - .update(users) - .set({ - specialties: normalizeSpecialties(current.role, [...assigned, ...selected]), - onboardedAt: current.onboardedAt ?? new Date() - }) - .where(eq(users.id, userId)) - .returning(); - return this.required(updated); - }); - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(user), - role: user.role, - specialties: user.specialties, - actor: personOfUser(user) - }); - return user; } public async blacklist(actor: Actor, reference: UserReference, reason: string | null): Promise { @@ -295,10 +178,7 @@ export class UsersService { } private assertCanGrant(actor: Actor, role: Role): void { - if (!isGrantable(role)) { - throw new ForbiddenError("Super admins are assigned through the environment only."); - } - if (!hasAtLeast(actor.role, Role.Admin) && !isHigherThan(actor.role, role)) { + if (actor.role !== Role.Admin && !isHigherThan(actor.role, role)) { throw new ForbiddenError("You can only grant roles below your own."); } } @@ -312,69 +192,6 @@ export class UsersService { } } - private assertCanManageSecondary(actor: Actor, target: UserRecord): void { - if (hasAtLeast(actor.role, Role.Admin)) { - return; - } - this.assertCanManage(actor, target); - } - - private async enforceSpecialtyExclusivity( - transaction: Transaction, - targetId: string | null, - requestedSpecialties: readonly Specialty[], - allowTransfer: boolean | undefined, - transferredHolders: UserRecord[] - ): Promise { - const requestedExclusive = requestedSpecialties.filter((s) => exclusiveSpecialties.includes(s)); - if (requestedExclusive.length === 0) { - return; - } - const condition = - targetId === null - ? sql`cardinality(${users.specialties}) > 0` - : and(ne(users.id, targetId), sql`cardinality(${users.specialties}) > 0`); - - const candidateHolders = await transaction - .select() - .from(users) - .where(condition) - .for("update"); - - const conflicts: { holder: UserRecord; specialty: Specialty }[] = []; - for (const candidate of candidateHolders) { - for (const spec of requestedExclusive) { - if (candidate.specialties.includes(spec)) { - conflicts.push({ holder: candidate, specialty: spec }); - } - } - } - - if (conflicts.length === 0) { - return; - } - - if (allowTransfer !== true) { - const conflict = conflicts[0]!; - throw new ConflictError( - `${specialtyLabel(conflict.specialty)} is already held by @${conflict.holder.discordUsername}.`, - ErrorCode.InvalidStatusTransition - ); - } - - for (const { holder, specialty } of conflicts) { - const nextSpecialties = holder.specialties.filter((s) => s !== specialty); - const [stripped] = await transaction - .update(users) - .set({ specialties: nextSpecialties }) - .where(eq(users.id, holder.id)) - .returning(); - if (stripped !== undefined) { - transferredHolders.push(stripped); - } - } - } - private required(user: UserRecord | undefined): UserRecord { if (user === undefined) { throw new NotFoundError("User"); diff --git a/apps/api/src/Modules/Verification/EmailPolicy.ts b/apps/api/src/Modules/Verification/EmailPolicy.ts deleted file mode 100644 index f0293da..0000000 --- a/apps/api/src/Modules/Verification/EmailPolicy.ts +++ /dev/null @@ -1,103 +0,0 @@ -const maximumLength = 254; -const localPattern = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*$/u; -const domainPattern = /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,63}$/u; - -const gmailDomains: ReadonlySet = new Set(["gmail.com", "googlemail.com"]); - -const disposableDomains: ReadonlySet = new Set([ - "10minutemail.com", - "20minutemail.com", - "33mail.com", - "anonaddy.me", - "burnermail.io", - "discard.email", - "dispostable.com", - "dropmail.me", - "emailondeck.com", - "fakeinbox.com", - "fakemail.net", - "getairmail.com", - "getnada.com", - "guerrillamail.biz", - "guerrillamail.com", - "guerrillamail.de", - "guerrillamail.info", - "guerrillamail.net", - "guerrillamail.org", - "guerrillamailblock.com", - "harakirimail.com", - "inboxkitten.com", - "mail.tm", - "mailcatch.com", - "maildrop.cc", - "mailinator.com", - "mailinator.net", - "mailnesia.com", - "mailpoof.com", - "mailsac.com", - "mintemail.com", - "moakt.com", - "mohmal.com", - "mytemp.email", - "nada.email", - "sharklasers.com", - "spam4.me", - "spamgourmet.com", - "temp-mail.io", - "temp-mail.org", - "tempail.com", - "tempmail.dev", - "tempmail.net", - "tempmailo.com", - "tempr.email", - "throwawaymail.com", - "tmail.ws", - "tmpmail.net", - "tmpmail.org", - "trash-mail.com", - "trashmail.com", - "trashmail.de", - "yopmail.com", - "yopmail.fr", - "yopmail.net" -]); - -export interface ParsedEmail { - readonly address: string; - readonly domain: string; - readonly canonical: string; -} - -export function parseEmail(input: string): ParsedEmail | null { - const address = input.trim().toLowerCase(); - if (address.length === 0 || address.length > maximumLength) { - return null; - } - const at = address.lastIndexOf("@"); - if (at <= 0) { - return null; - } - const local = address.slice(0, at); - const domain = address.slice(at + 1); - if (local.length > 64 || !localPattern.test(local) || !domainPattern.test(domain)) { - return null; - } - const withoutTag = local.split("+")[0] ?? local; - if (withoutTag.length === 0) { - return null; - } - const isGmail = gmailDomains.has(domain); - const canonicalLocal = isGmail ? withoutTag.replaceAll(".", "") : withoutTag; - const canonicalDomain = isGmail ? "gmail.com" : domain; - return { address, domain, canonical: `${canonicalLocal}@${canonicalDomain}` }; -} - -export function isDisposableDomain(domain: string): boolean { - const labels = domain.split("."); - for (let index = 0; index < labels.length - 1; index++) { - if (disposableDomains.has(labels.slice(index).join("."))) { - return true; - } - } - return false; -} diff --git a/apps/api/src/Modules/Verification/VerificationRoutes.ts b/apps/api/src/Modules/Verification/VerificationRoutes.ts deleted file mode 100644 index dda311c..0000000 --- a/apps/api/src/Modules/Verification/VerificationRoutes.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { emailCodeLength, emailVerificationSchema, textLimits } from "@platform/contracts"; -import type { FastifyPluginAsyncZod } from "fastify-type-provider-zod"; -import { z } from "zod"; -import { dataEnvelope, errorResponses, toIso } from "../../Common/Http/Schemas.js"; -import { currentUser, requireAcceptedTerms } from "../../Common/Security/Authorization.js"; -import type { ServiceContainer } from "../../Composition/ServiceContainer.js"; -import { toUserResponse, userSchema } from "../Users/UserPresenter.js"; - -export const verificationRoutes: FastifyPluginAsyncZod<{ services: ServiceContainer }> = async (application, { services }) => { - const { verificationService } = services; - const security = [{ bearer: [] }]; - - application.post( - "/verification/email", - { - preHandler: requireAcceptedTerms(services.documentsService), - config: { rateLimit: { max: 5, timeWindow: "1 minute" } }, - schema: { - tags: ["Verification"], - summary: "Send a one-time code to an email address after a captcha check.", - security, - body: z.object({ - email: z.string().max(textLimits.email), - captchaToken: z.string().min(1).max(2048) - }), - response: { 200: dataEnvelope(emailVerificationSchema), ...errorResponses } - } - }, - async (request) => { - const started = await verificationService.start(currentUser(request), request.body.email, request.body.captchaToken); - return { data: { expiresAt: toIso(started.expiresAt), resendAvailableAt: toIso(started.resendAvailableAt) } }; - } - ); - - application.post( - "/verification/email/confirm", - { - preHandler: requireAcceptedTerms(services.documentsService), - config: { rateLimit: { max: 10, timeWindow: "1 minute" } }, - schema: { - tags: ["Verification"], - summary: "Confirm the emailed code and become a verified voter.", - security, - body: z.object({ code: z.string().length(emailCodeLength).regex(/^\d+$/u) }), - response: { 200: dataEnvelope(userSchema), ...errorResponses } - } - }, - async (request) => ({ data: toUserResponse(await verificationService.confirm(currentUser(request), request.body.code)) }) - ); -}; diff --git a/apps/api/src/Modules/Verification/VerificationService.ts b/apps/api/src/Modules/Verification/VerificationService.ts deleted file mode 100644 index 6f07656..0000000 --- a/apps/api/src/Modules/Verification/VerificationService.ts +++ /dev/null @@ -1,225 +0,0 @@ -import { randomInt } from "node:crypto"; -import { and, eq, isNull } from "drizzle-orm"; -import type { FastifyBaseLogger } from "fastify"; -import { emailCodeLength } from "@platform/contracts"; -import { - ApplicationError, - BadRequestError, - ConflictError, - ErrorCode, - ForbiddenError, - NotFoundError, - ServiceUnavailableError -} from "../../Common/Errors/ApplicationError.js"; -import type { AuthenticatedUser } from "../../Common/Security/Principal.js"; -import { constantTimeEquals, hmacHex } from "../../Common/Security/Secrets.js"; -import type { KeyValueStore } from "../../Infrastructure/Cache/KeyValueStore.js"; -import type { CaptchaVerifier } from "../../Infrastructure/Captcha/CaptchaVerifier.js"; -import { isUniqueViolation, type Database } from "../../Infrastructure/Database/Database.js"; -import { users, type UserRecord } from "../../Infrastructure/Database/Schema.js"; -import type { EmailSender } from "../../Infrastructure/Email/EmailSender.js"; -import type { MailDomainChecker } from "../../Infrastructure/Email/MailDomainChecker.js"; -import { NotificationType, personOfUser, type Notifier } from "../../Infrastructure/Notifications/Notification.js"; -import { isDisposableDomain, parseEmail } from "./EmailPolicy.js"; - -export const captchaAction = "verify-email"; - -const codeTtlSeconds = 15 * 60; -const resendCooldownSeconds = 60; -const maximumAttempts = 5; -const hourSeconds = 3600; -const daySeconds = 24 * hourSeconds; -const sendsPerUserHour = 5; -const sendsPerUserDay = 10; -const sendsPerAddressHour = 3; -const sendsPerAddressDay = 6; - -interface PendingVerification { - readonly emailHash: string; - readonly codeHash: string; - readonly expiresAt: string; -} - -export interface StartedVerification { - readonly expiresAt: Date; - readonly resendAvailableAt: Date; -} - -function tooManyRequests(message: string, retryAfterSeconds: number): ApplicationError { - return new ApplicationError(429, ErrorCode.TooManyRequests, message, [], { "Retry-After": String(retryAfterSeconds) }); -} - -export class VerificationService { - public constructor( - private readonly database: Database, - private readonly store: KeyValueStore, - private readonly emailSender: EmailSender, - private readonly captcha: CaptchaVerifier, - private readonly mailDomains: MailDomainChecker, - private readonly appKey: string, - private readonly logger: FastifyBaseLogger, - private readonly notifier?: Notifier - ) {} - - public async start(user: AuthenticatedUser, email: string, captchaToken: string): Promise { - await this.requireUnverified(user); - if (!this.emailSender.isEnabled()) { - throw new ServiceUnavailableError("Email verification is temporarily unavailable."); - } - const parsed = parseEmail(email); - if (parsed === null) { - throw new BadRequestError("Enter a valid email address.", ErrorCode.VerificationFailed); - } - if (!(await this.captcha.verify(captchaToken, captchaAction))) { - throw new BadRequestError("The captcha check failed. Try again.", ErrorCode.VerificationFailed); - } - if (isDisposableDomain(parsed.domain) || !(await this.mailDomains.acceptsMail(parsed.domain))) { - throw new BadRequestError("Use a permanent email address you can receive mail at.", ErrorCode.VerificationFailed); - } - if (!(await this.store.setIfAbsent(`verify:cooldown:${user.id}`, "1", resendCooldownSeconds))) { - throw tooManyRequests("Wait a minute before requesting another code.", resendCooldownSeconds); - } - await this.limit(`verify:sends:user-hour:${user.id}`, hourSeconds, sendsPerUserHour); - await this.limit(`verify:sends:user-day:${user.id}`, daySeconds, sendsPerUserDay); - - const emailHash = hmacHex(this.appKey, `verified-email:${parsed.canonical}`); - const [holder] = await this.database.select({ id: users.id }).from(users).where(eq(users.verifiedEmailHash, emailHash)).limit(1); - if (holder !== undefined) { - throw new ConflictError("This email is already linked to another account."); - } - await this.limit(`verify:sends:address-hour:${emailHash}`, hourSeconds, sendsPerAddressHour); - await this.limit(`verify:sends:address-day:${emailHash}`, daySeconds, sendsPerAddressDay); - - const code = randomInt(0, 10 ** emailCodeLength) - .toString() - .padStart(emailCodeLength, "0"); - const now = Date.now(); - const expiresAt = new Date(now + codeTtlSeconds * 1000); - const pending: PendingVerification = { - emailHash, - codeHash: this.codeHash(user.id, emailHash, code), - expiresAt: expiresAt.toISOString() - }; - await this.store.delete(`verify:attempts:${user.id}`); - await this.store.set(`verify:pending:${user.id}`, JSON.stringify(pending), codeTtlSeconds); - - try { - await this.emailSender.send({ - to: parsed.address, - subject: `Your verification code: ${code}`, - text: `Your verification code is ${code}.\n\nIt expires in 15 minutes. If you didn't request this, ignore this email.`, - html: `

Your verification code is

${code}

It expires in 15 minutes. If you didn't request this, ignore this email.

`, - idempotencyKey: hmacHex(this.appKey, `verify-send:${user.id}:${pending.codeHash}`, 48) - }); - } catch (error: unknown) { - await this.store.delete(`verify:pending:${user.id}`); - await this.store.delete(`verify:cooldown:${user.id}`); - this.logger.error({ err: error }, "verification email failed"); - throw new ServiceUnavailableError("We couldn't send the email. Try again shortly."); - } - return { expiresAt, resendAvailableAt: new Date(now + resendCooldownSeconds * 1000) }; - } - - public async confirm(user: AuthenticatedUser, code: string): Promise { - await this.requireUnverified(user); - const attempts = await this.store.incrementWithin(`verify:attempts:${user.id}`, codeTtlSeconds); - if (attempts > maximumAttempts) { - await this.store.delete(`verify:pending:${user.id}`); - throw tooManyRequests("Too many incorrect codes. Request a new one.", resendCooldownSeconds); - } - const pending = this.parsePending(await this.store.get(`verify:pending:${user.id}`)); - if (pending === null || new Date(pending.expiresAt).getTime() <= Date.now()) { - throw new BadRequestError("This code has expired. Request a new one.", ErrorCode.VerificationFailed); - } - if (!constantTimeEquals(this.codeHash(user.id, pending.emailHash, code), pending.codeHash)) { - const remaining = maximumAttempts - attempts; - throw new BadRequestError( - remaining > 0 - ? `That code is incorrect. ${remaining} ${remaining === 1 ? "try" : "tries"} left.` - : "That code is incorrect. Request a new one.", - ErrorCode.VerificationFailed - ); - } - if ((await this.store.take(`verify:pending:${user.id}`)) === null) { - throw new BadRequestError("This code has already been used.", ErrorCode.VerificationFailed); - } - await this.store.delete(`verify:attempts:${user.id}`); - - try { - const [updated] = await this.database.transaction(async (transaction) => { - const [current] = await transaction.select().from(users).where(eq(users.id, user.id)).limit(1).for("update"); - if (current === undefined) { - throw new NotFoundError("User"); - } - return transaction - .update(users) - .set({ - verifiedEmailHash: pending.emailHash, - emailVerifiedAt: new Date(), - role: current.role - }) - .where(and(eq(users.id, user.id), isNull(users.emailVerifiedAt))) - .returning(); - }); - if (updated === undefined) { - throw new ConflictError("Your account is already verified."); - } - if (updated.role !== user.role && this.notifier !== undefined) { - this.notifier.notify({ - type: NotificationType.UserRoleChanged, - user: personOfUser(updated), - role: updated.role, - specialties: updated.specialties, - actor: personOfUser(updated) - }); - } - return updated; - } catch (error: unknown) { - if (isUniqueViolation(error)) { - throw new ConflictError("This email is already linked to another account."); - } - throw error; - } - } - - private async requireUnverified(user: AuthenticatedUser): Promise { - if (user.isBlacklisted) { - throw new ForbiddenError("Your account can't be verified.", ErrorCode.UserBlacklisted); - } - const [record] = await this.database - .select({ emailVerifiedAt: users.emailVerifiedAt }) - .from(users) - .where(eq(users.id, user.id)) - .limit(1); - if (record === undefined) { - throw new NotFoundError("User"); - } - if (record.emailVerifiedAt !== null) { - throw new ConflictError("Your account is already verified."); - } - } - - private async limit(key: string, windowSeconds: number, maximum: number): Promise { - if ((await this.store.incrementWithin(key, windowSeconds)) > maximum) { - throw tooManyRequests("Too many codes requested. Try again later.", windowSeconds); - } - } - - private codeHash(userId: string, emailHash: string, code: string): string { - return hmacHex(this.appKey, `verify-code:${userId}:${emailHash}:${code}`); - } - - private parsePending(value: string | null): PendingVerification | null { - if (value === null) { - return null; - } - try { - const parsed = JSON.parse(value) as Partial; - return typeof parsed.emailHash === "string" && typeof parsed.codeHash === "string" && typeof parsed.expiresAt === "string" - ? { emailHash: parsed.emailHash, codeHash: parsed.codeHash, expiresAt: parsed.expiresAt } - : null; - } catch { - return null; - } - } -} diff --git a/apps/api/test/AiMetadataDetector.test.ts b/apps/api/test/AiMetadataDetector.test.ts deleted file mode 100644 index fd25aca..0000000 --- a/apps/api/test/AiMetadataDetector.test.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { deflateSync } from "node:zlib"; -import { describe, expect, it } from "vitest"; -import { inspectMediaAiSignatures } from "../src/Modules/Uploads/AiMetadataDetector.js"; - -function createPngWithChunk(type: string, data: Buffer): Buffer { - const signature = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); - // IHDR chunk - const ihdrData = Buffer.alloc(13); - ihdrData.writeUInt32BE(100, 0); // width - ihdrData.writeUInt32BE(100, 4); // height - ihdrData[8] = 8; // bit depth - ihdrData[9] = 2; // color type (RGB) - const ihdrLen = Buffer.alloc(4); - ihdrLen.writeUInt32BE(13, 0); - const ihdrType = Buffer.from("IHDR", "ascii"); - const ihdrCrc = Buffer.alloc(4); - const ihdrChunk = Buffer.concat([ihdrLen, ihdrType, ihdrData, ihdrCrc]); - - // Custom chunk - const chunkLen = Buffer.alloc(4); - chunkLen.writeUInt32BE(data.length, 0); - const chunkType = Buffer.from(type, "ascii"); - const chunkCrc = Buffer.alloc(4); - const customChunk = Buffer.concat([chunkLen, chunkType, data, chunkCrc]); - - // IEND chunk - const iendLen = Buffer.alloc(4); - const iendType = Buffer.from("IEND", "ascii"); - const iendCrc = Buffer.alloc(4); - const iendChunk = Buffer.concat([iendLen, iendType, iendCrc]); - - return Buffer.concat([signature, ihdrChunk, customChunk, iendChunk]); -} - -function createJpegWithApp1(content: string): Buffer { - const soi = Buffer.from([0xff, 0xd8]); - const payload = Buffer.from(content, "utf-8"); - const segLen = Buffer.alloc(2); - segLen.writeUInt16BE(payload.length + 2, 0); - const app1 = Buffer.concat([Buffer.from([0xff, 0xe1]), segLen, payload]); - const eoi = Buffer.from([0xff, 0xd9]); - return Buffer.concat([soi, app1, eoi]); -} - -function createMp4WithAtom(atomType: string, content: string): Buffer { - const payload = Buffer.from(content, "utf-8"); - const atomLen = Buffer.alloc(4); - atomLen.writeUInt32BE(payload.length + 8, 0); - const typeBuf = Buffer.from(atomType, "ascii"); - const ftyp = Buffer.concat([Buffer.from([0x00, 0x00, 0x00, 0x14]), Buffer.from("ftypisom", "ascii"), Buffer.alloc(8)]); - return Buffer.concat([ftyp, atomLen, typeBuf, payload]); -} - -describe("AiMetadataDetector", () => { - it("handles null and empty buffers safely", () => { - expect(inspectMediaAiSignatures(null)).toEqual({ flagged: false, flags: [], snippet: null }); - expect(inspectMediaAiSignatures(undefined)).toEqual({ flagged: false, flags: [], snippet: null }); - expect(inspectMediaAiSignatures(Buffer.alloc(0))).toEqual({ flagged: false, flags: [], snippet: null }); - expect(inspectMediaAiSignatures(Buffer.alloc(5))).toEqual({ flagged: false, flags: [], snippet: null }); - }); - - it("detects Stable Diffusion Automatic1111 parameters in PNG tEXt chunk", () => { - const prompt = "A cinematic view of a floating castle, 8k\nNegative prompt: blurry, bad anatomy\nSteps: 25, Sampler: DPM++ 2M Karras, CFG scale: 7, Seed: 998822, Size: 512x512, Model: realisticVision"; - const textPayload = Buffer.concat([ - Buffer.from("parameters", "latin1"), - Buffer.from([0x00]), - Buffer.from(prompt, "utf-8") - ]); - const png = createPngWithChunk("tEXt", textPayload); - const result = inspectMediaAiSignatures(png); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("PNG parameters chunk (Stable Diffusion / WebUI)"); - expect(result.flags).toContain("Stable Diffusion generation parameters"); - expect(result.flags).toContain("Negative prompt parameter"); - expect(result.snippet).toBe("A cinematic view of a floating castle, 8k"); - }); - - it("detects ComfyUI workflow in PNG tEXt chunk", () => { - const workflowJson = JSON.stringify({ - nodes: [ - { id: 1, type: "KSampler", class_type: "KSampler" }, - { id: 2, type: "CLIPTextEncode", class_type: "CLIPTextEncode" } - ] - }); - const textPayload = Buffer.concat([ - Buffer.from("workflow", "latin1"), - Buffer.from([0x00]), - Buffer.from(workflowJson, "utf-8") - ]); - const png = createPngWithChunk("tEXt", textPayload); - const result = inspectMediaAiSignatures(png); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("PNG workflow chunk"); - expect(result.flags).toContain("ComfyUI workflow graph"); - }); - - it("detects compressed zTXt parameters chunk", () => { - const prompt = "Stunning landscape\nSteps: 30, Sampler: Euler, CFG scale: 6.5"; - const compressed = deflateSync(Buffer.from(prompt, "utf-8")); - const textPayload = Buffer.concat([ - Buffer.from("parameters", "latin1"), - Buffer.from([0x00]), - Buffer.from([0x00]), // compression method 0 - compressed - ]); - const png = createPngWithChunk("zTXt", textPayload); - const result = inspectMediaAiSignatures(png); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("PNG parameters chunk (Stable Diffusion / WebUI)"); - expect(result.flags).toContain("Stable Diffusion generation parameters"); - }); - - it("detects Midjourney in JPEG EXIF/XMP APP1 segment", () => { - const xmp = ` - - - - Midjourney prompt: a retro stairway in neon lighting --v 6.0 - - -`; - const jpeg = createJpegWithApp1(xmp); - const result = inspectMediaAiSignatures(jpeg); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("Midjourney signature"); - expect(result.snippet).toContain("Midjourney prompt"); - }); - - it("detects C2PA digital source algorithmic media in JPEG XMP", () => { - const c2paXmp = ``; - const jpeg = createJpegWithApp1(c2paXmp); - const result = inspectMediaAiSignatures(jpeg); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("IPTC trained algorithmic media declaration"); - expect(result.flags).toContain("C2PA algorithmic data assertion"); - }); - - it("detects AI video engines in MP4 metadata atoms", () => { - const mp4 = createMp4WithAtom("moov", "Created with Runway Gen-3 Alpha video generator"); - const result = inspectMediaAiSignatures(mp4); - - expect(result.flagged).toBe(true); - expect(result.flags).toContain("Runway AI video signature"); - }); - - it("passes clean non-AI media without false positives", () => { - const cleanText = Buffer.concat([ - Buffer.from("Author", "latin1"), - Buffer.from([0x00]), - Buffer.from("Seraph Studio Artist", "utf-8") - ]); - const cleanPng = createPngWithChunk("tEXt", cleanText); - expect(inspectMediaAiSignatures(cleanPng)).toEqual({ flagged: false, flags: [], snippet: null }); - - const cleanJpeg = createJpegWithApp1("Exif\0\0Camera Model: Canon EOS 5D Mark IV"); - expect(inspectMediaAiSignatures(cleanJpeg)).toEqual({ flagged: false, flags: [], snippet: null }); - - const cleanMp4 = createMp4WithAtom("moov", "Hand-crafted Blender 3D animation render"); - expect(inspectMediaAiSignatures(cleanMp4)).toEqual({ flagged: false, flags: [], snippet: null }); - }); -}); diff --git a/apps/api/test/Auth.test.ts b/apps/api/test/Auth.test.ts index b3be7fe..8308869 100644 --- a/apps/api/test/Auth.test.ts +++ b/apps/api/test/Auth.test.ts @@ -77,7 +77,7 @@ describe("authentication", () => { expect(exchange.statusCode).toBe(200); const session = json<{ data: { token: string; user: { discordId: string; role: string } } }>(exchange).data; expect(session.user.discordId).toBe(discordId); - expect(session.user.role).toBe(Role.Member); + expect(session.user.role).toBe(Role.Voter); const me = await context.application.inject({ method: "GET", @@ -164,22 +164,6 @@ describe("authentication", () => { expect(json<{ data: { user: { role: string } } }>(exchange).data.user.role).toBe(Role.Admin); }); - it("keeps roles granted in the app when the user logs in again", async () => { - const discordId = nextSnowflake(); - const existing = await context.createUser(Role.Contributor, { discordId }); - context.discord.register("returning-code", { id: discordId, username: "Returning", avatar: null }); - const { fragment, verifier } = await login("returning-code"); - const exchange = await context.application.inject({ - method: "POST", - url: "/api/v1/auth/token", - payload: { code: fragment.get("code"), codeVerifier: verifier } - }); - expect(json<{ data: { user: { id: string; role: string } } }>(exchange).data.user).toMatchObject({ - id: existing.record.id, - role: Role.Contributor - }); - }); - it("rejects malformed and unknown bearer tokens", async () => { for (const authorization of ["Bearer nope", "Basic abc", `Bearer plt_${"a".repeat(43)}`]) { const response = await context.application.inject({ method: "GET", url: "/api/v1/rounds", headers: { authorization } }); @@ -192,12 +176,7 @@ describe("authentication", () => { const headers = { authorization: `Bearer ${serviceToken}` }; const me = await context.application.inject({ method: "GET", url: "/api/v1/auth/me", headers }); expect(me.statusCode).toBe(403); - const terms = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/terms", - headers, - payload: { version: "2026-09-27" } - }); - expect(terms.statusCode).toBe(403); + const list = await context.application.inject({ method: "GET", url: "/api/v1/users", headers }); + expect(list.statusCode).toBe(403); }); }); diff --git a/apps/api/test/Documents.test.ts b/apps/api/test/Documents.test.ts deleted file mode 100644 index 799bfe1..0000000 --- a/apps/api/test/Documents.test.ts +++ /dev/null @@ -1,118 +0,0 @@ -import { DocumentSlug } from "@platform/contracts"; -import type { LightMyRequestResponse } from "fastify"; -import { afterAll, beforeAll, describe, expect, it } from "vitest"; -import { Role } from "../src/Domain/Roles.js"; -import { sanitizeDocumentHtml } from "../src/Modules/Documents/DocumentSanitizer.js"; -import { createTestContext, json, type TestContext, type TestUser } from "./Support/TestApplication.js"; - -describe("document sanitizer", () => { - it("keeps formatting and strips anything executable", () => { - expect(sanitizeDocumentHtml("

Hi

")).toBe("

Hi

"); - expect(sanitizeDocumentHtml('

a

')).toBe("

a

"); - expect(sanitizeDocumentHtml('x')).toBe("x"); - expect(sanitizeDocumentHtml('x')).toBe("x"); - expect(sanitizeDocumentHtml('x')).toBe('x'); - expect(sanitizeDocumentHtml('x')).toBe( - 'x' - ); - expect(sanitizeDocumentHtml('

Banner

')).toBe( - '

Banner

' - ); - }); -}); - -describe("documents", () => { - let context: TestContext; - let superAdmin: TestUser; - - beforeAll(async () => { - context = await createTestContext(); - superAdmin = await context.createUser(Role.SuperAdmin); - }); - - afterAll(async () => { - await context.close(); - }); - - const publish = (user: TestUser, slug: DocumentSlug, payload: Record): Promise => - context.application.inject({ method: "PUT", url: `/api/v1/documents/${slug}`, headers: user.headers, payload }); - - const body = { - title: "Guidelines", - sections: [{ id: "intro", title: "Intro", html: "

Hello

" }], - expectedRevision: 0 - }; - - it("serves defaults to anyone before the first publish", async () => { - const response = await context.application.inject({ method: "GET", url: "/api/v1/documents/terms" }); - expect(response.statusCode).toBe(200); - expect(json<{ data: { revision: number; sections: unknown[] } }>(response).data.revision).toBe(0); - }); - - it("only lets supervisors and above publish", async () => { - const contributor = await context.createUser(Role.Contributor); - expect((await publish(contributor, DocumentSlug.Guidelines, body)).statusCode).toBe(403); - }); - - it("publishes sanitized revisions and rejects stale edits", async () => { - const first = await publish(superAdmin, DocumentSlug.Guidelines, body); - expect(first.statusCode).toBe(200); - expect(json<{ data: { revision: number; sections: { html: string }[] } }>(first).data).toMatchObject({ - revision: 1, - sections: [{ html: "

Hello

" }] - }); - expect((await publish(superAdmin, DocumentSlug.Guidelines, body)).statusCode).toBe(409); - - const revisions = await context.application.inject({ - method: "GET", - url: "/api/v1/documents/guidelines/revisions", - headers: superAdmin.headers - }); - expect(json<{ data: { revision: number }[] }>(revisions).data.map((item) => item.revision)).toEqual([1]); - }); - - it("rejects duplicate section anchors", async () => { - const duplicate = { - ...body, - expectedRevision: 0, - sections: [ - { id: "a", title: "A", html: "" }, - { id: "a", title: "B", html: "" } - ] - }; - expect((await publish(superAdmin, DocumentSlug.Privacy, duplicate)).statusCode).toBe(400); - }); - - it("makes everyone re-accept when a legal change requires it", async () => { - const voter = await context.createUser(Role.Voter); - const published = await publish(superAdmin, DocumentSlug.Terms, { - ...body, - title: "Terms", - requireReacceptance: true - }); - expect(published.statusCode).toBe(200); - - const ballot = await context.application.inject({ - method: "PUT", - url: "/api/v1/rounds/00000000-0000-4000-8000-000000000000/ballots/me", - headers: voter.headers, - payload: { picks: ["00000000-0000-4000-8000-000000000001"] } - }); - expect(json<{ code: string }>(ballot).code).toBe("TERMS_NOT_ACCEPTED"); - - const acceptance = await context.application.inject({ method: "GET", url: "/api/v1/legal/acceptance" }); - const { version } = json<{ data: { version: string } }>(acceptance).data; - const accepted = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/terms", - headers: voter.headers, - payload: { version } - }); - expect(json<{ data: { termsVersion: string } }>(accepted).data.termsVersion).toBe(version); - }); - - it("does not let guidelines demand re-acceptance", async () => { - const response = await publish(superAdmin, DocumentSlug.Guidelines, { ...body, expectedRevision: 1, requireReacceptance: true }); - expect(response.statusCode).toBe(400); - }); -}); diff --git a/apps/api/test/Http.test.ts b/apps/api/test/Http.test.ts index 65569be..1bd70dc 100644 --- a/apps/api/test/Http.test.ts +++ b/apps/api/test/Http.test.ts @@ -70,8 +70,7 @@ describe("http contract", () => { it("reports readiness and publishes an OpenAPI document", async () => { expect(json(await context.application.inject({ method: "GET", url: "/health/ready" }))).toEqual({ status: "ok" }); - const moderator = await context.createUser(Role.Moderator); - const spec = await context.application.inject({ method: "GET", url: "/api/v1/openapi.json", headers: moderator.headers }); + const spec = await context.application.inject({ method: "GET", url: "/api/v1/openapi.json" }); expect(spec.statusCode).toBe(200); const document = json<{ openapi: string; paths: Record }>(spec); expect(document.openapi).toBe("3.1.0"); diff --git a/apps/api/test/Notifications.test.ts b/apps/api/test/Notifications.test.ts index cef6c00..a2bd6a5 100644 --- a/apps/api/test/Notifications.test.ts +++ b/apps/api/test/Notifications.test.ts @@ -1,9 +1,7 @@ import { actingUserHeader, NotificationType, platformNotificationSchema } from "@platform/contracts"; -import { eq } from "drizzle-orm"; import { afterAll, beforeAll, describe, expect, it } from "vitest"; import { PollType, RoundStatus } from "../src/Domain/Enums.js"; import { Role } from "../src/Domain/Roles.js"; -import { entries } from "../src/Infrastructure/Database/Schema.js"; import { createTestContext, json, nextSnowflake, serviceToken, type TestContext } from "./Support/TestApplication.js"; interface Envelope { @@ -32,7 +30,7 @@ describe("platform service integration", () => { payload: { username: "BotUser", avatar: null } }); expect(synced.statusCode).toBe(200); - expect(json>(synced).data).toMatchObject({ role: Role.Member, username: "BotUser" }); + expect(json>(synced).data).toMatchObject({ role: Role.Voter, username: "BotUser" }); const user = await context.createUser(Role.Voter); const forbidden = await context.application.inject({ @@ -97,7 +95,6 @@ describe("platform service integration", () => { it("streams notifications to the service and resumes from Last-Event-ID", async () => { const address = await context.application.listen({ host: "127.0.0.1", port: 0 }); const supervisor = await context.createUser(Role.Supervisor); - const admin = await context.createUser(Role.Admin); const baseline = await context.notificationLog.latestId(); const denied = await fetch(`${address}/api/v1/notifications/stream`, { headers: supervisor.headers }); @@ -113,12 +110,8 @@ describe("platform service integration", () => { await context.application.inject({ method: "POST", url: "/api/v1/rounds", - headers: admin.headers, - payload: { - title: "Streamed round", - pollType: PollType.Binary, - binaryEntries: [{ title: "Choice 1" }, { title: "Choice 2" }] - } + headers: supervisor.headers, + payload: { title: "Streamed round", pollType: PollType.Binary } }); const reader = response.body?.getReader(); @@ -141,43 +134,42 @@ describe("platform service integration", () => { it("emits notifications that match the published contract", async () => { const supervisor = await context.createUser(Role.Supervisor); - const admin = await context.createUser(Role.Admin); const voter = await context.createUser(Role.Voter); const round = json>( await context.application.inject({ method: "POST", url: "/api/v1/rounds", - headers: admin.headers, - payload: { - title: "Contract", - pollType: PollType.Binary, - binaryEntries: [{ title: "A" }, { title: "B" }] - } + headers: supervisor.headers, + payload: { title: "Contract", pollType: PollType.Binary } }) ).data; + const entryIds: string[] = []; + for (const title of ["A", "B"]) { + const entry = await context.application.inject({ + method: "POST", + url: `/api/v1/rounds/${round.id}/entries`, + headers: supervisor.headers, + payload: { title } + }); + entryIds.push(json>(entry).data.id); + } await context.application.inject({ method: "PATCH", url: `/api/v1/rounds/${round.id}`, headers: supervisor.headers, - payload: { title: "Contract Renamed" } - }); - const roundEntries = await context.database - .select() - .from(entries) - .where(eq(entries.roundId, round.id)) - .orderBy(entries.createdAt, entries.id); - const entryIds = roundEntries.map((e) => e.id); - await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${round.id}`, - headers: supervisor.headers, - payload: { status: RoundStatus.Voting } + payload: { status: RoundStatus.Open } }); await context.application.inject({ method: "PUT", url: `/api/v1/rounds/${round.id}/ballots/me`, headers: voter.headers, - payload: { picks: [entryIds[0]!] } + payload: { picks: [entryIds[0]] } + }); + await context.application.inject({ + method: "PATCH", + url: `/api/v1/rounds/${round.id}`, + headers: supervisor.headers, + payload: { status: RoundStatus.Closed } }); await context.application.inject({ method: "POST", url: `/api/v1/rounds/${round.id}/finalize`, headers: supervisor.headers }); await context.application.inject({ @@ -192,64 +184,6 @@ describe("platform service integration", () => { headers: supervisor.headers, payload: { sceneNumber: 1, shotCode: "NT-1", title: "Notify", difficultyTier: "easy" } }); - await context.application.inject({ - method: "POST", - url: "/api/v1/pipeline/progress", - headers: supervisor.headers, - payload: { - stepIndex: 1, - stepId: "0.2", - stepTitle: "Story Vote", - phaseNumber: 0, - phaseTitle: "Phase 0: Pre-Production", - progressPercent: 7, - isPhaseTransition: false - } - }); - const pipeline = await context.application.inject({ method: "GET", url: "/api/v1/pipeline" }); - expect(json>(pipeline).data).toMatchObject({ - stepId: "0.2", - progressPercent: 7 - }); - - const tempRound = json>( - await context.application.inject({ - method: "POST", - url: "/api/v1/rounds", - headers: admin.headers, - payload: { title: "Temp Round", pollType: PollType.RankedChoice } - }) - ).data; - await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${tempRound.id}`, - headers: supervisor.headers, - payload: { status: RoundStatus.Open } - }); - const tempEntry = json>( - await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${tempRound.id}/entries`, - headers: supervisor.headers, - payload: { title: "Temp Entry" } - }) - ).data; - await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${tempRound.id}/entries/${tempEntry.id}`, - headers: admin.headers, - payload: { title: "Renamed Entry" } - }); - await context.application.inject({ - method: "DELETE", - url: `/api/v1/rounds/${tempRound.id}/entries/${tempEntry.id}`, - headers: admin.headers - }); - await context.application.inject({ - method: "DELETE", - url: `/api/v1/rounds/${tempRound.id}`, - headers: supervisor.headers - }); await new Promise((resolve) => setTimeout(resolve, 10)); const types = new Set(); @@ -262,17 +196,12 @@ describe("platform service integration", () => { } for (const expected of [ NotificationType.RoundCreated, - NotificationType.RoundUpdated, - NotificationType.RoundDeleted, NotificationType.EntrySubmitted, - NotificationType.EntryUpdated, - NotificationType.EntryDeleted, NotificationType.RoundStatusChanged, NotificationType.BallotSubmitted, NotificationType.RoundFinalized, NotificationType.UserBlacklisted, - NotificationType.ShotCreated, - NotificationType.PipelineUpdated + NotificationType.ShotCreated ]) { expect(types.has(expected), expected).toBe(true); } diff --git a/apps/api/test/Shots.test.ts b/apps/api/test/Shots.test.ts index d24883f..77c3c3e 100644 --- a/apps/api/test/Shots.test.ts +++ b/apps/api/test/Shots.test.ts @@ -2,8 +2,7 @@ import { eq } from "drizzle-orm"; import { afterAll, beforeAll, describe, expect, it } from "vitest"; import { DifficultyTier, ShotStatus } from "../src/Domain/Enums.js"; import { Role } from "../src/Domain/Roles.js"; -import { shots, users } from "../src/Infrastructure/Database/Schema.js"; -import { NotificationType } from "../src/Infrastructure/Notifications/Notification.js"; +import { shots } from "../src/Infrastructure/Database/Schema.js"; import { StorageBucket } from "../src/Infrastructure/Storage/ObjectStorage.js"; import { createTestContext, json, nextSnowflake, serviceToken, type TestContext, type TestUser } from "./Support/TestApplication.js"; @@ -37,13 +36,16 @@ describe("shot grab-box", () => { it("runs claim, upload, submit and review", async () => { const shotId = await createShot("SC01-010"); + const contributor = await context.createUser(Role.Contributor); const voter = await context.createUser(Role.Voter); - // users without contributor role can claim tasks + expect( + (await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/claim`, headers: voter.headers })).statusCode + ).toBe(403); const claim = await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/claim`, - headers: voter.headers + headers: contributor.headers }); expect(claim.statusCode).toBe(200); expect(json>(claim).data.status).toBe(ShotStatus.Claimed); @@ -52,14 +54,14 @@ describe("shot grab-box", () => { const second = await context.application.inject({ method: "POST", url: `/api/v1/shots/${otherShot}/claim`, - headers: voter.headers + headers: contributor.headers }); expect(json(second).code).toBe("ACTIVE_CLAIM_EXISTS"); const badExtension = await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/uploads`, - headers: voter.headers, + headers: contributor.headers, payload: { kind: "video", fileName: "../../evil.sh", contentType: "video/mp4", sizeBytes: 100 } }); expect(badExtension.statusCode).toBe(422); @@ -67,47 +69,33 @@ describe("shot grab-box", () => { const upload = await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/uploads`, - headers: voter.headers, + headers: contributor.headers, payload: { kind: "video", fileName: "../../final cut.mp4", contentType: "video/mp4", sizeBytes: 1024 } }); expect(upload.statusCode).toBe(201); const { key } = json>(upload).data; - expect(key).toMatch(new RegExp(`^shots/${shotId}/${voter.record.id}/[0-9a-f-]{36}-final_cut\\.mp4$`, "u")); - - const blendUpload = await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/uploads`, - headers: voter.headers, - payload: { kind: "blend", fileName: "project.blend", contentType: "application/octet-stream", sizeBytes: 2048 } - }); - expect(blendUpload.statusCode).toBe(201); - const blendKey = json>(blendUpload).data.key; + expect(key).toMatch(new RegExp(`^shots/${shotId}/${contributor.record.id}/[0-9a-f-]{36}-final_cut\\.mp4$`, "u")); const missing = await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/submissions`, - headers: voter.headers, - payload: { videoKey: key, blendKey } + headers: contributor.headers, + payload: { videoKey: key } }); expect(json(missing).code).toBe("UPLOAD_MISSING"); context.storage.store(StorageBucket.Deliverables, key, 1024, "video/mp4"); - context.storage.store(StorageBucket.Deliverables, blendKey, 2048, "application/octet-stream"); const submitted = await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/submissions`, - headers: voter.headers, - payload: { videoKey: key, blendKey, notes: "v1" } + headers: contributor.headers, + payload: { videoKey: key, notes: "v1" } }); expect(submitted.statusCode).toBe(201); const submission = json>(submitted).data; expect(submission.version).toBe(1); expect(submission.videoUrl).not.toBeNull(); - // submitting work promotes voter to contributor - const [updatedUser] = await context.database.select().from(users).where(eq(users.id, voter.record.id)); - expect(updatedUser?.role).toBe(Role.Contributor); - const publicDetail = await context.application.inject({ method: "GET", url: `/api/v1/shots/${shotId}` }); expect(json>(publicDetail).data.submissions[0]?.videoUrl).toBeNull(); @@ -145,22 +133,13 @@ describe("shot grab-box", () => { payload: { kind: "video", fileName: "a.mp4", contentType: "video/mp4", sizeBytes: 10 } }) ).data; - const blendUpload = json>( - await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/uploads`, - headers: worker.headers, - payload: { kind: "blend", fileName: "a.blend", contentType: "application/octet-stream", sizeBytes: 10 } - }) - ).data; context.storage.store(StorageBucket.Deliverables, upload.key, 10, "video/mp4"); - context.storage.store(StorageBucket.Deliverables, blendUpload.key, 10, "application/octet-stream"); const submission = json>( await context.application.inject({ method: "POST", url: `/api/v1/shots/${shotId}/submissions`, headers: worker.headers, - payload: { videoKey: upload.key, blendKey: blendUpload.key } + payload: { videoKey: upload.key } }) ).data; const review = await context.application.inject({ @@ -229,11 +208,7 @@ describe("shot grab-box", () => { payload: { discordThreadId: threadId } }); expect(bound.statusCode).toBe(200); - const lookup = await context.application.inject({ - method: "GET", - url: `/api/v1/shot-thread-maps/by-thread/${threadId}`, - headers: { authorization: `Bearer ${serviceToken}` } - }); + const lookup = await context.application.inject({ method: "GET", url: `/api/v1/shot-thread-maps/by-thread/${threadId}` }); expect(json>(lookup).data.shotId).toBe(shotId); const unknownShot = await context.application.inject({ method: "PUT", @@ -243,120 +218,4 @@ describe("shot grab-box", () => { }); expect(unknownShot.statusCode).toBe(404); }); - - it("attaches and resolves up to 4 reference images", async () => { - const key1 = "media/11111111-1111-4111-8111-111111111111/22222222-2222-4222-8222-222222222222.png"; - const key2 = "media/11111111-1111-4111-8111-111111111111/33333333-3333-4333-8333-333333333333.jpg"; - - const response = await context.application.inject({ - method: "POST", - url: "/api/v1/shots", - headers: supervisor.headers, - payload: { - sceneNumber: 2, - shotCode: "SC06-010", - title: "Ref test", - difficultyTier: DifficultyTier.Easy, - imageKeys: [key1, key2] - } - }); - expect(response.statusCode).toBe(201); - const created = json>(response).data; - expect(created.imageUrls).toHaveLength(2); - expect(created.imageUrls[0]).toContain(key1); - expect(created.imageUrls[1]).toContain(key2); - - // reject more than 4 images - const tooMany = await context.application.inject({ - method: "POST", - url: "/api/v1/shots", - headers: supervisor.headers, - payload: { - sceneNumber: 2, - shotCode: "SC06-020", - title: "Too many images", - difficultyTier: DifficultyTier.Easy, - imageKeys: ["key1", "key2", "key3", "key4", "key5"] - } - }); - expect(tooMany.statusCode).toBe(400); - - // update images - const updated = await context.application.inject({ - method: "PATCH", - url: `/api/v1/shots/${created.id}`, - headers: supervisor.headers, - payload: { - imageKeys: [key1] - } - }); - expect(updated.statusCode).toBe(200); - expect(json>(updated).data.imageUrls).toHaveLength(1); - }); - - it("scans task deliverables for AI video signatures and notifies supervisors", async () => { - const shotId = await createShot("SC07-010"); - const worker = await context.createUser(Role.Contributor); - - await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/claim`, - headers: worker.headers - }); - - // create synthetic MP4 with Runway Gen-3 metadata in moov atom - const moovPayload = Buffer.from("Rendered with Runway Gen-3 Alpha model", "utf-8"); - const atomLen = Buffer.alloc(4); - atomLen.writeUInt32BE(moovPayload.length + 8, 0); - const ftyp = Buffer.concat([Buffer.from([0x00, 0x00, 0x00, 0x14]), Buffer.from("ftypisom", "ascii"), Buffer.alloc(8)]); - const mp4Buf = Buffer.concat([ftyp, atomLen, Buffer.from("moov", "ascii"), moovPayload]); - - const videoKey = `shots/${shotId}/${worker.record.id}/11111111-2222-3333-4444-555555555555-video_ai.mp4`; - const blendKey = `shots/${shotId}/${worker.record.id}/11111111-2222-3333-4444-555555555555-project.blend`; - context.storage.store(StorageBucket.Deliverables, videoKey, mp4Buf.length, "video/mp4", mp4Buf); - context.storage.store(StorageBucket.Deliverables, blendKey, 100, "application/octet-stream"); - - const submitted = await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/submissions`, - headers: worker.headers, - payload: { videoKey, blendKey, notes: "AI generated test shot" } - }); - expect(submitted.statusCode).toBe(201); - const submission = json>(submitted).data; - expect(submission.aiFlags).toContain("Runway AI video signature"); - - // verify telemetry alert notification - const aiNotif = context.notifier.notifications.find( - (n) => n.type === NotificationType.MediaFlaggedAi && n.targetId === submission.id - ); - expect(aiNotif).toBeDefined(); - if (aiNotif && aiNotif.type === NotificationType.MediaFlaggedAi) { - expect(aiNotif.mediaKind).toBe("task_submission"); - expect(aiNotif.flags).toContain("Runway AI video signature"); - } - }); - - it("prevents blacklisted users from claiming or submitting tasks", async () => { - const shotId = await createShot("SC08-010"); - const worker = await context.createUser(Role.Contributor); - await context.database.update(users).set({ isBlacklisted: true }).where(eq(users.id, worker.record.id)); - - const claimAttempt = await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/claim`, - headers: worker.headers - }); - expect(claimAttempt.statusCode).toBe(403); - expect(json(claimAttempt).code).toBe("USER_BLACKLISTED"); - - const submitAttempt = await context.application.inject({ - method: "POST", - url: `/api/v1/shots/${shotId}/submissions`, - headers: worker.headers, - payload: { videoKey: "dummy-video", blendKey: "dummy-blend", notes: null } - }); - expect(submitAttempt.statusCode).toBe(403); - expect(json(submitAttempt).code).toBe("USER_BLACKLISTED"); - }); }); diff --git a/apps/api/test/Support/TestApplication.ts b/apps/api/test/Support/TestApplication.ts index 091dde0..f90e423 100644 --- a/apps/api/test/Support/TestApplication.ts +++ b/apps/api/test/Support/TestApplication.ts @@ -10,22 +10,13 @@ import { pino } from "pino"; import { buildApplication } from "../../src/App.js"; import type { ApplicationConfiguration } from "../../src/Configuration/ApplicationConfiguration.js"; import { createServiceContainer, type ServiceContainer } from "../../src/Composition/ServiceContainer.js"; -import { initialTermsVersion } from "@platform/contracts"; -import { Role } from "../../src/Domain/Roles.js"; +import { type Role } from "../../src/Domain/Roles.js"; import { MemoryKeyValueStore } from "../../src/Infrastructure/Cache/MemoryKeyValueStore.js"; import type { Database } from "../../src/Infrastructure/Database/Database.js"; import * as schema from "../../src/Infrastructure/Database/Schema.js"; import { MemoryEventBus } from "../../src/Infrastructure/Events/MemoryEventBus.js"; import { MemoryNotificationLog } from "../../src/Infrastructure/Notifications/MemoryNotificationLog.js"; -import { - FakeCaptchaVerifier, - FakeDiscordOAuthClient, - FakeMailDomainChecker, - FakeObjectStorage, - FakePresenceProvider, - RecordingEmailSender, - RecordingNotifier -} from "./TestDoubles.js"; +import { FakeDiscordOAuthClient, FakeObjectStorage, FakePresenceProvider, RecordingNotifier } from "./TestDoubles.js"; export const webOrigin = "https://app.example.test"; export const serviceToken = "service-token-for-integration-tests-0123456789"; @@ -50,7 +41,7 @@ export const testConfiguration: ApplicationConfiguration = { clientSecret: "secret", redirectUri: "https://api.example.test/api/v1/auth/discord/callback" }, - roleAssignments: { superAdmins: [], admins: [adminDiscordId], supervisors: [], moderators: [], seniorContributors: [] }, + roleAssignments: { admins: [adminDiscordId], supervisors: [], moderators: [], seniorContributors: [] }, storage: { endpoint: undefined, region: "auto", @@ -61,9 +52,7 @@ export const testConfiguration: ApplicationConfiguration = { mediaPublicUrl: "https://media.test", mediaMaxBytes: 5 * 1024 * 1024, deliverableMaxBytes: 100 * 1024 * 1024 - }, - email: { resendApiKey: undefined, from: undefined }, - verification: { turnstileSecretKey: undefined } + } }; export interface TestUser { @@ -81,7 +70,6 @@ export interface TestContext { readonly eventBus: MemoryEventBus; readonly storage: FakeObjectStorage; readonly discord: FakeDiscordOAuthClient; - readonly emailSender: RecordingEmailSender; createUser(role: Role, overrides?: Partial): Promise; close(): Promise; } @@ -137,7 +125,6 @@ export async function createTestContext(): Promise { const eventBus = new MemoryEventBus(); const storage = new FakeObjectStorage(); const discord = new FakeDiscordOAuthClient(); - const emailSender = new RecordingEmailSender(); const services = createServiceContainer( testConfiguration, { @@ -151,9 +138,6 @@ export async function createTestContext(): Promise { notifier, notificationLog, rateLimitRedis: undefined, - emailSender, - captchaVerifier: new FakeCaptchaVerifier(), - mailDomainChecker: new FakeMailDomainChecker(), dispose: () => testDatabase.close() }, logger, @@ -171,19 +155,10 @@ export async function createTestContext(): Promise { eventBus, storage, discord, - emailSender, createUser: async (role, overrides = {}) => { const [record] = await database .insert(schema.users) - .values({ - discordId: nextSnowflake(), - discordUsername: `${role}-user`, - role, - termsVersion: initialTermsVersion, - termsAcceptedAt: new Date(), - emailVerifiedAt: role === Role.Member ? null : new Date(), - ...overrides - }) + .values({ discordId: nextSnowflake(), discordUsername: `${role}-user`, role, ...overrides }) .returning(); if (record === undefined) { throw new Error("user insert failed"); diff --git a/apps/api/test/Support/TestDoubles.ts b/apps/api/test/Support/TestDoubles.ts index 0cedd9f..02dfdbd 100644 --- a/apps/api/test/Support/TestDoubles.ts +++ b/apps/api/test/Support/TestDoubles.ts @@ -1,6 +1,3 @@ -import type { CaptchaVerifier } from "../../src/Infrastructure/Captcha/CaptchaVerifier.js"; -import type { EmailMessage, EmailSender } from "../../src/Infrastructure/Email/EmailSender.js"; -import type { MailDomainChecker } from "../../src/Infrastructure/Email/MailDomainChecker.js"; import type { NotificationInput } from "../../src/Infrastructure/Notifications/Notification.js"; import { StreamNotifier } from "../../src/Infrastructure/Notifications/NotificationLog.js"; import { DiscordOAuthError, type DiscordOAuthClient, type DiscordProfile } from "../../src/Infrastructure/Discord/DiscordOAuthClient.js"; @@ -44,7 +41,6 @@ export class FakePresenceProvider implements PresenceProvider { export class FakeObjectStorage implements ObjectStorage { private readonly objects = new Map(); - private readonly buffers = new Map(); public isEnabled(): boolean { return true; @@ -60,25 +56,14 @@ export class FakeObjectStorage implements ObjectStorage { }); } - public store(bucket: StorageBucket, key: string, sizeBytes: number, contentType: string, data?: Buffer): void { + public store(bucket: StorageBucket, key: string, sizeBytes: number, contentType: string): void { this.objects.set(`${bucket}:${key}`, { sizeBytes, contentType }); - if (data !== undefined) { - this.buffers.set(`${bucket}:${key}`, data); - } } public getMetadata(bucket: StorageBucket, key: string): Promise { return Promise.resolve(this.objects.get(`${bucket}:${key}`) ?? null); } - public getObject(bucket: StorageBucket, key: string, maxBytes?: number): Promise { - const buf = this.buffers.get(`${bucket}:${key}`); - if (buf === undefined) { - return Promise.resolve(null); - } - return Promise.resolve(maxBytes !== undefined && maxBytes > 0 ? buf.subarray(0, maxBytes) : buf); - } - public createDownloadUrl(bucket: StorageBucket, key: string): Promise { return Promise.resolve(`https://storage.test/${bucket}/${key}?download=1`); } @@ -86,11 +71,6 @@ export class FakeObjectStorage implements ObjectStorage { public getPublicUrl(bucket: StorageBucket, key: string): string | null { return `https://media.test/${bucket}/${key}`; } - - public deleteObject(bucket: StorageBucket, key: string): Promise { - this.objects.delete(`${bucket}:${key}`); - return Promise.resolve(); - } } export class RecordingNotifier extends StreamNotifier { @@ -101,34 +81,3 @@ export class RecordingNotifier extends StreamNotifier { super.notify(notification); } } - -export const passingCaptchaToken = "captcha-pass"; - -export class FakeCaptchaVerifier implements CaptchaVerifier { - public verify(token: string): Promise { - return Promise.resolve(token === passingCaptchaToken); - } -} - -export class FakeMailDomainChecker implements MailDomainChecker { - public acceptsMail(domain: string): Promise { - return Promise.resolve(!domain.endsWith(".invalid")); - } -} - -export class RecordingEmailSender implements EmailSender { - public readonly messages: EmailMessage[] = []; - - public isEnabled(): boolean { - return true; - } - - public send(message: EmailMessage): Promise { - this.messages.push(message); - return Promise.resolve(); - } - - public lastCode(): string | null { - return /\d{6}/u.exec(this.messages.at(-1)?.text ?? "")?.[0] ?? null; - } -} diff --git a/apps/api/test/Users.test.ts b/apps/api/test/Users.test.ts index 8c4f8ee..4b3a6d6 100644 --- a/apps/api/test/Users.test.ts +++ b/apps/api/test/Users.test.ts @@ -1,4 +1,3 @@ -import { NotificationType } from "@platform/contracts"; import { afterAll, beforeAll, describe, expect, it } from "vitest"; import { Role, Specialty } from "../src/Domain/Roles.js"; import { createTestContext, json, nextSnowflake, serviceToken, type TestContext } from "./Support/TestApplication.js"; @@ -14,73 +13,13 @@ describe("user management", () => { await context.close(); }); - it("hides the member directory from regular users but allows moderators and service tokens", async () => { + it("hides the member directory from regular users", async () => { const voter = await context.createUser(Role.Voter); const moderator = await context.createUser(Role.Moderator); expect((await context.application.inject({ method: "GET", url: "/api/v1/users", headers: voter.headers })).statusCode).toBe(403); const list = await context.application.inject({ method: "GET", url: "/api/v1/users?perPage=5", headers: moderator.headers }); expect(list.statusCode).toBe(200); expect(json<{ meta: { perPage: number } }>(list).meta.perPage).toBe(5); - - const serviceList = await context.application.inject({ - method: "GET", - url: "/api/v1/users?perPage=5", - headers: { authorization: `Bearer ${serviceToken}` } - }); - expect(serviceList.statusCode).toBe(200); - expect(json<{ meta: { perPage: number } }>(serviceList).meta.perPage).toBe(5); - }); - - it("lets users choose craft specialties but keeps assigned leadership ones", async () => { - const user = await context.createUser(Role.Contributor, { specialties: [Specialty.Producer] }); - expect( - json<{ data: { isOnboarded: boolean } }>( - await context.application.inject({ method: "GET", url: "/api/v1/auth/me", headers: user.headers }) - ).data.isOnboarded - ).toBe(false); - - const leadership = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/specialties", - headers: user.headers, - payload: { specialties: [Specialty.CreativeDirector] } - }); - expect(leadership.statusCode).toBe(400); - - const chosen = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/specialties", - headers: user.headers, - payload: { specialties: [Specialty.Animator] } - }); - expect(chosen.statusCode).toBe(200); - const body = json<{ data: { specialties: string[]; isOnboarded: boolean } }>(chosen).data; - expect(body.specialties).toEqual([Specialty.Producer, Specialty.Animator]); - expect(body.isOnboarded).toBe(true); - }); - - it("never grants the super admin role through the api", async () => { - const superAdmin = await context.createUser(Role.SuperAdmin); - const admin = await context.createUser(Role.Admin); - const target = await context.createUser(Role.Voter); - - for (const actor of [superAdmin, admin]) { - const response = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${target.record.id}/role`, - headers: actor.headers, - payload: { role: Role.SuperAdmin } - }); - expect(response.statusCode).toBe(403); - } - - const demoteAdmin = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${admin.record.id}/role`, - headers: superAdmin.headers, - payload: { role: Role.Supervisor } - }); - expect(demoteAdmin.statusCode).toBe(200); }); it("prevents supervisors from escalating privileges", async () => { @@ -184,188 +123,4 @@ describe("user management", () => { }); expect(good.statusCode).toBe(200); }); - - it("fetches users by discord id and returns 404 if missing", async () => { - const user = await context.createUser(Role.Contributor, { specialties: [Specialty.Animator] }); - const headers = { authorization: `Bearer ${serviceToken}` }; - - const response = await context.application.inject({ - method: "GET", - url: `/api/v1/users/by-discord/${user.record.discordId}`, - headers - }); - expect(response.statusCode).toBe(200); - expect(json<{ data: { id: string; role: string; specialties: string[] } }>(response).data).toMatchObject({ - id: user.record.id, - role: Role.Contributor, - specialties: [Specialty.Animator] - }); - - const missing = await context.application.inject({ - method: "GET", - url: `/api/v1/users/by-discord/${nextSnowflake()}`, - headers - }); - expect(missing.statusCode).toBe(404); - }); - - it("emits UserRoleChanged notification when role or specialties change", async () => { - const admin = await context.createUser(Role.Admin); - const target = await context.createUser(Role.Voter); - context.notifier.notifications.length = 0; - - const response = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${target.record.id}/role`, - headers: admin.headers, - payload: { role: Role.Contributor, specialties: [Specialty.Animator] } - }); - expect(response.statusCode).toBe(200); - - const emitted = context.notifier.notifications.find((n) => n.type === NotificationType.UserRoleChanged); - expect(emitted).toBeDefined(); - expect(emitted).toMatchObject({ - type: NotificationType.UserRoleChanged, - user: { discordId: target.record.discordId, username: target.record.discordUsername }, - role: Role.Contributor, - specialties: [Specialty.Animator] - }); - }); - - it("allows admins to manage secondary roles for themselves and peer admins while preventing primary role self-mutation", async () => { - const admin1 = await context.createUser(Role.Admin, { specialties: [Specialty.Producer] }); - const admin2 = await context.createUser(Role.Admin); - const supervisor1 = await context.createUser(Role.Supervisor); - const supervisor2 = await context.createUser(Role.Supervisor); - const contributor = await context.createUser(Role.Contributor); - - // admin updating their own secondary role - const selfSpecialty = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${admin1.record.id}/role`, - headers: admin1.headers, - payload: { role: Role.Admin, specialties: [Specialty.CreativeDirector] } - }); - expect(selfSpecialty.statusCode).toBe(200); - expect(json<{ data: { specialties: string[] } }>(selfSpecialty).data.specialties).toEqual([Specialty.CreativeDirector]); - - // admin cannot modify their own primary role - const selfPrimary = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${admin1.record.id}/role`, - headers: admin1.headers, - payload: { role: Role.Contributor } - }); - expect(selfPrimary.statusCode).toBe(403); - - // admin updating peer admin's secondary role - const peerSpecialty = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${admin2.record.id}/role`, - headers: admin1.headers, - payload: { role: Role.Admin, specialties: [Specialty.ProductionManager] } - }); - expect(peerSpecialty.statusCode).toBe(200); - expect(json<{ data: { specialties: string[] } }>(peerSpecialty).data.specialties).toEqual([Specialty.ProductionManager]); - - // admin cannot modify peer admin's primary role - const peerPrimary = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${admin2.record.id}/role`, - headers: admin1.headers, - payload: { role: Role.Contributor } - }); - expect(peerPrimary.statusCode).toBe(403); - - // supervisor cannot change own secondary role - const supervisorSelf = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${supervisor1.record.id}/role`, - headers: supervisor1.headers, - payload: { role: Role.Supervisor, specialties: [Specialty.Producer] } - }); - expect(supervisorSelf.statusCode).toBe(403); - - // supervisor cannot change peer supervisor's secondary role - const supervisorPeer = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${supervisor2.record.id}/role`, - headers: supervisor1.headers, - payload: { role: Role.Supervisor, specialties: [Specialty.Producer] } - }); - expect(supervisorPeer.statusCode).toBe(403); - - // supervisor can change subordinate's secondary role - const supervisorSubordinate = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${contributor.record.id}/role`, - headers: supervisor1.headers, - payload: { role: Role.Contributor, specialties: [Specialty.LightingArtist] } - }); - expect(supervisorSubordinate.statusCode).toBe(200); - expect(json<{ data: { specialties: string[] } }>(supervisorSubordinate).data.specialties).toEqual([Specialty.LightingArtist]); - }); - - it("enforces 1-person exclusivity on supervisor/admin roles and supports atomic transfer", async () => { - const admin = await context.createUser(Role.Admin); - const supervisorA = await context.createUser(Role.Supervisor, { specialties: [Specialty.EditorialSupervisor] }); - const supervisorB = await context.createUser(Role.Supervisor); - const member1 = await context.createUser(Role.Contributor); - const member2 = await context.createUser(Role.Contributor); - - // specialty-holders lists current holder - const holders = await context.application.inject({ - method: "GET", - url: "/api/v1/users/specialty-holders", - headers: admin.headers - }); - expect(holders.statusCode).toBe(200); - const holdersData = json<{ data: Record }>(holders).data; - expect(holdersData[Specialty.EditorialSupervisor]?.id).toBe(supervisorA.record.id); - - // assigning occupied supervisor role without transfer throws 409 - const conflict = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${supervisorB.record.id}/role`, - headers: admin.headers, - payload: { role: Role.Supervisor, specialties: [Specialty.EditorialSupervisor] } - }); - expect(conflict.statusCode).toBe(409); - - // assigning with transfer: true reassigns role from A to B - context.notifier.notifications.length = 0; - const transferred = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${supervisorB.record.id}/role`, - headers: admin.headers, - payload: { role: Role.Supervisor, specialties: [Specialty.EditorialSupervisor], transfer: true } - }); - expect(transferred.statusCode).toBe(200); - expect(json<{ data: { specialties: string[] } }>(transferred).data.specialties).toEqual([Specialty.EditorialSupervisor]); - - // verify previous holder A lost the specialty - const previous = await context.application.inject({ - method: "GET", - url: `/api/v1/users/by-discord/${supervisorA.record.discordId}`, - headers: admin.headers - }); - expect(json<{ data: { specialties: string[] } }>(previous).data.specialties).toEqual([]); - - // multiple users can hold team specialties like media_team - const team1 = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${member1.record.id}/role`, - headers: admin.headers, - payload: { role: Role.Contributor, specialties: [Specialty.MediaTeam] } - }); - expect(team1.statusCode).toBe(200); - - const team2 = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${member2.record.id}/role`, - headers: admin.headers, - payload: { role: Role.Contributor, specialties: [Specialty.MediaTeam] } - }); - expect(team2.statusCode).toBe(200); - }); }); diff --git a/apps/api/test/Validation.test.ts b/apps/api/test/Validation.test.ts deleted file mode 100644 index b66f2bf..0000000 --- a/apps/api/test/Validation.test.ts +++ /dev/null @@ -1,88 +0,0 @@ -import { fieldRules, problemOf, textLimits, validateRoundWindow } from "@platform/contracts"; -import { describe, expect, it } from "vitest"; - -describe("shared text rules", () => { - it("cleans single-line text before measuring it", () => { - expect(fieldRules.entryTitle.parse(" A​good‮ title\n ")).toBe("Agood title"); - expect(problemOf(fieldRules.entryTitle, " ​ ")).toBe("Title is required."); - }); - - it("enforces short title limits", () => { - expect(problemOf(fieldRules.entryTitle, "a".repeat(textLimits.entryTitle))).toBeNull(); - expect(problemOf(fieldRules.entryTitle, "a".repeat(textLimits.entryTitle + 1))).toBe( - `Title must be ${textLimits.entryTitle} characters or fewer.` - ); - expect(problemOf(fieldRules.documentTitle, "a".repeat(textLimits.documentTitle + 1))).not.toBeNull(); - }); - - it("keeps paragraphs in multi-line text but drops control characters", () => { - expect(fieldRules.entryDescription.parse("one\r\n\r\n\r\n\r\ntwo\u0007 ")).toBe("one\n\ntwo"); - expect(fieldRules.entryDescription.parse(" ")).toBeNull(); - expect(fieldRules.entryDescription.parse(null)).toBeNull(); - }); - - it("restricts shot codes to a safe alphabet", () => { - expect(problemOf(fieldRules.shotCode, "SC-010.a_1")).toBeNull(); - expect(problemOf(fieldRules.shotCode, "sc 010")).not.toBeNull(); - expect(problemOf(fieldRules.shotCode, "")).not.toBeNull(); - }); -}); - -describe("round schedule validation", () => { - const baseNow = new Date("2026-09-28T12:00:00.000Z"); - - it("allows unscheduled rounds with null dates", () => { - expect(validateRoundWindow(null, null, { isDraft: true, now: baseNow })).toBeNull(); - expect(validateRoundWindow(null, null, { isDraft: false, now: baseNow })).toBeNull(); - }); - - it("requires both dates when one is set", () => { - expect(validateRoundWindow(baseNow, null, { isDraft: true, now: baseNow })).toBe("Scheduled rounds must have a closing time."); - expect(validateRoundWindow(null, baseNow, { isDraft: true, now: baseNow })).toBe("Scheduled rounds must have an opening time."); - }); - - it("guards draft window boundaries", () => { - const wayInPast = new Date(baseNow.getTime() - 10 * 60_000); - const nearPast = new Date(baseNow.getTime() - 2 * 60_000); - const close2h = new Date(baseNow.getTime() + 2 * 3_600_000); - - expect(validateRoundWindow(wayInPast, close2h, { isDraft: true, now: baseNow })).toBe( - "Start date cannot be more than 5 minutes in the past." - ); - expect(validateRoundWindow(nearPast, close2h, { isDraft: true, now: baseNow })).toBeNull(); - - const tooFarAhead = new Date(baseNow.getTime() + 30 * 86_400_000); - const farClose = new Date(tooFarAhead.getTime() + 2 * 3_600_000); - expect(validateRoundWindow(tooFarAhead, farClose, { isDraft: true, now: baseNow })).toBe( - "Start date cannot be more than 28 days in advance." - ); - - const shortClose = new Date(baseNow.getTime() + 30 * 60_000); - expect(validateRoundWindow(baseNow, shortClose, { isDraft: true, now: baseNow })).toBe( - "Voting duration must be at least 60 minutes." - ); - - const longClose = new Date(baseNow.getTime() + 35 * 86_400_000); - expect(validateRoundWindow(baseNow, longClose, { isDraft: true, now: baseNow })).toBe("Voting duration cannot exceed 28 days."); - }); - - it("accepts string ISO timestamps isomorphically", () => { - const openStr = "2026-09-28T12:00:00.000Z"; - const closeStr = "2026-09-28T15:00:00.000Z"; - expect(validateRoundWindow(openStr, closeStr, { isDraft: true, now: baseNow })).toBeNull(); - }); - - it("validates extensions on non-draft rounds", () => { - const opened = new Date(baseNow.getTime() - 24 * 3_600_000); - const closedInPast = new Date(baseNow.getTime() - 3_600_000); - expect(validateRoundWindow(opened, closedInPast, { isDraft: false, now: baseNow })).toBe("Closing time cannot be in the past."); - - const closedBeforeOpen = new Date(opened.getTime() - 3_600_000); - expect(validateRoundWindow(opened, closedBeforeOpen, { isDraft: false, now: baseNow })).toBe( - "Closing time must be after the start time." - ); - - const validExtension = new Date(baseNow.getTime() + 48 * 3_600_000); - expect(validateRoundWindow(opened, validExtension, { isDraft: false, now: baseNow })).toBeNull(); - }); -}); diff --git a/apps/api/test/Verification.test.ts b/apps/api/test/Verification.test.ts deleted file mode 100644 index b12afb5..0000000 --- a/apps/api/test/Verification.test.ts +++ /dev/null @@ -1,138 +0,0 @@ -import { initialTermsVersion } from "@platform/contracts"; -import type { LightMyRequestResponse } from "fastify"; -import { afterAll, beforeAll, describe, expect, it } from "vitest"; -import { Role } from "../src/Domain/Roles.js"; -import { isDisposableDomain, parseEmail } from "../src/Modules/Verification/EmailPolicy.js"; -import { createTestContext, json, type TestContext, type TestUser } from "./Support/TestApplication.js"; -import { passingCaptchaToken } from "./Support/TestDoubles.js"; - -describe("email policy", () => { - it("canonicalises addresses so aliases share one identity", () => { - expect(parseEmail(" J.Doe+votes@GoogleMail.com ")?.canonical).toBe("jdoe@gmail.com"); - expect(parseEmail("jane+x@example.org")?.canonical).toBe("jane@example.org"); - expect(parseEmail("not-an-email")).toBeNull(); - expect(parseEmail("+tag@example.org")).toBeNull(); - }); - - it("rejects disposable domains and their subdomains", () => { - expect(isDisposableDomain("mailinator.com")).toBe(true); - expect(isDisposableDomain("x.yopmail.com")).toBe(true); - expect(isDisposableDomain("proton.me")).toBe(false); - }); -}); - -describe("member verification", () => { - let context: TestContext; - - beforeAll(async () => { - context = await createTestContext(); - }); - - afterAll(async () => { - await context.close(); - }); - - const send = (user: TestUser, email: string, captchaToken = passingCaptchaToken): Promise => - context.application.inject({ - method: "POST", - url: "/api/v1/verification/email", - headers: user.headers, - payload: { email, captchaToken } - }); - - const confirm = (user: TestUser, code: string): Promise => - context.application.inject({ method: "POST", url: "/api/v1/verification/email/confirm", headers: user.headers, payload: { code } }); - - it("requires accepted terms before anything else", async () => { - const member = await context.createUser(Role.Member, { termsVersion: null }); - expect((await send(member, "member@example.org")).statusCode).toBe(403); - - const stale = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/terms", - headers: member.headers, - payload: { version: "2000-01-01" } - }); - expect(stale.statusCode).toBe(409); - - const accepted = await context.application.inject({ - method: "PUT", - url: "/api/v1/users/me/terms", - headers: member.headers, - payload: { version: initialTermsVersion } - }); - expect(json<{ data: { termsVersion: string } }>(accepted).data.termsVersion).toBe(initialTermsVersion); - }); - - it("stops members from voting or pitching until verified", async () => { - const member = await context.createUser(Role.Member); - const ballot = await context.application.inject({ - method: "PUT", - url: "/api/v1/rounds/00000000-0000-4000-8000-000000000000/ballots/me", - headers: member.headers, - payload: { picks: ["00000000-0000-4000-8000-000000000001"] } - }); - expect(ballot.statusCode).toBe(403); - expect(json<{ code: string }>(ballot).code).toBe("VERIFICATION_REQUIRED"); - }); - - it("rejects failed captchas, disposable and undeliverable addresses", async () => { - const member = await context.createUser(Role.Member); - expect((await send(member, "a@example.org", "wrong")).statusCode).toBe(400); - expect((await send(member, "a@mailinator.com")).statusCode).toBe(400); - expect((await send(member, "a@nowhere.invalid")).statusCode).toBe(400); - expect(context.emailSender.messages).toHaveLength(0); - }); - - it("verifies a member with the emailed code so they are eligible to vote", async () => { - const member = await context.createUser(Role.Member); - expect((await send(member, "Real.Person@example.org")).statusCode).toBe(200); - expect((await send(member, "Real.Person@example.org")).statusCode).toBe(429); - - const code = context.emailSender.lastCode(); - expect(code).not.toBeNull(); - expect(context.emailSender.messages.at(-1)?.to).toBe("real.person@example.org"); - - const wrong = code === "000000" ? "111111" : "000000"; - expect((await confirm(member, wrong)).statusCode).toBe(400); - - const verified = await confirm(member, code ?? ""); - expect(verified.statusCode).toBe(200); - expect(json<{ data: { role: string; isVerified: boolean } }>(verified).data).toMatchObject({ role: Role.Member, isVerified: true }); - - expect((await confirm(member, code ?? "")).statusCode).toBe(409); - }); - - it("never links one address to two accounts, including aliases", async () => { - const first = await context.createUser(Role.Member); - await send(first, "shared@example.org"); - expect((await confirm(first, context.emailSender.lastCode() ?? "")).statusCode).toBe(200); - - const second = await context.createUser(Role.Member); - expect((await send(second, "shared+alt@example.org")).statusCode).toBe(409); - }); - - it("burns the code after too many wrong guesses", async () => { - const member = await context.createUser(Role.Member); - await send(member, "guesser@example.org"); - const code = context.emailSender.lastCode() ?? ""; - const wrong = code === "000000" ? "111111" : "000000"; - for (let attempt = 0; attempt < 5; attempt++) { - expect((await confirm(member, wrong)).statusCode).toBe(400); - } - expect((await confirm(member, code)).statusCode).toBe(429); - expect((await confirm(member, code)).statusCode).toBe(429); - }); - - it("does not let staff grant voter to an unverified member", async () => { - const supervisor = await context.createUser(Role.Supervisor); - const member = await context.createUser(Role.Member); - const response = await context.application.inject({ - method: "PATCH", - url: `/api/v1/users/${member.record.id}/role`, - headers: supervisor.headers, - payload: { role: Role.Voter } - }); - expect(json<{ data: { role: string } }>(response).data.role).toBe(Role.Member); - }); -}); diff --git a/apps/api/test/Voting.test.ts b/apps/api/test/Voting.test.ts index 80cc171..150dd22 100644 --- a/apps/api/test/Voting.test.ts +++ b/apps/api/test/Voting.test.ts @@ -5,7 +5,6 @@ import { EntryStatus, PollType, RoundStatus } from "../src/Domain/Enums.js"; import { Role } from "../src/Domain/Roles.js"; import { entries, users } from "../src/Infrastructure/Database/Schema.js"; import { NotificationType } from "../src/Infrastructure/Notifications/Notification.js"; -import { StorageBucket } from "../src/Infrastructure/Storage/ObjectStorage.js"; import { createTestContext, json, type TestContext, type TestUser } from "./Support/TestApplication.js"; interface Envelope { @@ -27,16 +26,12 @@ describe("voting rounds", () => { await context.close(); }); - async function createRound(pollType: PollType, binaryEntries?: [{ title: string }, { title: string }]): Promise { - const payload: Record = { title: `Round ${pollType}`, pollType }; - if (pollType === PollType.Binary) { - payload.binaryEntries = binaryEntries ?? [{ title: "Option A" }, { title: "Option B" }]; - } + async function createRound(pollType: PollType): Promise { const response = await context.application.inject({ method: "POST", url: "/api/v1/rounds", headers: supervisor.headers, - payload + payload: { title: `Round ${pollType}`, pollType } }); expect(response.statusCode).toBe(201); return json>(response).data.id; @@ -53,16 +48,6 @@ describe("voting rounds", () => { return json>(response).data.id; } - async function approveEntry(roundId: string, approver: TestUser, entryId: string): Promise { - const response = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}/entries/${entryId}/status`, - headers: approver.headers, - payload: { status: EntryStatus.Approved } - }); - expect(response.statusCode).toBe(200); - } - async function setRoundStatus(roundId: string, status: RoundStatus): Promise { const response = await context.application.inject({ method: "PATCH", @@ -86,15 +71,10 @@ describe("voting rounds", () => { it("runs a ranked-choice round from draft to certified results", async () => { const roundId = await createRound(PollType.RankedChoice); const community = await context.createUser(Role.Voter); - - // submissions are blocked while round is in draft - const draftSubmission = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: community.headers, - payload: { title: "Draft pitch" } - }); - expect(draftSubmission.statusCode).toBe(409); + const pendingId = await addEntry(roundId, community, "Community pitch"); + const a = await addEntry(roundId, supervisor, "A"); + const b = await addEntry(roundId, supervisor, "B"); + const c = await addEntry(roundId, supervisor, "C"); const draftForPublic = await context.application.inject({ method: "GET", url: `/api/v1/rounds/${roundId}` }); expect(draftForPublic.statusCode).toBe(404); @@ -105,26 +85,9 @@ describe("voting rounds", () => { }); expect(draftForStaff.statusCode).toBe(200); - expect(await setRoundStatus(roundId, RoundStatus.Open)).toBe(200); - - const pendingId = await addEntry(roundId, community, "Community pitch"); - const aAuthor = await context.createUser(Role.Voter); - const bAuthor = await context.createUser(Role.Voter); - const cAuthor = await context.createUser(Role.Voter); - const dAuthor = await context.createUser(Role.Voter); - const eAuthor = await context.createUser(Role.Voter); - const a = await addEntry(roundId, aAuthor, "A"); - const b = await addEntry(roundId, bAuthor, "B"); - const c = await addEntry(roundId, cAuthor, "C"); - const d = await addEntry(roundId, dAuthor, "D"); - const e = await addEntry(roundId, eAuthor, "E"); - await approveEntry(roundId, supervisor, a); - await approveEntry(roundId, supervisor, b); - await approveEntry(roundId, supervisor, c); - await approveEntry(roundId, supervisor, d); - await approveEntry(roundId, supervisor, e); - const voter = await context.createUser(Role.Voter); + expect(await vote(voter, roundId, [a, b, c])).toBe(409); + expect(await setRoundStatus(roundId, RoundStatus.Open)).toBe(200); const publicList = await context.application.inject({ method: "GET", @@ -134,21 +97,6 @@ describe("voting rounds", () => { const hidden = await context.application.inject({ method: "GET", url: `/api/v1/rounds/${roundId}/entries/${pendingId}` }); expect(hidden.statusCode).toBe(404); - // voting is blocked while round is still in submission (open) stage - expect(await vote(voter, roundId, [a, b, c])).toBe(409); - - // cannot transition to voting if criteria not met, but 3 approved entries is valid for ranked choice - expect(await setRoundStatus(roundId, RoundStatus.Voting)).toBe(200); - - // submissions are blocked once round enters voting stage - const lateSubmission = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: community.headers, - payload: { title: "Late pitch" } - }); - expect(lateSubmission.statusCode).toBe(409); - expect(await vote(voter, roundId, [a, a, b])).toBe(422); expect(await vote(voter, roundId, [a, b, pendingId])).toBe(422); expect(await vote(voter, roundId, [a, b])).toBe(422); @@ -176,39 +124,20 @@ describe("voting rounds", () => { expect(leaderboard.isConserved).toBe(true); expect(leaderboard.items[0]).toMatchObject({ entryId: b, rawScore: 6 }); - // public / non-supervisor cannot access ledger - const unauthed = await context.application.inject({ method: "GET", url: `/api/v1/rounds/${roundId}/ballots` }); - expect(unauthed.statusCode).toBe(401); + const ledger = await context.application.inject({ method: "GET", url: `/api/v1/rounds/${roundId}/ballots` }); + const ledgerBody = ledger.body; + expect(ledgerBody).not.toContain(voter.record.id); + expect(json<{ data: { voter: string }[] }>(ledger).data).toHaveLength(2); - const voterLedger = await context.application.inject({ - method: "GET", - url: `/api/v1/rounds/${roundId}/ballots`, - headers: voter.headers - }); - expect(voterLedger.statusCode).toBe(403); - - const ledger = await context.application.inject({ - method: "GET", - url: `/api/v1/rounds/${roundId}/ballots`, - headers: supervisor.headers - }); - expect(ledger.statusCode).toBe(200); - const ledgerData = json<{ data: { discordId: string; discordUsername: string; picks: string[] }[] }>(ledger).data; - expect(ledgerData).toHaveLength(2); - expect(ledgerData.some((row) => row.discordId === voter.record.discordId && row.discordUsername === voter.record.discordUsername)).toBe(true); - - // updates dynamically if user changes discord username - await context.database.update(users).set({ discordUsername: "renamed_voter" }).where(eq(users.id, voter.record.id)); - const updatedLedger = await context.application.inject({ - method: "GET", - url: `/api/v1/rounds/${roundId}/ballots`, + const early = await context.application.inject({ + method: "POST", + url: `/api/v1/rounds/${roundId}/finalize`, headers: supervisor.headers }); - const updatedData = json<{ data: { discordId: string; discordUsername: string }[] }>(updatedLedger).data; - expect(updatedData.some((row) => row.discordId === voter.record.discordId && row.discordUsername === "renamed_voter")).toBe(true); + expect(json(early).code).toBe("ROUND_NOT_CLOSED"); - // cannot backtrack state from voting to open - expect(await setRoundStatus(roundId, RoundStatus.Open)).toBe(409); + expect(await setRoundStatus(roundId, RoundStatus.Closed)).toBe(200); + expect(await vote(second, roundId, [a, b, c])).toBe(409); const finalized = await context.application.inject({ method: "POST", @@ -222,44 +151,20 @@ describe("voting rounds", () => { const results = await context.application.inject({ method: "GET", url: `/api/v1/rounds/${roundId}/results` }); expect(results.statusCode).toBe(200); - expect(await vote(second, roundId, [a, b, c])).toBe(409); expect(await setRoundStatus(roundId, RoundStatus.Open)).toBe(409); - expect(await setRoundStatus(roundId, RoundStatus.Voting)).toBe(409); const deletion = await context.application.inject({ method: "DELETE", url: `/api/v1/rounds/${roundId}`, headers: supervisor.headers }); expect(deletion.statusCode).toBe(409); - - // admin can edit finalized round - const adminUpdate = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}`, - headers: admin.headers, - payload: { title: "Updated Finalized Title" } - }); - expect(adminUpdate.statusCode).toBe(200); - - // admin can delete finalized round - const adminDeletion = await context.application.inject({ - method: "DELETE", - url: `/api/v1/rounds/${roundId}`, - headers: admin.headers - }); - expect(adminDeletion.statusCode).toBe(204); }); it("excludes blacklisted voters from live standings", async () => { - const roundId = await createRound(PollType.Binary, [{ title: "Yes" }, { title: "No" }]); - const roundEntries = await context.database - .select() - .from(entries) - .where(eq(entries.roundId, roundId)) - .orderBy(entries.createdAt, entries.id); - const yes = roundEntries[0]!.id; - const no = roundEntries[1]!.id; - expect(await setRoundStatus(roundId, RoundStatus.Voting)).toBe(200); + const roundId = await createRound(PollType.Binary); + const yes = await addEntry(roundId, supervisor, "Yes"); + const no = await addEntry(roundId, supervisor, "No"); + await setRoundStatus(roundId, RoundStatus.Open); const honest = await context.createUser(Role.Voter); const brigader = await context.createUser(Role.Voter); expect(await vote(honest, roundId, [yes])).toBe(200); @@ -277,28 +182,13 @@ describe("voting rounds", () => { ).data; expect(leaderboard.totalBallots).toBe(1); expect(leaderboard.items[0]).toMatchObject({ entryId: yes, voteSharePercentage: 100 }); - - const binaryLedger = await context.application.inject({ - method: "GET", - url: `/api/v1/rounds/${roundId}/ballots`, - headers: supervisor.headers - }); - expect(binaryLedger.statusCode).toBe(200); - const binaryData = json<{ data: { discordId: string; picks: string[] }[] }>(binaryLedger).data; - expect(binaryData).toHaveLength(1); - expect(binaryData[0]?.discordId).toBe(honest.record.discordId); - expect(binaryData[0]?.picks).toEqual([yes]); }); it("does not quarantine a popular binary option", async () => { - const roundId = await createRound(PollType.Binary, [{ title: "Popular" }, { title: "Other" }]); - const roundEntries = await context.database - .select() - .from(entries) - .where(eq(entries.roundId, roundId)) - .orderBy(entries.createdAt, entries.id); - const popular = roundEntries[0]!.id; - expect(await setRoundStatus(roundId, RoundStatus.Voting)).toBe(200); + const roundId = await createRound(PollType.Binary); + const popular = await addEntry(roundId, supervisor, "Popular"); + await addEntry(roundId, supervisor, "Other"); + await setRoundStatus(roundId, RoundStatus.Open); for (let index = 0; index < 12; index++) { const voter = await context.createUser(Role.Voter); expect(await vote(voter, roundId, [popular])).toBe(200); @@ -309,107 +199,8 @@ describe("voting rounds", () => { expect(entry?.isQuarantined).toBe(false); }); - it("blocks public users from proposing entries in binary rounds", async () => { - const roundId = await createRound(PollType.Binary); - const voter = await context.createUser(Role.Voter); - const response = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: voter.headers, - payload: { title: "Public idea" } - }); - expect(response.statusCode).toBe(403); - }); - - it("requires exactly two choices when creating a binary round and allows updating them", async () => { - // missing binaryEntries - const invalidCreation = await context.application.inject({ - method: "POST", - url: "/api/v1/rounds", - headers: supervisor.headers, - payload: { title: "Binary Missing Options", pollType: PollType.Binary } - }); - expect(invalidCreation.statusCode).toBe(400); - - // supervisor creates binary round with Option A and Option B - const validCreation = await context.application.inject({ - method: "POST", - url: "/api/v1/rounds", - headers: supervisor.headers, - payload: { - title: "Binary Choice Round", - pollType: PollType.Binary, - binaryEntries: [ - { title: "Original Option A", description: "First choice" }, - { title: "Original Option B", description: "Second choice" } - ] - } - }); - expect(validCreation.statusCode).toBe(201); - const roundId = json>(validCreation).data.id; - - // verify the 2 entries exist and are approved - const initialEntries = await context.database - .select() - .from(entries) - .where(eq(entries.roundId, roundId)); - expect(initialEntries).toHaveLength(2); - const optA = initialEntries.find((e) => e.title === "Original Option A"); - const optB = initialEntries.find((e) => e.title === "Original Option B"); - expect(optA).toBeDefined(); - expect(optB).toBeDefined(); - expect(optA?.status).toBe(EntryStatus.Approved); - expect(optB?.status).toBe(EntryStatus.Approved); - - // supervisor updates binary entries while in Draft - const draftUpdate = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}`, - headers: supervisor.headers, - payload: { - binaryEntries: [ - { id: optA?.id, title: "Updated Option A", description: "New A description" }, - { id: optB?.id, title: "Updated Option B", description: "New B description" } - ] - } - }); - expect(draftUpdate.statusCode).toBe(200); - - // supervisor transitions directly Draft -> Voting - const votingTransition = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}`, - headers: supervisor.headers, - payload: { status: RoundStatus.Voting } - }); - expect(votingTransition.statusCode).toBe(200); - - // supervisor updates binary entries during Voting - const votingUpdate = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}`, - headers: supervisor.headers, - payload: { - binaryEntries: [ - { id: optA?.id, title: "Live Option A" }, - { id: optB?.id, title: "Live Option B" } - ] - } - }); - expect(votingUpdate.statusCode).toBe(200); - - // cannot delete single entry from binary round - const entryDeletion = await context.application.inject({ - method: "DELETE", - url: `/api/v1/rounds/${roundId}/entries/${initialEntries[0]!.id}`, - headers: admin.headers - }); - expect(entryDeletion.statusCode).toBe(409); - }); - it("guards entry moderation and deletion", async () => { const roundId = await createRound(PollType.RankedChoice); - await setRoundStatus(roundId, RoundStatus.Open); const voter = await context.createUser(Role.Voter); const entryId = await addEntry(roundId, voter, "Needs review"); @@ -429,19 +220,9 @@ describe("voting rounds", () => { }); expect(json>(approved).data.status).toBe(EntryStatus.Approved); - const bAuthor = await context.createUser(Role.Voter); - const cAuthor = await context.createUser(Role.Voter); - const dAuthor = await context.createUser(Role.Voter); - const eAuthor = await context.createUser(Role.Voter); - const b = await addEntry(roundId, bAuthor, "B"); - const c = await addEntry(roundId, cAuthor, "C"); - const d = await addEntry(roundId, dAuthor, "D"); - const e = await addEntry(roundId, eAuthor, "E"); - await approveEntry(roundId, supervisor, b); - await approveEntry(roundId, supervisor, c); - await approveEntry(roundId, supervisor, d); - await approveEntry(roundId, supervisor, e); - expect(await setRoundStatus(roundId, RoundStatus.Voting)).toBe(200); + const b = await addEntry(roundId, supervisor, "B"); + const c = await addEntry(roundId, supervisor, "C"); + await setRoundStatus(roundId, RoundStatus.Open); expect(await vote(voter, roundId, [entryId, b, c])).toBe(200); const deletion = await context.application.inject({ @@ -452,19 +233,10 @@ describe("voting rounds", () => { expect(deletion.statusCode).toBe(409); expect(json(deletion).code).toBe("ENTRY_HAS_BALLOTS"); - const secondAttempt = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: voter.headers, - payload: { title: "Second entry" } - }); - expect(secondAttempt.statusCode).toBe(409); - - const otherVoter = await context.createUser(Role.Voter); const media = await context.application.inject({ method: "POST", url: `/api/v1/rounds/${roundId}/entries`, - headers: otherVoter.headers, + headers: voter.headers, payload: { title: "Sneaky", mediaKey: `media/${admin.record.id}/00000000-0000-4000-8000-000000000000.png` } }); expect(media.statusCode).toBe(422); @@ -472,7 +244,6 @@ describe("voting rounds", () => { it("blocks blacklisted users from proposing entries", async () => { const roundId = await createRound(PollType.RankedChoice); - await setRoundStatus(roundId, RoundStatus.Open); const banned = await context.createUser(Role.Voter); await context.database.update(users).set({ isBlacklisted: true }).where(eq(users.id, banned.record.id)); const response = await context.application.inject({ @@ -483,128 +254,4 @@ describe("voting rounds", () => { }); expect(response.statusCode).toBe(403); }); - - it("enforces a maximum of 5 approved entries per round", async () => { - const roundId = await createRound(PollType.RankedChoice); - await setRoundStatus(roundId, RoundStatus.Open); - const entryIds: string[] = []; - for (let i = 0; i < 6; i++) { - const author = await context.createUser(Role.Voter); - entryIds.push(await addEntry(roundId, author, `Option ${i + 1}`)); - } - - // approve first 5 entries - for (let i = 0; i < 5; i++) { - await approveEntry(roundId, supervisor, entryIds[i]!); - } - - // 6th approval should fail with 409 - const sixthApproval = await context.application.inject({ - method: "PATCH", - url: `/api/v1/rounds/${roundId}/entries/${entryIds[5]}/status`, - headers: supervisor.headers, - payload: { status: EntryStatus.Approved } - }); - expect(sixthApproval.statusCode).toBe(409); - expect(json(sixthApproval).detail).toContain("maximum of 5 approved entries"); - }); - - it("scans uploaded entry media for AI metadata and notifies supervisors", async () => { - const roundId = await createRound(PollType.RankedChoice); - await setRoundStatus(roundId, RoundStatus.Open); - const author = await context.createUser(Role.Voter); - - // create synthetic PNG with Stable Diffusion parameters in tEXt chunk - const prompt = "Cyberpunk staircase\nSteps: 20, Sampler: Euler a, CFG scale: 7"; - const textPayload = Buffer.concat([ - Buffer.from("parameters", "latin1"), - Buffer.from([0x00]), - Buffer.from(prompt, "utf-8") - ]); - const signature = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); - const ihdr = Buffer.concat([Buffer.from([0x00, 0x00, 0x00, 0x0d]), Buffer.from("IHDR", "ascii"), Buffer.alloc(13), Buffer.alloc(4)]); - const customLen = Buffer.alloc(4); - customLen.writeUInt32BE(textPayload.length, 0); - const customChunk = Buffer.concat([customLen, Buffer.from("tEXt", "ascii"), textPayload, Buffer.alloc(4)]); - const iend = Buffer.concat([Buffer.from([0x00, 0x00, 0x00, 0x00]), Buffer.from("IEND", "ascii"), Buffer.alloc(4)]); - const pngBuf = Buffer.concat([signature, ihdr, customChunk, iend]); - - const mediaKey = `media/${author.record.id}/11111111-2222-3333-4444-555555555555.png`; - context.storage.store(StorageBucket.Media, mediaKey, pngBuf.length, "image/png", pngBuf); - - const response = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: author.headers, - payload: { title: "AI Generated Entry", mediaKey } - }); - expect(response.statusCode).toBe(201); - const createdEntry = json>(response).data; - expect(createdEntry.aiFlags.length).toBeGreaterThan(0); - expect(createdEntry.aiFlags).toContain("PNG parameters chunk (Stable Diffusion / WebUI)"); - - // verify notification was emitted - const aiNotif = context.notifier.notifications.find( - (n) => n.type === NotificationType.MediaFlaggedAi && n.targetId === createdEntry.id - ); - expect(aiNotif).toBeDefined(); - if (aiNotif && aiNotif.type === NotificationType.MediaFlaggedAi) { - expect(aiNotif.mediaKind).toBe("entry"); - expect(aiNotif.flags).toContain("PNG parameters chunk (Stable Diffusion / WebUI)"); - } - }); - - it("enforces single entry limit for non-admin users and allows multiple entries for admins", async () => { - const roundId = await createRound(PollType.RankedChoice); - await setRoundStatus(roundId, RoundStatus.Open); - const voter = await context.createUser(Role.Voter); - - const first = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: voter.headers, - payload: { title: "Voter Entry 1" } - }); - expect(first.statusCode).toBe(201); - - const second = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: voter.headers, - payload: { title: "Voter Entry 2" } - }); - expect(second.statusCode).toBe(409); - - const supFirst = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: supervisor.headers, - payload: { title: "Supervisor Entry 1" } - }); - expect(supFirst.statusCode).toBe(201); - - const supSecond = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: supervisor.headers, - payload: { title: "Supervisor Entry 2" } - }); - expect(supSecond.statusCode).toBe(409); - - const adminFirst = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: admin.headers, - payload: { title: "Admin Entry 1" } - }); - expect(adminFirst.statusCode).toBe(201); - - const adminSecond = await context.application.inject({ - method: "POST", - url: `/api/v1/rounds/${roundId}/entries`, - headers: admin.headers, - payload: { title: "Admin Entry 2" } - }); - expect(adminSecond.statusCode).toBe(201); - }); }); diff --git a/apps/discord/src/Api/PlatformApiClient.ts b/apps/discord/src/Api/PlatformApiClient.ts index ed78bc3..507735f 100644 --- a/apps/discord/src/Api/PlatformApiClient.ts +++ b/apps/discord/src/Api/PlatformApiClient.ts @@ -106,32 +106,10 @@ export class PlatformApiClient { this.syncedProfiles.set(identity.id, Date.now()); } - public async getUserByDiscordId(discordId: string): Promise { - try { - return (await this.send(`/users/by-discord/${discordId}`, dataEnvelope(moderatedUserSchema))).data; - } catch (error: unknown) { - if (error instanceof PlatformApiError && error.status === 404) { - return null; - } - throw error; - } - } - public async listThreadMaps(): Promise { return (await this.send("/shot-thread-maps", dataEnvelope(z.array(shotThreadMapSchema)))).data; } - public async getThreadMapByThread(discordThreadId: string): Promise { - try { - return (await this.send(`/shot-thread-maps/by-thread/${discordThreadId}`, dataEnvelope(shotThreadMapSchema))).data; - } catch (error: unknown) { - if (error instanceof PlatformApiError && error.status === 404) { - return null; - } - throw error; - } - } - public async bindThread(shotId: string, discordThreadId: string): Promise { await this.send(`/shot-thread-maps/${shotId}`, dataEnvelope(shotThreadMapSchema), { method: "PUT", body: { discordThreadId } }); } @@ -152,33 +130,6 @@ export class PlatformApiClient { return shots; } - public async listAllUsers(): Promise { - const users: ModeratedUserDto[] = []; - for (let page = 1; page <= 100; page++) { - const result = await this.send("/users", pageEnvelope(moderatedUserSchema), { query: { page, perPage: 100 } }); - users.push(...result.data); - if (page >= result.meta.totalPages) { - break; - } - } - return users; - } - - public async getShot(shotId: string): Promise { - return (await this.send(`/shots/${shotId}`, dataEnvelope(shotDetailSchema))).data; - } - - public async getShotByCode(shotCode: string): Promise { - try { - return (await this.send(`/shots/by-code/${encodeURIComponent(shotCode)}`, dataEnvelope(shotSchema))).data; - } catch (error: unknown) { - if (error instanceof PlatformApiError && error.status === 404) { - return null; - } - throw error; - } - } - public async isHealthy(): Promise<{ healthy: boolean; latencyMs: number }> { const started = performance.now(); try { @@ -191,17 +142,6 @@ export class PlatformApiClient { } } - public async sendHeartbeat(wsPingMs: number): Promise { - try { - await this.send("/health/bot-heartbeat", z.object({ status: z.literal("ok") }), { - method: "POST", - body: { wsPingMs: Math.max(0, Math.round(wsPingMs)) } - }); - } catch (error: unknown) { - this.logger.debug({ err: error }, "failed to send bot heartbeat"); - } - } - public openNotificationStream(lastEventId: string | null, signal: AbortSignal): Promise { const headers: Record = { Authorization: `Bearer ${this.serviceToken}`, Accept: "text/event-stream" }; if (lastEventId !== null) { @@ -263,10 +203,6 @@ export class ActingApiClient { return (await this.request("/auth/me", dataEnvelope(userSchema))).data; } - public async listUsers(options: { page?: number; perPage?: number; role?: Role } = {}): Promise> { - return this.request("/users", pageEnvelope(moderatedUserSchema), { query: options as Record }); - } - public async listRounds(status?: RoundStatus): Promise> { return this.request("/rounds", pageEnvelope(roundSchema), { query: { status, perPage: 100 } }); } @@ -323,7 +259,7 @@ export class ActingApiClient { public async submitWork( shotId: string, - input: { videoKey: string; blendKey: string; notes: string | null } + input: { videoKey: string; blendKey: string | null; notes: string | null } ): Promise { return (await this.request(`/shots/${shotId}/submissions`, dataEnvelope(submissionSchema), { method: "POST", body: input })).data; } diff --git a/apps/discord/src/Commands/Command.ts b/apps/discord/src/Commands/Command.ts index 5472a58..1fd419e 100644 --- a/apps/discord/src/Commands/Command.ts +++ b/apps/discord/src/Commands/Command.ts @@ -14,12 +14,8 @@ import type { NotificationConsumer } from "../Api/NotificationConsumer.js"; import { PlatformApiError, type ActingApiClient, type DiscordIdentity, type PlatformApiClient } from "../Api/PlatformApiClient.js"; import type { BotConfiguration } from "../Configuration/BotConfiguration.js"; import { Accent, notice } from "../Discord/Ui.js"; -import type { ReminderScheduler } from "../Services/ReminderScheduler.js"; -import type { RoleReconciliationService } from "../Services/RoleReconciliationService.js"; -import type { RoleSyncScheduler } from "../Services/RoleSyncScheduler.js"; import type { ServerProvisioner } from "../Services/ServerProvisioner.js"; import type { TaskForum } from "../Services/TaskForum.js"; -import type { ReminderStore } from "../State/ReminderStore.js"; import type { SettingsStore } from "../State/SettingsStore.js"; export interface BotContext { @@ -29,10 +25,6 @@ export interface BotContext { readonly forum: TaskForum; readonly provisioner: ServerProvisioner; readonly consumer: NotificationConsumer; - readonly reminders: ReminderStore; - readonly reminderScheduler: ReminderScheduler; - readonly roleReconciler: RoleReconciliationService; - readonly roleScheduler: RoleSyncScheduler; readonly logger: Logger; } @@ -51,16 +43,7 @@ export interface ComponentHandler { export class UserFacingError extends Error {} -const roleOrder: readonly Role[] = [ - Role.Member, - Role.Voter, - Role.Contributor, - Role.SeniorContributor, - Role.Moderator, - Role.Supervisor, - Role.Admin, - Role.SuperAdmin -]; +const roleOrder: readonly Role[] = [Role.Voter, Role.Contributor, Role.SeniorContributor, Role.Moderator, Role.Supervisor, Role.Admin]; export function hasAtLeast(role: Role, required: Role): boolean { return roleOrder.indexOf(role) >= roleOrder.indexOf(required); @@ -108,10 +91,7 @@ export async function replyWithError( logger: Logger ): Promise { const payload = notice(describeError(error, logger), Accent.Danger); - if (interaction.deferred && !interaction.replied) { - // edit existing deferred placeholder so the spinner terminates - await interaction.editReply(payload).catch(() => undefined); - } else if (interaction.replied) { + if (interaction.deferred || interaction.replied) { await interaction.followUp(payload).catch(() => undefined); } else { await interaction.reply(payload).catch(() => undefined); diff --git a/apps/discord/src/Commands/InfoCommands.ts b/apps/discord/src/Commands/InfoCommands.ts index b8fe4af..81aae61 100644 --- a/apps/discord/src/Commands/InfoCommands.ts +++ b/apps/discord/src/Commands/InfoCommands.ts @@ -6,15 +6,13 @@ import { requireManageGuild, type BotContext, type SlashCommand } from "./Comman const helpText = [ "## Commands", "**Voting**", - "`/rounds` • `/round` • `/vote` • `/ballot` • `/results` • `/telemetry`", - "**Tasks & Grab-Box**", - "`/available-tasks` • `/take-task` • `/release-task` • `/submit-task`", - "**Staff & Production**", - "`/create-task` • `/sync-task` • `/assign-role` • `/blacklist`", - "**Personal**", - "`/reminder set` • `/reminder list` • `/reminder cancel`", - "**Server Administration**", - "`/bot-setup` • `/sync-roles` • `/bot-status` • `/help` • `/docs`" + "/rounds · /round · /entries · /leaderboard · /results", + "**Tasks** (run inside a task post)", + "/take-task · /release-task · /submit-task", + "**Staff**", + "/create-task · /sync-task · /telemetry · /blacklist · /assign-role", + "**Server setup** (Manage Server)", + "/bot-setup · /setup-forum · /set-announcement-channel · /bot-status" ].join("\n"); const docsText = [ diff --git a/apps/discord/src/Commands/ModerationCommands.ts b/apps/discord/src/Commands/ModerationCommands.ts index 4496e43..0eedb31 100644 --- a/apps/discord/src/Commands/ModerationCommands.ts +++ b/apps/discord/src/Commands/ModerationCommands.ts @@ -2,7 +2,7 @@ import { Role, type Specialty } from "@platform/contracts"; import { MessageFlags, SlashCommandBuilder, type ChatInputCommandInteraction, type GuildMember } from "discord.js"; import { asEdit, ephemeral, message, panel, plain } from "../Discord/Ui.js"; import { findStudioRole, isLeadership, platformRoleFor } from "../Services/StudioRoles.js"; -import { actingAs, requirePlatformRole, UserFacingError, type BotContext, type SlashCommand } from "./Command.js"; +import { actingAs, UserFacingError, type BotContext, type SlashCommand } from "./Command.js"; export const blacklistCommand: SlashCommand = { definition: new SlashCommandBuilder() @@ -25,7 +25,6 @@ export const blacklistCommand: SlashCommand = { throw new UserFacingError("Pick a member or give a valid Discord ID."); } await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - await requirePlatformRole(interaction, context, Role.Supervisor); const api = actingAs(interaction, context); const ban = interaction.options.getString("action", true) === "ban"; const user = ban ? await api.blacklist(target, interaction.options.getString("reason")) : await api.reinstate(target); @@ -65,10 +64,8 @@ export const assignRoleCommand: SlashCommand = { const api = actingAs(interaction, context); const reason = `${interaction.options.getString("reason") ?? "Assigned with /assign-role"} (by ${interaction.user.username})`; - const specialtiesOf = (holder: GuildMember, extra?: Specialty, excludeRoleId?: string): Specialty[] => { - // exclude role being stripped from specialty list + const specialtiesOf = (holder: GuildMember, extra?: Specialty): Specialty[] => { const specialties = holder.roles.cache - .filter((held) => held.id !== excludeRoleId) .map((held) => findStudioRole(held.name)?.specialty) .filter((value): value is Specialty => value !== undefined); return [...new Set(extra === undefined ? specialties : [extra, ...specialties])].slice(0, 2); @@ -85,12 +82,7 @@ export const assignRoleCommand: SlashCommand = { (held) => held.id !== role.id && isLeadership(findStudioRole(held.name)?.tier ?? 3) ); if (!keepsLeadership) { - await api.setRole( - holder.id, - Role.Contributor, - specialtiesOf(holder, undefined, role.id), - holder.user.globalName ?? holder.user.username - ); + await api.setRole(holder.id, Role.Contributor, specialtiesOf(holder), holder.user.globalName ?? holder.user.username); } previous.push(holder); } diff --git a/apps/discord/src/Commands/ReminderCommands.ts b/apps/discord/src/Commands/ReminderCommands.ts deleted file mode 100644 index b7bda7d..0000000 --- a/apps/discord/src/Commands/ReminderCommands.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { SlashCommandBuilder, type AutocompleteInteraction, type ChatInputCommandInteraction } from "discord.js"; -import { parseReminderTime } from "../Common/TimeParser.js"; -import { Accent, ephemeral, panel, truncate, when } from "../Discord/Ui.js"; -import { UserFacingError, type BotContext, type SlashCommand } from "./Command.js"; - -export const reminderCommand: SlashCommand = { - definition: new SlashCommandBuilder() - .setName("reminder") - .setDescription("Set personal reminders") - .addSubcommand((sub) => - sub - .setName("set") - .setDescription("Set a new reminder") - .addStringOption((opt) => - opt.setName("when").setDescription("When to remind (30m, 2h, 1d12h, or 2024-10-15 14:00)").setRequired(true) - ) - .addStringOption((opt) => - opt.setName("message").setDescription("What to remind you about").setRequired(true).setMaxLength(500) - ) - ) - .addSubcommand((sub) => sub.setName("list").setDescription("List your active reminders")) - .addSubcommand((sub) => - sub - .setName("cancel") - .setDescription("Cancel a pending reminder") - .addStringOption((opt) => - opt.setName("reminder").setDescription("The reminder to cancel").setRequired(true).setAutocomplete(true) - ) - ) - .toJSON(), - - async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { - const sub = interaction.options.getSubcommand(true); - - if (sub === "set") { - const whenInput = interaction.options.getString("when", true); - const message = interaction.options.getString("message", true); - const fireAt = parseReminderTime(whenInput); - - let reminder; - try { - reminder = context.reminders.add(interaction.user.id, message, fireAt); - } catch (error: unknown) { - throw new UserFacingError(error instanceof Error ? error.message : "Failed to create reminder."); - } - - context.reminderScheduler.reschedule(); - - await interaction.reply( - ephemeral( - panel( - Accent.Success, - `## ⏰ Reminder set\n${truncate(reminder.message, 200)}\n\nFires ${when(reminder.fireAt)} • I'll DM you.` - ) - ) - ); - return; - } - - if (sub === "list") { - const reminders = context.reminders.forUser(interaction.user.id); - if (reminders.length === 0) { - await interaction.reply(ephemeral(panel(null, "You don't have any active reminders."))); - return; - } - - const lines = reminders.map((r, i) => `**${i + 1}.** ${truncate(r.message, 100)} — ${when(r.fireAt)}`); - await interaction.reply(ephemeral(panel(null, `## Your reminders\n${lines.join("\n")}`))); - return; - } - - if (sub === "cancel") { - const id = interaction.options.getString("reminder", true); - const removed = context.reminders.remove(id, interaction.user.id); - if (!removed) { - throw new UserFacingError("Reminder not found or it already fired."); - } - context.reminderScheduler.reschedule(); - await interaction.reply(ephemeral(panel(Accent.Success, "Reminder cancelled."))); - } - }, - - async autocomplete(interaction: AutocompleteInteraction, context: BotContext): Promise { - const focused = interaction.options.getFocused().toLowerCase(); - const reminders = context.reminders.forUser(interaction.user.id); - const choices = reminders - .filter((r) => focused.length === 0 || r.message.toLowerCase().includes(focused)) - .slice(0, 25) - .map((r) => ({ - name: truncate(r.message, 80) + ` (${new Date(r.fireAt).toLocaleDateString("en-US", { month: "short", day: "numeric" })})`, - value: r.id - })); - await interaction.respond(choices); - } -}; diff --git a/apps/discord/src/Commands/RoundCommands.ts b/apps/discord/src/Commands/RoundCommands.ts index 398102f..f5ca642 100644 --- a/apps/discord/src/Commands/RoundCommands.ts +++ b/apps/discord/src/Commands/RoundCommands.ts @@ -110,7 +110,7 @@ export const roundsCommand: SlashCommand = { .setDescription("Only show rounds with this status") .addChoices( { name: "Open", value: RoundStatus.Open }, - { name: "Voting", value: RoundStatus.Voting }, + { name: "Closed", value: RoundStatus.Closed }, { name: "Finalized", value: RoundStatus.Finalized }, { name: "Draft", value: RoundStatus.Draft } ) diff --git a/apps/discord/src/Commands/SetupCommands.ts b/apps/discord/src/Commands/SetupCommands.ts index 21a7da3..092c973 100644 --- a/apps/discord/src/Commands/SetupCommands.ts +++ b/apps/discord/src/Commands/SetupCommands.ts @@ -1,7 +1,7 @@ -import { Role } from "@platform/contracts"; -import { MessageFlags, PermissionFlagsBits, SlashCommandBuilder, type ChatInputCommandInteraction } from "discord.js"; -import { Accent, asEdit, ephemeral, panel, pluralize } from "../Discord/Ui.js"; -import { requireManageGuild, requirePlatformRole, UserFacingError, type BotContext, type SlashCommand } from "./Command.js"; +import { ChannelType, MessageFlags, PermissionFlagsBits, SlashCommandBuilder, type ChatInputCommandInteraction } from "discord.js"; +import { asEdit, ephemeral, panel, pluralize } from "../Discord/Ui.js"; +import { ChannelPurpose } from "../State/SettingsStore.js"; +import { requireManageGuild, UserFacingError, type BotContext, type SlashCommand } from "./Command.js"; export const botSetupCommand: SlashCommand = { definition: new SlashCommandBuilder() @@ -28,31 +28,88 @@ export const botSetupCommand: SlashCommand = { } }; -export const syncRolesCommand: SlashCommand = { +export const setupForumCommand: SlashCommand = { definition: new SlashCommandBuilder() - .setName("sync-roles") - .setDescription("Reorder server roles by hierarchy and reconcile member roles") - .setDefaultMemberPermissions(PermissionFlagsBits.ManageRoles) + .setName("setup-forum") + .setDescription("Choose the channels used for tasks") + .setDefaultMemberPermissions(PermissionFlagsBits.ManageGuild) + .addChannelOption((option) => + option.setName("forum").setDescription("Forum for task posts").addChannelTypes(ChannelType.GuildForum).setRequired(true) + ) + .addChannelOption((option) => + option + .setName("submissions") + .setDescription("Where review requests go") + .addChannelTypes(ChannelType.GuildText) + .setRequired(true) + ) + .addChannelOption((option) => + option.setName("log").setDescription("Where task activity is logged").addChannelTypes(ChannelType.GuildText).setRequired(true) + ) .toJSON(), async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { - if (interaction.guild === null) { - throw new UserFacingError("Run this inside the server."); - } - if (!interaction.memberPermissions?.has(PermissionFlagsBits.ManageGuild)) { - await requirePlatformRole(interaction, context, Role.Supervisor); - } + requireManageGuild(interaction); await interaction.deferReply({ flags: MessageFlags.Ephemeral }); + const forum = interaction.options.getChannel("forum", true, [ChannelType.GuildForum]); + const submissions = interaction.options.getChannel("submissions", true, [ChannelType.GuildText]); + const log = interaction.options.getChannel("log", true, [ChannelType.GuildText]); + await context.provisioner.ensureForumTags(forum); + await context.settings.update((settings) => { + settings.channels[ChannelPurpose.TaskSubmissions] = submissions.id; + settings.channels[ChannelPurpose.TaskLogs] = log.id; + }); + await interaction.editReply( + asEdit( + ephemeral( + panel(null, `Tasks post in <#${forum.id}>, reviews go to <#${submissions.id}>, and activity is logged in <#${log.id}>.`) + ) + ) + ); + } +}; - const summary = await context.roleReconciler.reconcile(interaction.guild, "manual"); - - const lines = [ - "## Role Hierarchy & Member Sync Complete", - `• Positioned **${summary.reorderedRoles}** studio roles by hierarchy (Executive > Supervisor > Contributor > Community).`, - `• Checked **${summary.totalUsersChecked}** registered users, reconciled **${summary.driftedMembersSynced}** drifted ${pluralize(summary.driftedMembersSynced, "member")}.`, - summary.errors.length > 0 ? `⚠️ Encountered ${summary.errors.length} error(s) during sync.` : null - ].filter((line): line is string => line !== null); +const channelChoices: Readonly> = { + announcements: [ChannelPurpose.Announcements], + alerts: [ChannelPurpose.Telemetry], + all: [ChannelPurpose.Announcements, ChannelPurpose.Telemetry] +}; - const accent = summary.errors.length > 0 ? Accent.Warning : Accent.Success; - await interaction.editReply(asEdit(ephemeral(panel(accent, lines.join("\n"))))); +export const setChannelCommand: SlashCommand = { + definition: new SlashCommandBuilder() + .setName("set-announcement-channel") + .setDescription("Choose where announcements and alerts are posted") + .setDefaultMemberPermissions(PermissionFlagsBits.ManageGuild) + .addChannelOption((option) => + option + .setName("channel") + .setDescription("Target channel") + .addChannelTypes(ChannelType.GuildText, ChannelType.GuildAnnouncement) + .setRequired(true) + ) + .addStringOption((option) => + option + .setName("type") + .setDescription("What to post there") + .setRequired(true) + .addChoices( + { name: "Round results and news", value: "announcements" }, + { name: "Staff telemetry alerts", value: "alerts" }, + { name: "Both", value: "all" } + ) + ) + .toJSON(), + async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { + requireManageGuild(interaction); + const channel = interaction.options.getChannel("channel", true); + const purposes = channelChoices[interaction.options.getString("type", true)] ?? []; + await context.settings.update((settings) => { + for (const purpose of purposes) { + settings.channels[purpose] = channel.id; + } + }); + const what = purposes + .map((purpose) => (purpose === ChannelPurpose.Announcements ? "announcements" : "telemetry alerts")) + .join(" and "); + await interaction.reply(ephemeral(panel(null, `Posting ${what} in <#${channel.id}>.`))); } }; diff --git a/apps/discord/src/Commands/TaskCommands.ts b/apps/discord/src/Commands/TaskCommands.ts index 776392d..2895c92 100644 --- a/apps/discord/src/Commands/TaskCommands.ts +++ b/apps/discord/src/Commands/TaskCommands.ts @@ -1,5 +1,5 @@ import { randomBytes } from "node:crypto"; -import { DifficultyTier, ReviewDecision, Role, ShotStatus, type ShotDetailDto } from "@platform/contracts"; +import { DeliverableKind, deliverableContentTypes, DifficultyTier, ReviewDecision, Role } from "@platform/contracts"; import { ChannelType, LabelBuilder, @@ -8,17 +8,17 @@ import { SlashCommandBuilder, TextInputBuilder, TextInputStyle, + type Attachment, type ButtonInteraction, type ChatInputCommandInteraction, - type ModalSubmitInteraction, - type AutocompleteInteraction + type ModalSubmitInteraction } from "discord.js"; -import { Accent, asEdit, buttons, capitalize, divider, ephemeral, linkButton, panel, plain, pluralize, text, when } from "../Discord/Ui.js"; +import type { ActingApiClient } from "../Api/PlatformApiClient.js"; +import { asEdit, ephemeral, panel, plain, pluralize, text, when } from "../Discord/Ui.js"; import { referenceOf } from "../Services/TaskForum.js"; -import { claimButtonPrefix, deliverableLinks, deliverablesButtonPrefix, reviewButtonPrefix, reviewOutcome } from "../Views/TaskViews.js"; +import { deliverableLinks, deliverablesButtonPrefix, reviewButtonPrefix, reviewOutcome } from "../Views/TaskViews.js"; import { actingAs, - hasAtLeast, requirePlatformRole, UserFacingError, type BotContext, @@ -28,32 +28,56 @@ import { } from "./Command.js"; const reviewModalPrefix = "review-modal"; +const maximumAttachmentBytes = 100 * 1024 * 1024; +const attachmentHosts = new Set(["cdn.discordapp.com", "media.discordapp.net"]); const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu; -async function resolveShotTarget( - interaction: ChatInputCommandInteraction, - context: BotContext, - taskOption?: string | null -): Promise { - const raw = taskOption?.trim(); - if (raw) { - if (uuidPattern.test(raw)) { - return context.api.getShot(raw); - } - // direct lookup by shot code avoids paginating all shots - const byCode = await context.api.getShotByCode(raw); - if (byCode === null) { - throw new UserFacingError(`No task found matching "${raw}".`); - } - return context.api.getShot(byCode.id); - } +function shotInThread(interaction: ChatInputCommandInteraction, context: BotContext): string { const channel = interaction.channel; const inForum = channel !== null && channel.isThread() && channel.parent?.type === ChannelType.GuildForum; - const shotId = inForum ? await context.forum.resolveShotFor(channel.id) : undefined; + const shotId = inForum ? context.forum.shotFor(channel.id) : undefined; if (shotId === undefined) { - throw new UserFacingError("Specify a task code (e.g. /take-task task:SC01_A1B2) or run this inside a task post."); + throw new UserFacingError("Run this inside a task post in the task forum."); } - return context.api.getShot(shotId); + return shotId; +} + +async function uploadAttachment(api: ActingApiClient, shotId: string, attachment: Attachment, kind: DeliverableKind): Promise { + const url = new URL(attachment.url); + if (url.protocol !== "https:" || !attachmentHosts.has(url.hostname)) { + throw new UserFacingError("Attachments must be uploaded to Discord directly."); + } + if (attachment.size <= 0 || attachment.size > maximumAttachmentBytes) { + throw new UserFacingError("That file is too large to relay through Discord. Upload it on the web app instead."); + } + const contentType = kind === DeliverableKind.Blend ? "application/octet-stream" : (attachment.contentType?.split(";")[0]?.trim() ?? ""); + if (!deliverableContentTypes[kind].includes(contentType)) { + throw new UserFacingError( + kind === DeliverableKind.Video ? "The video must be MP4, WebM or MOV." : "The project file must be a .blend file." + ); + } + + const upload = await api.requestDeliverableUpload(shotId, { kind, fileName: attachment.name, contentType, sizeBytes: attachment.size }); + const download = await fetch(url, { redirect: "error", signal: AbortSignal.timeout(120_000) }); + if (!download.ok) { + throw new UserFacingError("Discord wouldn't hand over the attachment. Try uploading it again."); + } + const body = new Uint8Array(await download.arrayBuffer()); + if (body.byteLength !== attachment.size) { + throw new UserFacingError("The attachment changed while it was being uploaded. Try again."); + } + const stored = await fetch(upload.url, { + method: upload.method, + headers: upload.headers, + body, + redirect: "error", + signal: AbortSignal.timeout(300_000) + }); + await stored.body?.cancel(); + if (!stored.ok) { + throw new UserFacingError("Storage rejected the upload. Try again, or use the web app."); + } + return upload.key; } export const createTaskCommand: SlashCommand = { @@ -88,7 +112,6 @@ export const createTaskCommand: SlashCommand = { .toJSON(), async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - await requirePlatformRole(interaction, context, Role.Supervisor); const scene = interaction.options.getInteger("scene", true); const code = interaction.options.getString("code")?.trim() ?? @@ -108,186 +131,53 @@ export const createTaskCommand: SlashCommand = { }; export const takeTaskCommand: SlashCommand = { - definition: new SlashCommandBuilder() - .setName("take-task") - .setDescription("Claim the task in this post or by code") - .addStringOption((option) => - option.setName("task").setDescription("Task code (e.g. SC01_A1B2), defaults to current post").setMaxLength(50).setAutocomplete(true) - ) - .toJSON(), + definition: new SlashCommandBuilder().setName("take-task").setDescription("Claim the task in this post").toJSON(), async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { + const shotId = shotInThread(interaction, context); await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - const target = await resolveShotTarget(interaction, context, interaction.options.getString("task")); - if (target.status !== ShotStatus.Available) { - throw new UserFacingError(`Task ${target.shotCode} is ${target.status} and cannot be claimed.`); - } - const shot = await actingAs(interaction, context).claimShot(target.id); + const shot = await actingAs(interaction, context).claimShot(shotId); const due = shot.deadlineAt === null ? "" : ` It's due ${when(shot.deadlineAt)}.`; await interaction.editReply(asEdit(ephemeral(panel(null, `It's yours.${due} Use /submit-task here when you're done.`)))); - }, - async autocomplete(interaction: AutocompleteInteraction, context: BotContext): Promise { - const focused = interaction.options.getFocused().toLowerCase(); - try { - const all = await context.api.listAllShots(); - const matches = all - .filter((s) => s.shotCode.toLowerCase().includes(focused) || s.title.toLowerCase().includes(focused)) - .slice(0, 10) - .map((s) => ({ name: `[${s.shotCode}] ${s.title}`.slice(0, 100), value: s.id })); - await interaction.respond(matches); - } catch { - await interaction.respond([]); - } } }; export const releaseTaskCommand: SlashCommand = { definition: new SlashCommandBuilder() .setName("release-task") - .setDescription("Give up your claim on the task in this post or by code") - .addStringOption((option) => - option.setName("task").setDescription("Task code (e.g. SC01_A1B2), defaults to current post").setMaxLength(50).setAutocomplete(true) - ) + .setDescription("Give up your claim on the task in this post") .addStringOption((option) => option.setName("reason").setDescription("Optional note for the team").setMaxLength(500)) .toJSON(), async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { + const shotId = shotInThread(interaction, context); await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - const shot = await resolveShotTarget(interaction, context, interaction.options.getString("task")); - if (shot.status === ShotStatus.Approved) { - throw new UserFacingError("This task is already completed and cannot be released."); - } - if (shot.status !== ShotStatus.Claimed) { - throw new UserFacingError("Only claimed tasks can be released."); - } - const me = await actingAs(interaction, context).me(); - const isStaff = hasAtLeast(me.role, Role.Supervisor); - const isClaimant = shot.claimer?.id === me.id; - if (!isStaff && !isClaimant) { - throw new UserFacingError("Only the task claimant, department supervisors, or admins can release this task."); - } - await actingAs(interaction, context).releaseShot(shot.id, interaction.options.getString("reason")?.trim() ?? null); - await interaction.editReply(asEdit(ephemeral(panel(null, `Released ${shot.shotCode}. The task is open for someone else.`)))); - }, - async autocomplete(interaction: AutocompleteInteraction, context: BotContext): Promise { - const focused = interaction.options.getFocused().toLowerCase(); - try { - const all = await context.api.listAllShots(); - const matches = all - .filter((s) => s.shotCode.toLowerCase().includes(focused) || s.title.toLowerCase().includes(focused)) - .slice(0, 10) - .map((s) => ({ name: `[${s.shotCode}] ${s.title}`.slice(0, 100), value: s.id })); - await interaction.respond(matches); - } catch { - await interaction.respond([]); - } + await actingAs(interaction, context).releaseShot(shotId, interaction.options.getString("reason")); + await interaction.editReply(asEdit(ephemeral(panel(null, "Released. The task is open for someone else.")))); } }; export const submitTaskCommand: SlashCommand = { definition: new SlashCommandBuilder() .setName("submit-task") - .setDescription("Submit deliverables for the task in this post or by code via Grab-Box UI") - .addStringOption((option) => - option.setName("task").setDescription("Task code (e.g. SC01_A1B2), defaults to current post").setMaxLength(50).setAutocomplete(true) - ) + .setDescription("Submit your work on the task in this post") + .addAttachmentOption((option) => option.setName("video").setDescription("Rendered video (MP4, WebM or MOV)").setRequired(true)) + .addAttachmentOption((option) => option.setName("blend").setDescription("Project file (.blend)")) + .addStringOption((option) => option.setName("notes").setDescription("Anything the reviewer should know").setMaxLength(2000)) .toJSON(), async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { + const shotId = shotInThread(interaction, context); await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - const shot = await resolveShotTarget(interaction, context, interaction.options.getString("task")); - if (shot.status === ShotStatus.Approved) { - throw new UserFacingError("This task is already completed."); - } - if (shot.status !== ShotStatus.Claimed) { - throw new UserFacingError("Only claimed tasks can accept submissions."); - } - const me = await actingAs(interaction, context).me(); - const isStaff = hasAtLeast(me.role, Role.Supervisor); - const isClaimant = shot.claimer?.id === me.id; - if (!isStaff && !isClaimant) { - throw new UserFacingError("Only the contributor who claimed this task can submit work for it."); - } - const grabboxUrl = `${context.configuration.webAppUrl}/grabbox?shotId=${shot.id}`; + const api = actingAs(interaction, context); + const videoKey = await uploadAttachment(api, shotId, interaction.options.getAttachment("video", true), DeliverableKind.Video); + const blend = interaction.options.getAttachment("blend"); + const blendKey = blend === null ? null : await uploadAttachment(api, shotId, blend, DeliverableKind.Blend); + const submission = await api.submitWork(shotId, { + videoKey, + blendKey, + notes: interaction.options.getString("notes")?.trim() ?? null + }); await interaction.editReply( - asEdit( - ephemeral( - panel( - Accent.Info, - `### Deliverable Submission: **${plain(shot.shotCode, 50)}**\n` + - `To prevent Discord file size limits and relay failures, submit full video renders and Blender project files directly through the Grab-Box UI.\n\n` + - `• **Task:** ${plain(shot.title, 100)}\n` + - `• **Status:** ${capitalize(shot.status)}\n` + - `• **Claimant:** <@${interaction.user.id}>`, - divider(), - buttons(linkButton("Open Grab-Box & Submit", grabboxUrl)) - ) - ) - ) + asEdit(ephemeral(panel(null, `Submitted version ${submission.version}. A supervisor will review it.`))) ); - }, - async autocomplete(interaction: AutocompleteInteraction, context: BotContext): Promise { - const focused = interaction.options.getFocused().toLowerCase(); - try { - const all = await context.api.listAllShots(); - const matches = all - .filter((s) => s.shotCode.toLowerCase().includes(focused) || s.title.toLowerCase().includes(focused)) - .slice(0, 10) - .map((s) => ({ name: `[${s.shotCode}] ${s.title}`.slice(0, 100), value: s.id })); - await interaction.respond(matches); - } catch { - await interaction.respond([]); - } - } -}; - -export const availableTasksCommand: SlashCommand = { - definition: new SlashCommandBuilder() - .setName("available-tasks") - .setDescription("View all tasks currently available in the grab-box") - .addStringOption((option) => - option - .setName("difficulty") - .setDescription("Filter by difficulty tier") - .setRequired(false) - .addChoices( - { name: "Easy (5 days)", value: DifficultyTier.Easy }, - { name: "Medium (7 days)", value: DifficultyTier.Medium }, - { name: "Hard (10 days)", value: DifficultyTier.Hard }, - { name: "Complex (14 days)", value: DifficultyTier.Complex } - ) - ) - .toJSON(), - async execute(interaction: ChatInputCommandInteraction, context: BotContext): Promise { - await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - const difficulty = interaction.options.getString("difficulty") as DifficultyTier | null; - const allShots = await context.api.listAllShots(); - const available = allShots.filter( - (shot) => shot.status === ShotStatus.Available && (difficulty === null || shot.difficultyTier === difficulty) - ); - - if (available.length === 0) { - await interaction.editReply( - asEdit( - ephemeral( - panel( - null, - difficulty - ? `No available **${difficulty}** tasks in the grab-box right now.` - : "No available tasks in the grab-box right now." - ) - ) - ) - ); - return; - } - - const lines = available.slice(0, 15).map((shot) => { - const threadId = context.forum.threadFor(shot.id); - const destination = threadId !== undefined ? `<#${threadId}>` : `Scene ${shot.sceneNumber}`; - return `• **${plain(shot.shotCode, 50)}** - ${plain(shot.title, 80)} (${capitalize(shot.difficultyTier)})\n ↳ ${destination}`; - }); - - const overflow = available.length > 15 ? `\n\n-# …and ${available.length - 15} more available tasks.` : ""; - const body = `### Available Tasks (${available.length})\n${lines.join("\n")}${overflow}\n\n-# Use \`/take-task\` in a task post to claim it.`; - await interaction.editReply(asEdit(ephemeral(panel(Accent.Info, body)))); } }; @@ -390,20 +280,3 @@ export const deliverablesButtonHandler: ComponentHandler = { await interaction.editReply(asEdit(deliverableLinks(shot, submissionId))); } }; - -export const claimTaskButtonHandler: ComponentHandler = { - prefix: claimButtonPrefix, - async handle(interaction: ComponentInteraction, context: BotContext): Promise { - if (!interaction.isButton()) { - return; - } - const [, shotId] = interaction.customId.split(":"); - if (shotId === undefined || !uuidPattern.test(shotId)) { - return; - } - await interaction.deferReply({ flags: MessageFlags.Ephemeral }); - const shot = await actingAs(interaction, context).claimShot(shotId); - const due = shot.deadlineAt === null ? "" : ` It's due ${when(shot.deadlineAt)}.`; - await interaction.editReply(asEdit(ephemeral(panel(null, `It's yours.${due} Use /submit-task here when you're done.`)))); - } -}; diff --git a/apps/discord/src/Common/TimeParser.ts b/apps/discord/src/Common/TimeParser.ts deleted file mode 100644 index 21e9960..0000000 --- a/apps/discord/src/Common/TimeParser.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { UserFacingError } from "../Commands/Command.js"; - -const relativePattern = /(\d+)\s*([smhdw])/giu; -const absolutePattern = /^(\d{4})-(\d{2})-(\d{2})\s+(\d{1,2}):(\d{2})$/u; - -const unitMs: Record = { - s: 1_000, - m: 60_000, - h: 3_600_000, - d: 86_400_000, - w: 604_800_000 -}; - -const minMs = 60_000; // 1 minute -const maxMs = 90 * 86_400_000; // 90 days - -export function parseReminderTime(input: string): Date { - const trimmed = input.trim(); - - // try absolute first - const abs = absolutePattern.exec(trimmed); - if (abs !== null) { - const [, year, month, day, hour, minute] = abs; - const date = new Date(`${year}-${month}-${day}T${hour!.padStart(2, "0")}:${minute}:00Z`); - if (Number.isNaN(date.getTime())) { - throw new UserFacingError("Couldn't parse that date. Use `YYYY-MM-DD HH:MM` (UTC)."); - } - const delta = date.getTime() - Date.now(); - if (delta < minMs) { - throw new UserFacingError("That time is in the past or too soon. Must be at least 1 minute from now."); - } - if (delta > maxMs) { - throw new UserFacingError("Reminders can be at most 90 days out."); - } - return date; - } - - // relative: match all duration fragments - let totalMs = 0; - let matched = false; - for (const match of trimmed.matchAll(relativePattern)) { - const value = parseInt(match[1]!, 10); - const unit = match[2]!.toLowerCase(); - totalMs += value * (unitMs[unit] ?? 0); - matched = true; - } - - if (!matched) { - throw new UserFacingError("Couldn't parse the time. Use relative (`30m`, `2h`, `1d12h`) or absolute (`2024-10-15 14:00`)."); - } - if (totalMs < minMs) { - throw new UserFacingError("Reminder must be at least 1 minute from now."); - } - if (totalMs > maxMs) { - throw new UserFacingError("Reminders can be at most 90 days out."); - } - - return new Date(Date.now() + totalMs); -} diff --git a/apps/discord/src/Discord/Ui.ts b/apps/discord/src/Discord/Ui.ts index 6e6a05c..e56846d 100644 --- a/apps/discord/src/Discord/Ui.ts +++ b/apps/discord/src/Discord/Ui.ts @@ -118,17 +118,8 @@ export function quote(value: string, maximumLength = 1000): string { .join("\n"); } -export function person(value: NotificationPerson, isMember?: boolean | ((id: string) => boolean)): string { - if (value.discordId === null) { - return plain(value.username, 64); - } - if (typeof isMember === "function") { - return isMember(value.discordId) ? `<@${value.discordId}>` : plain(value.username, 64); - } - if (isMember === false) { - return plain(value.username, 64); - } - return `<@${value.discordId}>`; +export function person(value: NotificationPerson): string { + return value.discordId === null ? plain(value.username, 64) : `<@${value.discordId}>`; } export function when(iso: string, style: "R" | "f" | "F" | "D" | "d" = "R"): string { diff --git a/apps/discord/src/Interactions/InteractionRouter.ts b/apps/discord/src/Interactions/InteractionRouter.ts index fed11fa..e7e7eb8 100644 --- a/apps/discord/src/Interactions/InteractionRouter.ts +++ b/apps/discord/src/Interactions/InteractionRouter.ts @@ -2,12 +2,9 @@ import type { Interaction } from "discord.js"; import { replyWithError, type BotContext, type ComponentHandler, type SlashCommand } from "../Commands/Command.js"; import { docsCommand, helpCommand, statusCommand } from "../Commands/InfoCommands.js"; import { assignRoleCommand, blacklistCommand } from "../Commands/ModerationCommands.js"; -import { reminderCommand } from "../Commands/ReminderCommands.js"; import { entryPageHandler, roundCommands, roundSelectHandler } from "../Commands/RoundCommands.js"; -import { botSetupCommand, syncRolesCommand } from "../Commands/SetupCommands.js"; +import { botSetupCommand, setChannelCommand, setupForumCommand } from "../Commands/SetupCommands.js"; import { - availableTasksCommand, - claimTaskButtonHandler, createTaskCommand, deliverablesButtonHandler, releaseTaskCommand, @@ -25,22 +22,20 @@ export const slashCommands: readonly SlashCommand[] = [ ...roundCommands, blacklistCommand, assignRoleCommand, - availableTasksCommand, createTaskCommand, takeTaskCommand, releaseTaskCommand, submitTaskCommand, syncTaskCommand, botSetupCommand, - syncRolesCommand, - statusCommand, - reminderCommand + setupForumCommand, + setChannelCommand, + statusCommand ]; const componentHandlers: readonly ComponentHandler[] = [ roundSelectHandler, entryPageHandler, - claimTaskButtonHandler, reviewButtonHandler, reviewModalHandler, deliverablesButtonHandler diff --git a/apps/discord/src/Main.ts b/apps/discord/src/Main.ts index 04458d9..9ed2fd0 100644 --- a/apps/discord/src/Main.ts +++ b/apps/discord/src/Main.ts @@ -1,4 +1,3 @@ -import { Role } from "@platform/contracts"; import { ActivityType, Client, Events, GatewayIntentBits, REST, Routes } from "discord.js"; import { NotificationConsumer } from "./Api/NotificationConsumer.js"; import { PlatformApiClient } from "./Api/PlatformApiClient.js"; @@ -7,14 +6,9 @@ import { createLogger } from "./Common/Logger.js"; import { ConfigurationError, loadBotConfiguration } from "./Configuration/BotConfiguration.js"; import { InteractionRouter, slashCommands } from "./Interactions/InteractionRouter.js"; import { NotificationDispatcher } from "./Services/NotificationDispatcher.js"; -import { ReminderScheduler } from "./Services/ReminderScheduler.js"; -import { RoleReconciliationService } from "./Services/RoleReconciliationService.js"; -import { RoleSyncScheduler } from "./Services/RoleSyncScheduler.js"; import { ServerProvisioner } from "./Services/ServerProvisioner.js"; -import { syncMemberStudioRoles } from "./Services/StudioRoles.js"; import { TaskForum } from "./Services/TaskForum.js"; -import { ReminderStore } from "./State/ReminderStore.js"; -import { ChannelPurpose, SettingsStore } from "./State/SettingsStore.js"; +import { BoundRole, SettingsStore } from "./State/SettingsStore.js"; async function main(): Promise { const configuration = loadBotConfiguration(); @@ -28,24 +22,7 @@ async function main(): Promise { const dispatcher = new NotificationDispatcher(client, configuration.guildId, settings, forum, logger); const consumer = new NotificationConsumer(api, settings, (notification) => dispatcher.handle(notification), logger); const provisioner = new ServerProvisioner(settings, logger); - const reminders = new ReminderStore(configuration.dataDirectory); - await reminders.load(); - const reminderScheduler = new ReminderScheduler(client, reminders, logger); - const roleReconciler = new RoleReconciliationService(api, provisioner, settings, client, logger); - const roleScheduler = new RoleSyncScheduler(roleReconciler, configuration.guildId, client, logger); - const context: BotContext = { - configuration, - api, - settings, - forum, - provisioner, - consumer, - reminders, - reminderScheduler, - roleReconciler, - roleScheduler, - logger - }; + const context: BotContext = { configuration, api, settings, forum, provisioner, consumer, logger }; const router = new InteractionRouter(context); await new REST({ version: "10" }) @@ -71,16 +48,6 @@ async function main(): Promise { logger.warn({ err: error }, "failed to load task thread bindings"); }); consumer.start(); - reminderScheduler.start(); - roleScheduler.start(); - if (client.ws.ping >= 0) { - void api.sendHeartbeat(client.ws.ping); - } - heartbeatTimer = setInterval(() => { - if (client.ws.ping >= 0) { - void api.sendHeartbeat(client.ws.ping); - } - }, 10_000); })(); }); @@ -89,46 +56,19 @@ async function main(): Promise { }); client.on(Events.GuildMemberAdd, (member) => { - void (async (): Promise => { - if (member.guild.id !== configuration.guildId) { - return; - } - try { - const user = await api.getUserByDiscordId(member.id); - if (user?.isBlacklisted) { - await member.ban({ reason: (user.blacklistReason ?? "Blacklisted on platform").slice(0, 500) }); - logger.info({ member: member.id }, "banned blacklisted member upon joining"); - return; - } - if (user !== null) { - await syncMemberStudioRoles(member, user.role, user.specialties, "Member joined/rejoined"); - } else { - // auto-grant base member role to new joiners - await syncMemberStudioRoles(member, Role.Member, [], "New member joined Discord"); - } - - // post 1-line welcome message with user mention - const welcomeChannelId = settings.channel(ChannelPurpose.Announcements); - if (welcomeChannelId !== undefined) { - const channel = await client.channels.fetch(welcomeChannelId).catch(() => null); - if (channel?.isSendable() && !channel.isDMBased() && channel.guildId === member.guild.id) { - await channel.send({ - content: `👋 Welcome <@${member.id}> to the studio! Sign in at ${configuration.webAppUrl} to get started.`, - allowedMentions: { users: [member.id] } - }).catch(() => undefined); - } - } - } catch (error: unknown) { - logger.warn({ err: error, member: member.id }, "failed to handle member add"); - } - })(); + const roleId = settings.role(BoundRole.Observer); + if (member.guild.id !== configuration.guildId || roleId === undefined) { + return; + } + member.roles.add(roleId, "New member").catch((error: unknown) => { + logger.warn({ err: error, member: member.id }, "failed to grant observer role"); + }); }); client.on(Events.Error, (error) => { logger.error({ err: error }, "discord client error"); }); - let heartbeatTimer: NodeJS.Timeout | undefined; let stopping = false; const shutdown = (signal: string): void => { if (stopping) { @@ -136,12 +76,7 @@ async function main(): Promise { } stopping = true; logger.info({ signal }, "shutting down"); - if (heartbeatTimer !== undefined) { - clearInterval(heartbeatTimer); - } consumer.stop(); - reminderScheduler.stop(); - roleScheduler.stop(); void client.destroy().finally(() => process.exit(0)); }; process.once("SIGTERM", () => { diff --git a/apps/discord/src/Services/NotificationDispatcher.ts b/apps/discord/src/Services/NotificationDispatcher.ts index d2fbf0c..8f0e695 100644 --- a/apps/discord/src/Services/NotificationDispatcher.ts +++ b/apps/discord/src/Services/NotificationDispatcher.ts @@ -1,24 +1,11 @@ -import { DocumentSlug, EntryStatus, NotificationType, ReviewDecision, Role, ShotStatus, type PlatformNotification } from "@platform/contracts"; +import { EntryStatus, NotificationType, ReviewDecision, ShotStatus, type PlatformNotification } from "@platform/contracts"; import type { Client, SendableChannels } from "discord.js"; import type { Logger } from "pino"; import { BoundRole, ChannelPurpose, type SettingsStore } from "../State/SettingsStore.js"; -import { renderNotification, renderRulesMessage } from "../Views/NotificationViews.js"; +import { renderNotification } from "../Views/NotificationViews.js"; import { reviewCard, threadUpdate } from "../Views/TaskViews.js"; -import { syncMemberStudioRoles } from "./StudioRoles.js"; import type { TaskForum } from "./TaskForum.js"; -function collectDiscordIds(notification: PlatformNotification): string[] { - const ids: (string | null | undefined)[] = []; - const record = notification as Record; - for (const key of ["voter", "user", "actor", "author", "claimant", "contributor", "reviewer"]) { - const value = record[key]; - if (value !== null && typeof value === "object" && "discordId" in value) { - ids.push((value as { discordId?: string | null }).discordId); - } - } - return ids.filter((id): id is string => typeof id === "string" && id.length > 0); -} - export class NotificationDispatcher { public constructor( private readonly client: Client, @@ -32,12 +19,7 @@ export class NotificationDispatcher { await this.applySideEffects(notification).catch((error: unknown) => { this.logger.warn({ err: error, type: notification.type }, "discord side effect failed"); }); - const memberIds = await this.resolveMembers(notification); - const context = { - threadFor: (shotId: string) => this.forum.threadFor(shotId), - isMember: (discordId: string) => memberIds.has(discordId) - }; - for (const rendered of renderNotification(notification, context)) { + for (const rendered of renderNotification(notification, this.forum)) { const channel = await this.channel(rendered.purpose); if (channel !== null) { await channel.send(rendered.message); @@ -45,41 +27,16 @@ export class NotificationDispatcher { } } - private async resolveMembers(notification: PlatformNotification): Promise> { - const ids = collectDiscordIds(notification); - if (ids.length === 0) { - return new Set(); - } - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild === null) { - return new Set(); - } - const memberIds = new Set(); - await Promise.all( - ids.map(async (id) => { - if (guild.members.cache?.has(id) === true) { - memberIds.add(id); - return; - } - const member = await guild.members.fetch(id).catch(() => null); - if (member !== null) { - memberIds.add(id); - } - }) - ); - return memberIds; - } - private async applySideEffects(notification: PlatformNotification): Promise { switch (notification.type) { case NotificationType.ShotCreated: - await this.forum.ensureThreadFor(notification.shot.id); + await this.forum.ensureThread(notification.shot, null, ShotStatus.Available); return; case NotificationType.ShotUpdated: await this.forum.rename(notification.shot); return; case NotificationType.ShotDeleted: - await this.forum.remove(notification.shot); + await this.forum.remove(notification.shot.id); return; case NotificationType.ShotClaimed: await this.forum.setStatus(notification.shot.id, ShotStatus.Claimed); @@ -103,60 +60,6 @@ export class NotificationDispatcher { await this.forum.setStatus(notification.shot.id, approved ? ShotStatus.Approved : ShotStatus.Claimed); return; } - case NotificationType.UserBlacklisted: - if (notification.user.discordId !== null) { - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild !== null) { - await guild.members - .ban(notification.user.discordId, { - reason: (notification.reason ?? "Blacklisted on platform").slice(0, 500) - }) - .catch((error: unknown) => { - this.logger.warn({ err: error, discordId: notification.user.discordId }, "failed to ban blacklisted member"); - }); - } - } - return; - case NotificationType.UserReinstated: - if (notification.user.discordId !== null) { - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild !== null) { - await guild.bans.remove(notification.user.discordId, "Reinstated on platform").catch((error: unknown) => { - this.logger.warn({ err: error, discordId: notification.user.discordId }, "failed to unban reinstated member"); - }); - } - } - return; - case NotificationType.UserRoleChanged: - if (notification.user.discordId !== null) { - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild !== null) { - const member = await guild.members.fetch(notification.user.discordId).catch(() => null); - if (member !== null) { - await syncMemberStudioRoles(member, notification.role, notification.specialties, "Platform role updated").catch( - (error: unknown) => { - this.logger.warn({ err: error, discordId: notification.user.discordId }, "failed to sync member studio roles"); - } - ); - } - } - } - return; - case NotificationType.ContributorPromoted: - if (notification.user.discordId !== null) { - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild !== null) { - const member = await guild.members.fetch(notification.user.discordId).catch(() => null); - if (member !== null) { - await syncMemberStudioRoles(member, Role.SeniorContributor, [], "Promoted to senior contributor").catch( - (error: unknown) => { - this.logger.warn({ err: error, discordId: notification.user.discordId }, "failed to sync member studio roles"); - } - ); - } - } - } - return; case NotificationType.EntryStatusChanged: if ( notification.status === EntryStatus.Approved && @@ -170,30 +73,6 @@ export class NotificationDispatcher { ); } return; - case NotificationType.DocumentUpdated: { - if (notification.slug === DocumentSlug.Guidelines) { - const rulesChannel = await this.channel(ChannelPurpose.Rules); - if (rulesChannel !== null && "messages" in rulesChannel) { - const existing = await rulesChannel.messages.fetch({ limit: 20 }).catch(() => null); - if (existing !== null) { - for (const msg of existing.values()) { - if (msg.author.id === this.client.user?.id) { - await msg.delete().catch(() => undefined); - } - } - } - const posted = await rulesChannel.send(renderRulesMessage(notification)).catch((err) => { - this.logger.error({ err }, "failed to post updated rules message"); - return null; - }); - if (posted !== null) { - await posted.pin().catch(() => undefined); - } - this.logger.info({ revision: notification.revision, slug: notification.slug }, "dynamically updated rules channel message"); - } - } - return; - } default: return; } diff --git a/apps/discord/src/Services/ReminderScheduler.ts b/apps/discord/src/Services/ReminderScheduler.ts deleted file mode 100644 index a13e812..0000000 --- a/apps/discord/src/Services/ReminderScheduler.ts +++ /dev/null @@ -1,69 +0,0 @@ -import type { Client } from "discord.js"; -import type { Logger } from "pino"; -import type { ReminderStore } from "../State/ReminderStore.js"; - -export class ReminderScheduler { - private timer: ReturnType | null = null; - private running = false; - - public constructor( - private readonly client: Client, - private readonly store: ReminderStore, - private readonly logger: Logger - ) {} - - public start(): void { - this.running = true; - this.schedule(); - } - - public stop(): void { - this.running = false; - if (this.timer !== null) { - clearTimeout(this.timer); - this.timer = null; - } - } - - public reschedule(): void { - if (this.running) { - this.schedule(); - } - } - - private schedule(): void { - if (this.timer !== null) { - clearTimeout(this.timer); - this.timer = null; - } - - const next = this.store.nextFireAt(); - if (next === null) { - return; - } - - // clamp to at least 1s to avoid tight loops on past-due reminders - const delay = Math.max(next.getTime() - Date.now(), 1_000); - this.timer = setTimeout(() => { - void this.fire(); - }, delay); - } - - private async fire(): Promise { - this.timer = null; - const fired = this.store.drain(); - - for (const reminder of fired) { - try { - const user = await this.client.users.fetch(reminder.userId); - await user.send(`⏰ **Reminder:** ${reminder.message}`); - } catch (error: unknown) { - this.logger.warn({ err: error, userId: reminder.userId, reminderId: reminder.id }, "failed to DM reminder"); - } - } - - if (this.running) { - this.schedule(); - } - } -} diff --git a/apps/discord/src/Services/RoleReconciliationService.ts b/apps/discord/src/Services/RoleReconciliationService.ts deleted file mode 100644 index dbef70c..0000000 --- a/apps/discord/src/Services/RoleReconciliationService.ts +++ /dev/null @@ -1,162 +0,0 @@ -import { Role } from "@platform/contracts"; -import type { Client, Guild, SendableChannels } from "discord.js"; -import type { Logger } from "pino"; -import type { PlatformApiClient } from "../Api/PlatformApiClient.js"; -import { Accent, message, panel, pluralize } from "../Discord/Ui.js"; -import { ChannelPurpose, type SettingsStore } from "../State/SettingsStore.js"; -import type { ServerProvisioner } from "./ServerProvisioner.js"; -import { isStudioOrLegacyRole, syncMemberStudioRoles } from "./StudioRoles.js"; - -export interface ReconciliationSummary { - readonly reorderedRoles: number; - readonly totalUsersChecked: number; - readonly driftedMembersSynced: number; - readonly errors: readonly string[]; - readonly durationMs: number; -} - -const mutationPacingDelayMs = 250; - -function sleep(ms: number): Promise { - return new Promise((resolve) => setTimeout(resolve, ms)); -} - -export class RoleReconciliationService { - public constructor( - private readonly api: PlatformApiClient, - private readonly provisioner: ServerProvisioner, - private readonly settings: SettingsStore, - private readonly client: Client, - private readonly logger: Logger - ) {} - - public async reconcile(guild: Guild, trigger: "scheduled" | "manual"): Promise { - const start = Date.now(); - const errors: string[] = []; - - // enforce visual role hierarchy order in server settings - const reorderedRoles = await this.provisioner.enforceRoleHierarchy(guild).catch((err: unknown) => { - this.logger.warn({ err }, "failed to enforce role hierarchy during reconciliation"); - errors.push("Failed to enforce role hierarchy order"); - return 0; - }); - - let totalUsersChecked = 0; - let driftedMembersSynced = 0; - - try { - const allUsers = await this.api.listAllUsers(); - const registeredDiscordIds = new Set(); - - // Reconcile all registered platform users - for (const user of allUsers) { - if (!user.discordId) { - continue; - } - registeredDiscordIds.add(user.discordId); - totalUsersChecked++; - try { - const member = await guild.members.fetch(user.discordId).catch(() => null); - if (member === null) { - continue; - } - const result = await syncMemberStudioRoles( - member, - user.role, - user.specialties, - trigger === "scheduled" ? "Scheduled role reconciliation" : "Manual role hierarchy sync" - ); - if (result.modified) { - driftedMembersSynced++; - // pace role writes to stay comfortably within discord rate limits - await sleep(mutationPacingDelayMs); - } - } catch (memberErr: unknown) { - this.logger.warn({ err: memberErr, discordId: user.discordId }, "failed to reconcile member roles"); - errors.push(`Failed to sync member <@${user.discordId}>`); - } - } - - // Reconcile unregistered Discord members holding studio roles - const guildMembers = await guild.members.fetch().catch(() => null); - if (guildMembers !== null) { - for (const member of guildMembers.values()) { - if (member.user.bot || registeredDiscordIds.has(member.id)) { - continue; - } - const hasStudioRoles = member.roles.cache.some((role) => isStudioOrLegacyRole(role.name)); - if (hasStudioRoles) { - totalUsersChecked++; - try { - const result = await syncMemberStudioRoles( - member, - Role.Member, - [], - trigger === "scheduled" ? "Scheduled role reconciliation (unregistered)" : "Manual role sync (unregistered)" - ); - if (result.modified) { - driftedMembersSynced++; - await sleep(mutationPacingDelayMs); - } - } catch (memberErr: unknown) { - this.logger.warn({ err: memberErr, discordId: member.id }, "failed to strip studio roles from unregistered member"); - errors.push(`Failed to sync unregistered member <@${member.id}>`); - } - } - } - } - } catch (apiErr: unknown) { - this.logger.error({ err: apiErr }, "failed to fetch user list for role reconciliation"); - errors.push("Failed to fetch registered users from platform API"); - } - - const durationMs = Date.now() - start; - const summary: ReconciliationSummary = { - reorderedRoles, - totalUsersChecked, - driftedMembersSynced, - errors, - durationMs - }; - - if (trigger === "scheduled") { - await this.dispatchScheduledReport(guild, summary); - } - - return summary; - } - - private async dispatchScheduledReport(guild: Guild, summary: ReconciliationSummary): Promise { - const hasDriftOrChanges = summary.reorderedRoles > 0 || summary.driftedMembersSynced > 0 || summary.errors.length > 0; - if (!hasDriftOrChanges) { - this.logger.info( - { totalUsersChecked: summary.totalUsersChecked, durationMs: summary.durationMs }, - "scheduled role reconciliation clean, no drift detected" - ); - return; - } - - const channelId = this.settings.channel(ChannelPurpose.Telemetry); - if (channelId === undefined) { - return; - } - - const channel = await this.client.channels.fetch(channelId).catch(() => null); - if (channel === null || !channel.isSendable() || channel.isDMBased() || channel.guildId !== guild.id) { - return; - } - - const lines = [ - "## 🔄 Weekly Role Reconciliation Summary", - `• Positioned **${summary.reorderedRoles}** studio roles by hierarchy.`, - `• Checked **${summary.totalUsersChecked}** registered users, reconciled **${summary.driftedMembersSynced}** drifted ${pluralize(summary.driftedMembersSynced, "member")}.`, - summary.errors.length > 0 ? `⚠️ **${summary.errors.length}** error(s) encountered during sync.` : null, - `*Duration: ${(summary.durationMs / 1000).toFixed(1)}s*` - ].filter((line): line is string => line !== null); - - const accent = summary.errors.length > 0 ? Accent.Danger : summary.driftedMembersSynced > 0 ? Accent.Warning : Accent.Success; - await (channel as SendableChannels).send(message(panel(accent, lines.join("\n")))).catch((err: unknown) => { - this.logger.warn({ err }, "failed to post scheduled reconciliation report to telemetry channel"); - }); - } -} diff --git a/apps/discord/src/Services/RoleSyncScheduler.ts b/apps/discord/src/Services/RoleSyncScheduler.ts deleted file mode 100644 index dd5797b..0000000 --- a/apps/discord/src/Services/RoleSyncScheduler.ts +++ /dev/null @@ -1,89 +0,0 @@ -import type { Client } from "discord.js"; -import type { Logger } from "pino"; -import type { RoleReconciliationService } from "./RoleReconciliationService.js"; - -export function getNextScheduledSyncDate(from: Date = new Date()): Date { - const target = new Date(from.getTime()); - const currentDay = target.getUTCDay(); - const currentHour = target.getUTCHours(); - const currentMin = target.getUTCMinutes(); - const currentSec = target.getUTCSeconds(); - const currentMs = target.getUTCMilliseconds(); - - // target day: sunday (0) at 03:00:00.000 utc - let daysToAdd = (7 - currentDay) % 7; - if (daysToAdd === 0) { - const isPastTargetToday = currentHour > 3 || (currentHour === 3 && (currentMin > 0 || currentSec > 0 || currentMs > 0)); - if (isPastTargetToday) { - daysToAdd = 7; - } - } - - target.setUTCDate(target.getUTCDate() + daysToAdd); - target.setUTCHours(3, 0, 0, 0); - return target; -} - -export class RoleSyncScheduler { - private timer: ReturnType | null = null; - private running = false; - - public constructor( - private readonly reconciler: RoleReconciliationService, - private readonly guildId: string, - private readonly client: Client, - private readonly logger: Logger - ) {} - - public start(): void { - this.running = true; - this.schedule(); - } - - public stop(): void { - this.running = false; - if (this.timer !== null) { - clearTimeout(this.timer); - this.timer = null; - } - } - - private schedule(): void { - if (this.timer !== null) { - clearTimeout(this.timer); - this.timer = null; - } - if (!this.running) { - return; - } - - const next = getNextScheduledSyncDate(); - const delay = Math.max(next.getTime() - Date.now(), 1_000); - this.logger.info( - { nextSync: next.toISOString(), delayMinutes: Math.round(delay / 60_000) }, - "scheduled next weekly role reconciliation" - ); - - this.timer = setTimeout(() => { - void this.execute(); - }, delay); - } - - private async execute(): Promise { - this.timer = null; - try { - const guild = await this.client.guilds.fetch(this.guildId).catch(() => null); - if (guild !== null) { - await this.reconciler.reconcile(guild, "scheduled"); - } else { - this.logger.warn({ guildId: this.guildId }, "could not fetch guild for scheduled role reconciliation"); - } - } catch (error: unknown) { - this.logger.error({ err: error }, "error during scheduled role reconciliation"); - } finally { - if (this.running) { - this.schedule(); - } - } - } -} diff --git a/apps/discord/src/Services/ServerProvisioner.ts b/apps/discord/src/Services/ServerProvisioner.ts index 4f178d2..159add2 100644 --- a/apps/discord/src/Services/ServerProvisioner.ts +++ b/apps/discord/src/Services/ServerProvisioner.ts @@ -17,6 +17,7 @@ import { contributorRoleName, findStudioRole, normalizeName, + observerRoleName, permissionsFor, studioRoles, StudioTier @@ -36,7 +37,6 @@ const forumTagNames: Readonly> = { }; const channelNames: Readonly, string>> = { - [ChannelPurpose.Rules]: "rules", [ChannelPurpose.Announcements]: "announcements", [ChannelPurpose.Telemetry]: "telemetry-alerts", [ChannelPurpose.TaskSubmissions]: "task-submissions", @@ -44,32 +44,16 @@ const channelNames: Readonly 2.5):** Flags automated ballot surges within sliding 5-minute windows.", - "• **Shannon Rank Entropy (H < 0.35):** Detects coordinated bullet-voting rings.", - "• **Permanent Audit Ledger:** Certified election outcomes are signed and immutable.", - "", - "### 4. Contributor Grab-Box", - "• Claim tasks across 4 difficulty tiers.", - "• Deliverables require `.blend` scene source files and compressed video previews for supervisor review.", - "", - "-# Synced dynamically from web platform • [View Full Documentation](https://dev-api.seraphinteractive.com/documentation)" -].join("\n"); + "## Studio rules", + "**Leadership seats hold one person.** Executive and department roles have a single seat. Assigning one with /assign-role moves it from the current holder.", + "**Assign roles through the bot.** /assign-role keeps Discord roles and platform permissions in sync. Manual role changes don't reach the platform.", + "**Reviews.** Department supervisors review submissions for their department. Approved work is locked and handed downstream.", + "**Contributor and community roles** have no seat limit.", + "**Disputes** go to the Producer and Creative Director." +].join("\n\n"); export class ServerProvisioner { public constructor( @@ -80,11 +64,9 @@ export class ServerProvisioner { public async bindExisting(guild: Guild): Promise { const [roles, channels] = await Promise.all([guild.roles.fetch(), guild.channels.fetch()]); await this.settings.update((settings) => { - const member = roles.find((role) => findStudioRole(role.name)?.name === "Members"); - const voter = roles.find((role) => findStudioRole(role.name)?.name === "Voters"); - const contributor = roles.find((role) => findStudioRole(role.name)?.name === contributorRoleName); - settings.roles[BoundRole.Member] ??= member?.id; - settings.roles[BoundRole.Voter] ??= voter?.id; + const observer = roles.find((role) => normalizeName(role.name) === normalizeName(observerRoleName)); + const contributor = roles.find((role) => normalizeName(role.name) === normalizeName(contributorRoleName)); + settings.roles[BoundRole.Observer] ??= observer?.id; settings.roles[BoundRole.Contributor] ??= contributor?.id; for (const [purpose, name] of Object.entries(channelNames) as [ChannelPurpose, string][]) { const match = channels.find( @@ -116,9 +98,6 @@ export class ServerProvisioner { for (const definition of studioRoles) { const existing = existingRoles.find((role) => findStudioRole(role.name)?.name === definition.name); if (existing !== undefined) { - if (existing.hoist !== (definition.tier !== StudioTier.Community)) { - await existing.setHoist(definition.tier !== StudioTier.Community, "Studio role setup").catch(() => undefined); - } roleIds.set(definition.name, existing); continue; } @@ -134,8 +113,6 @@ export class ServerProvisioner { createdRoles.push(created.name); } - await this.enforceRoleHierarchy(guild); - const staffRoles = studioRoles .filter((role) => role.tier <= StudioTier.Department) .map((role) => roleIds.get(role.name)) @@ -238,13 +215,7 @@ export class ServerProvisioner { botAccess ]); const logs = await ensureText(channelNames[ChannelPurpose.TaskLogs], staff, "Task activity log.", privateOverwrites); - const rules = await ensureText( - channelNames[ChannelPurpose.Rules], - platform, - "Community guidelines, voting invariants, and rules.", - readOnlyOverwrites - ); - await rules.setPosition(0).catch(() => undefined); + const rules = await ensureText(rulesChannelName, staff, "How roles and reviews work.", privateOverwrites); let forum = find(forumName, ChannelType.GuildForum) as ForumChannel | undefined; if (forum === undefined) { @@ -253,29 +224,50 @@ export class ServerProvisioner { type: ChannelType.GuildForum, parent: pipeline.id, topic: "Open tasks. Use /take-task in a post to claim it.", + permissionOverwrites: [ + { + id: everyone, + allow: [PermissionFlagsBits.ViewChannel, PermissionFlagsBits.ReadMessageHistory], + deny: [PermissionFlagsBits.SendMessagesInThreads, PermissionFlagsBits.CreatePublicThreads] + }, + ...contributorRoles.map((role) => ({ + id: role.id, + allow: [PermissionFlagsBits.SendMessagesInThreads, PermissionFlagsBits.AttachFiles] + })), + ...staffRoles.map((role) => ({ + id: role.id, + allow: [PermissionFlagsBits.SendMessagesInThreads, PermissionFlagsBits.ManageThreads] + })), + { + id: botId, + allow: [ + PermissionFlagsBits.ViewChannel, + PermissionFlagsBits.SendMessagesInThreads, + PermissionFlagsBits.CreatePublicThreads, + PermissionFlagsBits.ManageThreads + ] + } + ], reason: "Studio setup" }); createdChannels.push(forumName); } else { boundChannels.push(forum.name); } - await this.ensureForumPermissions(forum); const tagged = await this.ensureForumTags(forum); - const pins = await rules.messages.fetchPinned().catch(() => null); - if (pins === null || pins.size === 0) { + if ((await rules.messages.fetchPins()).items.length === 0) { const posted = await rules.send(message(panel(null, studioRules))); await posted.pin().catch(() => undefined); } await this.settings.update((settings) => { - settings.channels[ChannelPurpose.Rules] = rules.id; settings.channels[ChannelPurpose.Announcements] = announcements.id; settings.channels[ChannelPurpose.Telemetry] = telemetry.id; settings.channels[ChannelPurpose.TaskSubmissions] = submissions.id; settings.channels[ChannelPurpose.TaskLogs] = logs.id; settings.channels[ChannelPurpose.TaskForum] = tagged.id; - settings.roles[BoundRole.Voter] = roleIds.get("Voters")?.id; + settings.roles[BoundRole.Observer] = roleIds.get(observerRoleName)?.id; settings.roles[BoundRole.Contributor] = roleIds.get(contributorRoleName)?.id; }); @@ -304,94 +296,4 @@ export class ServerProvisioner { }); return updated; } - - public async ensureForumPermissions(forum: ForumChannel): Promise { - const guild = forum.guild; - const botId = guild.client.user.id; - const everyone = guild.roles.everyone.id; - const existingRoles = await guild.roles.fetch(); - const staffRoles = studioRoles - .filter((role) => role.tier <= StudioTier.Department) - .map((def) => existingRoles.find((role) => findStudioRole(role.name)?.name === def.name)) - .filter((role): role is DiscordRole => role !== undefined); - const contributorRoles = studioRoles - .filter((role) => role.tier === StudioTier.Contributor) - .map((def) => existingRoles.find((role) => findStudioRole(role.name)?.name === def.name)) - .filter((role): role is DiscordRole => role !== undefined); - - // allow thread replies while locking root creation to staff - await forum.permissionOverwrites.set( - [ - { - id: everyone, - allow: [ - PermissionFlagsBits.ViewChannel, - PermissionFlagsBits.ReadMessageHistory, - PermissionFlagsBits.SendMessagesInThreads, - PermissionFlagsBits.UseApplicationCommands - ], - deny: [ - PermissionFlagsBits.SendMessages, - PermissionFlagsBits.CreatePublicThreads, - PermissionFlagsBits.CreatePrivateThreads - ] - }, - ...contributorRoles.map((role) => ({ - id: role.id, - allow: [ - PermissionFlagsBits.ViewChannel, - PermissionFlagsBits.ReadMessageHistory, - PermissionFlagsBits.SendMessagesInThreads, - PermissionFlagsBits.UseApplicationCommands, - PermissionFlagsBits.AttachFiles - ] - })), - ...staffRoles.map((role) => ({ - id: role.id, - allow: [ - PermissionFlagsBits.ViewChannel, - PermissionFlagsBits.ReadMessageHistory, - PermissionFlagsBits.SendMessages, - PermissionFlagsBits.SendMessagesInThreads, - PermissionFlagsBits.CreatePublicThreads, - PermissionFlagsBits.ManageThreads - ] - })), - { - id: botId, - allow: [ - PermissionFlagsBits.ViewChannel, - PermissionFlagsBits.ReadMessageHistory, - PermissionFlagsBits.SendMessages, - PermissionFlagsBits.SendMessagesInThreads, - PermissionFlagsBits.CreatePublicThreads, - PermissionFlagsBits.ManageThreads - ] - } - ], - "Configure task forum permissions" - ); - } - - public async enforceRoleHierarchy(guild: Guild): Promise { - const guildRoles = await guild.roles.fetch(); - const roleList: (DiscordRole | null)[] = Array.from(guildRoles.values()); - const positions: { role: string; position: number }[] = []; - - let position = 1; - const reversed = [...studioRoles].reverse(); - for (const definition of reversed) { - const match = roleList.find((role) => role !== null && role !== undefined && findStudioRole(role.name)?.name === definition.name); - if (match !== undefined && match !== null) { - positions.push({ role: match.id, position }); - position++; - } - } - if (positions.length > 0) { - await guild.roles.setPositions(positions).catch((err: unknown) => { - this.logger.warn({ err }, "failed to set role hierarchy positions"); - }); - } - return positions.length; - } } diff --git a/apps/discord/src/Services/StudioRoles.ts b/apps/discord/src/Services/StudioRoles.ts index 7cf7f0c..0269006 100644 --- a/apps/discord/src/Services/StudioRoles.ts +++ b/apps/discord/src/Services/StudioRoles.ts @@ -1,5 +1,5 @@ import { Role, Specialty } from "@platform/contracts"; -import { type GuildMember, PermissionFlagsBits } from "discord.js"; +import { PermissionFlagsBits } from "discord.js"; export enum StudioTier { Executive = 0, @@ -46,28 +46,20 @@ const communityPermissions = [ ]; export const studioRoles: readonly StudioRole[] = Object.freeze([ - { name: "Producer", tier: StudioTier.Executive, color: 0xe74c3c, specialty: Specialty.Producer }, - { name: "Creative Director", tier: StudioTier.Executive, color: 0x9b59b6, specialty: Specialty.CreativeDirector }, - { name: "Production Manager", tier: StudioTier.Executive, color: 0xc0392b, specialty: Specialty.ProductionManager }, - { name: "Admin", tier: StudioTier.Executive, color: 0x992d22 }, - { name: "Technical Director", tier: StudioTier.Department, color: 0x3498db, specialty: Specialty.TechnicalDirector }, - { name: "Art Director", tier: StudioTier.Department, color: 0xe67e22, specialty: Specialty.ArtDirector }, - { name: "Editorial Supervisor", tier: StudioTier.Department, color: 0x8e44ad, specialty: Specialty.EditorialSupervisor }, - { name: "Layout / Previs Lead", tier: StudioTier.Department, color: 0x9c27b0, specialty: Specialty.LayoutPrevisLead }, - { name: "Modelling Supervisor", tier: StudioTier.Department, color: 0x1abc9c, specialty: Specialty.ModellingSupervisor }, - { name: "Rigging Supervisor", tier: StudioTier.Department, color: 0x2ecc71, specialty: Specialty.RiggingSupervisor }, - { name: "Surfacing / LookDev Lead", tier: StudioTier.Department, color: 0x16a085, specialty: Specialty.SurfacingLookDevLead }, - { name: "Animation Supervisor", tier: StudioTier.Department, color: 0xf39c12, specialty: Specialty.AnimationSupervisor }, - { name: "CFX and VFX Supervisor", tier: StudioTier.Department, color: 0xe91e63, specialty: Specialty.CfxVfxSupervisor }, - { - name: "Lighting and Compositing Supervisor", - tier: StudioTier.Department, - color: 0xf1c40f, - specialty: Specialty.LightingCompositingSupervisor - }, - { name: "Sound Director", tier: StudioTier.Department, color: 0x00bcd4, specialty: Specialty.SoundDirector }, - { name: "Supervisor", tier: StudioTier.Department, color: 0x1abc9c }, - { name: "Media Team", tier: StudioTier.Department, color: 0x9b59b6, specialty: Specialty.MediaTeam }, + { name: "Producer", tier: StudioTier.Executive, color: 0xe74c3c }, + { name: "Creative Director", tier: StudioTier.Executive, color: 0x9b59b6 }, + { name: "Production Manager", tier: StudioTier.Executive, color: 0xc0392b }, + { name: "Technical Director", tier: StudioTier.Department, color: 0x3498db }, + { name: "Art Director", tier: StudioTier.Department, color: 0xe67e22 }, + { name: "Editorial Supervisor", tier: StudioTier.Department, color: 0x8e44ad }, + { name: "Layout / Previs Lead", tier: StudioTier.Department, color: 0x9c27b0 }, + { name: "Modelling Supervisor", tier: StudioTier.Department, color: 0x1abc9c }, + { name: "Rigging Supervisor", tier: StudioTier.Department, color: 0x2ecc71 }, + { name: "Surfacing / LookDev Lead", tier: StudioTier.Department, color: 0x16a085 }, + { name: "Animation Supervisor", tier: StudioTier.Department, color: 0xf39c12 }, + { name: "CFX and VFX Supervisor", tier: StudioTier.Department, color: 0xe91e63 }, + { name: "Lighting and Compositing Supervisor", tier: StudioTier.Department, color: 0xf1c40f }, + { name: "Sound Director", tier: StudioTier.Department, color: 0x00bcd4 }, { name: "Animators", tier: StudioTier.Contributor, color: 0x2980b9, specialty: Specialty.Animator }, { name: "Layout Artists", tier: StudioTier.Contributor, color: 0x673ab7, specialty: Specialty.LayoutArtist }, { name: "3D Modelers", tier: StudioTier.Contributor, color: 0x009688, specialty: Specialty.Modeler3d }, @@ -81,55 +73,11 @@ export const studioRoles: readonly StudioRole[] = Object.freeze([ { name: "Video Editors", tier: StudioTier.Contributor, color: 0x6f42c1, specialty: Specialty.VideoEditor }, { name: "General Contributors", tier: StudioTier.Contributor, color: 0x3498db }, { name: "Voters", tier: StudioTier.Community, color: 0x34495e }, - { name: "Members", tier: StudioTier.Community, color: 0x95a5a6 } + { name: "Observer", tier: StudioTier.Community, color: 0x95a5a6 } ]); +export const observerRoleName = "Observer"; export const contributorRoleName = "General Contributors"; -export const legacyStudioRoleNames: readonly string[] = Object.freeze(["Observer", "observer", "Unverified", "unverified"]); - -export const roleAliases: Readonly> = { - supervisors: "Supervisor", - supervisor: "Supervisor", - mediateam: "Media Team", - mediateams: "Media Team", - media: "Media Team", - contributors: "General Contributors", - contributor: "General Contributors", - generalcontributors: "General Contributors", - generalcontributor: "General Contributors", - voter: "Voters", - voters: "Voters", - member: "Members", - members: "Members", - animator: "Animators", - animators: "Animators", - layoutartist: "Layout Artists", - layoutartists: "Layout Artists", - "3dmodeler": "3D Modelers", - "3dmodelers": "3D Modelers", - modeler: "3D Modelers", - modelers: "3D Modelers", - rigger: "Riggers", - riggers: "Riggers", - surfacetextureartist: "Surface / Texture Artists", - surfacetextureartists: "Surface / Texture Artists", - lightingartist: "Lighting Artists", - lightingartists: "Lighting Artists", - vfxartist: "VFX Artists", - vfxartists: "VFX Artists", - conceptartist: "Concept Artists", - conceptartists: "Concept Artists", - voiceactor: "Voice Actors", - voiceactors: "Voice Actors", - sounddesigner: "Sound Designers", - sounddesigners: "Sound Designers", - videoeditor: "Video Editors", - videoeditors: "Video Editors", - producer: "Producer", - producers: "Producer", - admin: "Admin", - admins: "Admin" -}; export function normalizeName(name: string): string { return name.toLowerCase().replace(/[^a-z0-9]/gu, ""); @@ -137,21 +85,9 @@ export function normalizeName(name: string): string { export function findStudioRole(name: string): StudioRole | undefined { const normalized = normalizeName(name); - const alias = roleAliases[normalized]; - if (alias !== undefined) { - return studioRoles.find((role) => role.name === alias); - } return studioRoles.find((role) => normalizeName(role.name) === normalized); } -export function isStudioOrLegacyRole(name: string): boolean { - if (findStudioRole(name) !== undefined) { - return true; - } - const norm = normalizeName(name); - return legacyStudioRoleNames.some((legacy) => normalizeName(legacy) === norm); -} - export function platformRoleFor(tier: StudioTier): Role { switch (tier) { case StudioTier.Executive: @@ -180,105 +116,3 @@ export function permissionsFor(tier: StudioTier): readonly bigint[] { return communityPermissions; } } - -export function targetStudioRoleNames(role: Role, specialties: readonly Specialty[]): Set { - const names = new Set(); - - if (role === Role.SuperAdmin || role === Role.Admin) { - names.add("Admin"); - } else if (role === Role.Supervisor) { - names.add("Supervisor"); - } - - for (const specialty of specialties) { - const studio = studioRoles.find((r) => r.specialty === specialty); - if (studio !== undefined) { - names.add(studio.name); - } - } - - if (role === Role.Contributor || role === Role.SeniorContributor) { - names.add(contributorRoleName); - } else if (role === Role.Voter) { - names.add("Voters"); - } else if (role === Role.Member) { - names.add("Members"); - } - - return names; -} - -export interface MemberRoleSyncResult { - readonly modified: boolean; - readonly added: readonly string[]; - readonly removed: readonly string[]; -} - -export async function syncMemberStudioRoles( - member: GuildMember, - role: Role, - specialties: readonly Specialty[], - reason: string = "Platform role sync" -): Promise { - const targetNames = targetStudioRoleNames(role, specialties); - const guildRoles = await member.guild.roles.fetch(); - const rolesList = Array.from(guildRoles.values()); - - const toAdd: string[] = []; - const toRemove: string[] = []; - - // identify target studio roles to add - for (const targetName of targetNames) { - const guildRole = rolesList.find((r) => findStudioRole(r.name)?.name === targetName); - if (guildRole !== undefined) { - if (!member.roles.cache.has(guildRole.id)) { - toAdd.push(guildRole.id); - } - } else { - // auto-create role if missing from server - const definition = studioRoles.find((r) => r.name === targetName); - if (definition !== undefined) { - const created = await member.guild.roles.create({ - name: definition.name, - colors: { primaryColor: definition.color }, - hoist: definition.tier !== StudioTier.Community, - mentionable: definition.tier !== StudioTier.Community, - permissions: [...permissionsFor(definition.tier)], - reason: "Studio role auto-provision" - }).catch(() => null); - if (created !== null) { - toAdd.push(created.id); - } - } - } - } - - // strip obsolete studio roles and legacy roles - for (const guildRole of rolesList) { - if (!isStudioOrLegacyRole(guildRole.name)) { - continue; - } - - const studio = findStudioRole(guildRole.name); - const shouldHave = studio !== undefined && targetNames.has(studio.name); - const hasRole = member.roles.cache.has(guildRole.id); - - if (!shouldHave && hasRole) { - toRemove.push(guildRole.id); - } - } - - if (toRemove.length > 0) { - await member.roles.remove(toRemove, reason.slice(0, 400)); - } - if (toAdd.length > 0) { - await member.roles.add(toAdd, reason.slice(0, 400)); - } - - return { - modified: toAdd.length > 0 || toRemove.length > 0, - added: toAdd, - removed: toRemove - }; -} - diff --git a/apps/discord/src/Services/TaskForum.ts b/apps/discord/src/Services/TaskForum.ts index 578aaf0..940e195 100644 --- a/apps/discord/src/Services/TaskForum.ts +++ b/apps/discord/src/Services/TaskForum.ts @@ -26,7 +26,6 @@ export function referenceOf(shot: Pick(); private readonly shotsByThread = new Map(); - private readonly pendingThreads = new Map>(); public constructor( private readonly client: Client, @@ -37,13 +36,8 @@ export class TaskForum { ) {} public async load(): Promise { - try { - const maps = await this.api.listThreadMaps(); - for (const map of maps) { - this.remember(map.shotId, map.discordThreadId); - } - } catch (error: unknown) { - this.logger.warn({ err: error }, "failed to load task thread bindings"); + for (const map of await this.api.listThreadMaps()) { + this.remember(map.shotId, map.discordThreadId); } } @@ -55,20 +49,6 @@ export class TaskForum { return this.shotsByThread.get(threadId); } - public async resolveShotFor(threadId: string): Promise { - const cached = this.shotsByThread.get(threadId); - if (cached !== undefined) { - return cached; - } - // fall back to the persisted binding when the cache is cold - const remote = await this.api.getThreadMapByThread(threadId); - if (remote !== null) { - this.remember(remote.shotId, remote.discordThreadId); - return remote.shotId; - } - return undefined; - } - public async forum(): Promise { const id = this.settings.channel(ChannelPurpose.TaskForum); if (id === undefined) { @@ -78,22 +58,7 @@ export class TaskForum { return channel !== null && channel.type === ChannelType.GuildForum && channel.guildId === this.guildId ? channel : null; } - public ensureThread(shot: ShotReference, description: string | null, status: ShotStatus): Promise { - const inFlight = this.pendingThreads.get(shot.id); - if (inFlight !== undefined) { - return inFlight; - } - const creation = this.createThread(shot, description, status).finally(() => this.pendingThreads.delete(shot.id)); - this.pendingThreads.set(shot.id, creation); - return creation; - } - - public async ensureThreadFor(shotId: string): Promise { - const shot = await this.api.getShot(shotId); - return this.ensureThread(referenceOf(shot), shot.description, shot.status); - } - - private async createThread(shot: ShotReference, description: string | null, status: ShotStatus): Promise { + public async ensureThread(shot: ShotReference, description: string | null, status: ShotStatus): Promise { const existing = await this.thread(shot.id); if (existing !== null) { return existing.id; @@ -148,63 +113,16 @@ export class TaskForum { await thread.send(content); } - public async remove(target: string | ShotReference): Promise { - const shotId = typeof target === "string" ? target : target.id; - const shotCode = typeof target === "string" ? undefined : target.code; - let thread = await this.thread(shotId); - - // search forum if binding is missing from memory cache - if (thread === null && shotCode !== undefined) { - const forum = await this.forum(); - if (forum !== null) { - const active = await forum.threads.fetchActive().catch(() => null); - if (active !== null) { - for (const [, t] of active.threads) { - if ( - t.parentId === forum.id && - (t.name === shotCode || t.name.startsWith(`${shotCode} - `) || t.name.startsWith(`${shotCode}: `)) - ) { - thread = t; - break; - } - } - } - if (thread === null) { - const archived = await forum.threads.fetchArchived({ limit: 100 }).catch(() => null); - if (archived !== null) { - for (const [, t] of archived.threads) { - if ( - t.parentId === forum.id && - (t.name === shotCode || t.name.startsWith(`${shotCode} - `) || t.name.startsWith(`${shotCode}: `)) - ) { - thread = t; - break; - } - } - } - } - } - } - + public async remove(shotId: string): Promise { + const thread = await this.thread(shotId); if (thread !== null) { - try { - await thread.delete("Task deleted"); - } catch (error: unknown) { - this.logger.warn({ err: error, threadId: thread.id }, "failed to delete thread, falling back to lock and archive"); - // fallback to lock and archive when delete fails (e.g. missing permissions) - await thread.setLocked(true, "Task deleted").catch(() => undefined); - await thread.setArchived(true, "Task deleted").catch(() => undefined); - } + await thread.delete("Task deleted"); } - const threadId = this.threadsByShot.get(shotId); this.threadsByShot.delete(shotId); if (threadId !== undefined) { this.shotsByThread.delete(threadId); } - if (thread !== null) { - this.shotsByThread.delete(thread.id); - } await this.api.unbindThread(shotId).catch((error: unknown) => { this.logger.warn({ err: error, shotId }, "failed to unbind thread"); }); @@ -233,11 +151,9 @@ export class TaskForum { } known.add(existing.id); const tag = this.settings.forumTag(shot.status); - const shouldBeLocked = shot.status === ShotStatus.Approved; const stale = existing.name !== this.threadName(reference) || - (tag !== undefined && (existing.appliedTags.length !== 1 || existing.appliedTags[0] !== tag)) || - existing.locked !== shouldBeLocked; + (tag !== undefined && (existing.appliedTags.length !== 1 || existing.appliedTags[0] !== tag)); if (stale) { await this.rename(reference); await this.setStatus(shot.id, shot.status); @@ -286,6 +202,6 @@ export class TaskForum { } private threadName(shot: ShotReference): string { - return `${shot.code} - ${shot.title}`.slice(0, 100); + return `${shot.code} · ${shot.title}`.slice(0, 100); } } diff --git a/apps/discord/src/State/ReminderStore.ts b/apps/discord/src/State/ReminderStore.ts deleted file mode 100644 index 79a8a45..0000000 --- a/apps/discord/src/State/ReminderStore.ts +++ /dev/null @@ -1,127 +0,0 @@ -import { randomBytes } from "node:crypto"; -import { mkdir, readFile, rename, writeFile } from "node:fs/promises"; -import { join } from "node:path"; -import { z } from "zod"; - -export interface Reminder { - readonly id: string; - readonly userId: string; - readonly message: string; - readonly fireAt: string; // ISO - readonly createdAt: string; // ISO -} - -const reminderSchema = z.object({ - id: z.string(), - userId: z.string(), - message: z.string(), - fireAt: z.string(), - createdAt: z.string() -}); - -const storeSchema = z.array(reminderSchema).default([]); - -const maxPerUser = 10; - -export class ReminderStore { - private reminders: Reminder[] = []; - private writeChain: Promise = Promise.resolve(); - private readonly path: string; - - public constructor(private readonly directory: string) { - this.path = join(directory, "reminders.json"); - } - - public async load(): Promise { - try { - const parsed = storeSchema.safeParse(JSON.parse(await readFile(this.path, "utf8"))); - this.reminders = parsed.success ? parsed.data : []; - } catch { - this.reminders = []; - } - } - - public add(userId: string, message: string, fireAt: Date): Reminder { - const existing = this.reminders.filter((r) => r.userId === userId); - if (existing.length >= maxPerUser) { - throw new Error(`You already have ${maxPerUser} active reminders. Cancel one first.`); - } - const reminder: Reminder = { - id: randomBytes(4).toString("hex"), - userId, - message, - fireAt: fireAt.toISOString(), - createdAt: new Date().toISOString() - }; - this.reminders.push(reminder); - void this.persist(); - return reminder; - } - - public remove(id: string, userId: string): boolean { - const index = this.reminders.findIndex((r) => r.id === id && r.userId === userId); - if (index === -1) { - return false; - } - this.reminders.splice(index, 1); - void this.persist(); - return true; - } - - public forUser(userId: string): readonly Reminder[] { - return this.reminders - .filter((r) => r.userId === userId) - .sort((a, b) => new Date(a.fireAt).getTime() - new Date(b.fireAt).getTime()); - } - - public drain(): Reminder[] { - const now = Date.now(); - const fired: Reminder[] = []; - const remaining: Reminder[] = []; - for (const r of this.reminders) { - if (new Date(r.fireAt).getTime() <= now) { - fired.push(r); - } else { - remaining.push(r); - } - } - if (fired.length > 0) { - this.reminders = remaining; - void this.persist(); - } - return fired; - } - - public nextFireAt(): Date | null { - if (this.reminders.length === 0) { - return null; - } - let earliest = Infinity; - for (const r of this.reminders) { - const t = new Date(r.fireAt).getTime(); - if (t < earliest) { - earliest = t; - } - } - return new Date(earliest); - } - - public get size(): number { - return this.reminders.length; - } - - public flush(): Promise { - return this.writeChain; - } - - private persist(): Promise { - const content = JSON.stringify(this.reminders, null, 2); - this.writeChain = this.writeChain.then(async () => { - await mkdir(this.directory, { recursive: true, mode: 0o700 }); - const temporary = `${this.path}.${process.pid}.tmp`; - await writeFile(temporary, content, { encoding: "utf8", mode: 0o600 }); - await rename(temporary, this.path); - }); - return this.writeChain; - } -} diff --git a/apps/discord/src/State/SettingsStore.ts b/apps/discord/src/State/SettingsStore.ts index affe9e3..b34c8df 100644 --- a/apps/discord/src/State/SettingsStore.ts +++ b/apps/discord/src/State/SettingsStore.ts @@ -4,7 +4,6 @@ import { ShotStatus, enumValues, notificationStreamIdPattern } from "@platform/c import { z } from "zod"; export enum ChannelPurpose { - Rules = "rules", Announcements = "announcements", Telemetry = "telemetry", TaskLogs = "taskLogs", @@ -13,8 +12,7 @@ export enum ChannelPurpose { } export enum BoundRole { - Member = "member", - Voter = "voter", + Observer = "observer", Contributor = "contributor" } diff --git a/apps/discord/src/Views/NotificationViews.ts b/apps/discord/src/Views/NotificationViews.ts index ebbb90d..69f30d4 100644 --- a/apps/discord/src/Views/NotificationViews.ts +++ b/apps/discord/src/Views/NotificationViews.ts @@ -9,9 +9,8 @@ import { type PlatformNotification, type ShotReference } from "@platform/contracts"; -import type { MediaGalleryBuilder } from "discord.js"; import { ChannelPurpose } from "../State/SettingsStore.js"; -import { Accent, image, message, panel, person, plain, quote, when, type V2Message } from "../Discord/Ui.js"; +import { Accent, message, panel, person, plain, quote, when, type V2Message } from "../Discord/Ui.js"; export interface RenderedNotification { readonly purpose: ChannelPurpose; @@ -19,32 +18,11 @@ export interface RenderedNotification { } export interface NotificationContext { - readonly threadFor: (shotId: string) => string | undefined; - readonly isMember?: (discordId: string) => boolean; + threadFor(shotId: string): string | undefined; } -type Line = string | MediaGalleryBuilder | null; - -// consecutive text lines share one text display; media galleries sit between them -function post(purpose: ChannelPurpose, accent: Accent | null, ...lines: readonly Line[]): RenderedNotification { - const blocks: (string | MediaGalleryBuilder)[] = []; - for (const line of lines) { - const previous = blocks.at(-1); - if (line === null) { - continue; - } - if (typeof line === "string" && typeof previous === "string") { - blocks[blocks.length - 1] = `${previous} -${line}`; - } else { - blocks.push(line); - } - } - return { purpose, message: message(panel(accent, ...blocks)) }; -} - -function preview(url: string | null | undefined, title: string): MediaGalleryBuilder | null { - return url === null || url === undefined || !/\.(png|jpe?g|gif|webp|mp4|webm|mov)$/iu.test(url) ? null : image(url, title); +function post(purpose: ChannelPurpose, accent: Accent | null, ...lines: readonly (string | null)[]): RenderedNotification { + return { purpose, message: message(panel(accent, lines.filter((line): line is string => line !== null).join("\n"))) }; } function reason(value: string | null): string | null { @@ -52,7 +30,7 @@ function reason(value: string | null): string | null { } function shotName(shot: ShotReference): string { - return `${plain(shot.code, 50)} - ${plain(shot.title, 120)}`; + return `${plain(shot.code, 50)} · ${plain(shot.title, 120)}`; } function shotLink(shot: ShotReference, context: NotificationContext): string { @@ -60,9 +38,14 @@ function shotLink(shot: ShotReference, context: NotificationContext): string { return thread === undefined ? shotName(shot) : `${shotName(shot)} (<#${thread}>)`; } -function describeBallot(notification: NotificationOf, context: NotificationContext): string { - const action = notification.isChange ? "updated their ballot." : "cast a ballot."; - return `${person(notification.voter, context.isMember)} ${action}`; +function describePicks(notification: NotificationOf): string { + const titles = notification.picks.map((pick) => plain(pick.title, 80)); + const verb = notification.isChange ? "changed their vote to" : "voted for"; + if (notification.round.pollType === PollType.Binary || titles.length === 1) { + return `${person(notification.voter)} ${verb} ${titles[0] ?? "an entry"}`; + } + const ranking = titles.map((title, index) => `${index + 1}. ${title}`).join(" "); + return `${person(notification.voter)} ${notification.isChange ? "changed their ranking to" : "ranked"} ${ranking}`; } function describeRaid(notification: NotificationOf): string { @@ -85,9 +68,9 @@ function describeSchedule(opensAt: string | null, closesAt: string | null): stri } const statusVerbs: Readonly> = { - [RoundStatus.Draft]: "moved to draft", - [RoundStatus.Open]: "is open for submissions", - [RoundStatus.Voting]: "is open for voting", + [RoundStatus.Draft]: "moved back to draft", + [RoundStatus.Open]: "is open for voting", + [RoundStatus.Closed]: "closed", [RoundStatus.Finalized]: "was finalized" }; @@ -112,17 +95,16 @@ export function describeWinner(notification: NotificationOf 0 ? ` (${notification.specialties.join(", ")})` : ""}, by ${person(notification.actor, isMember)}` - ) + post(telemetry, Accent.Success, "**Voting ban lifted**", `${person(notification.user)}, by ${person(notification.actor)}`) ]; case NotificationType.ContributorPromoted: - return [ - post(ChannelPurpose.Announcements, Accent.Success, `${person(notification.user, isMember)} is now a senior contributor.`) - ]; + return [post(ChannelPurpose.Announcements, Accent.Success, `${person(notification.user)} is now a senior contributor.`)]; case NotificationType.RaidAlert: return [ post( @@ -174,60 +140,18 @@ export function renderNotification(notification: PlatformNotification, context: Accent.Info, `**New round: ${plain(notification.round.title)}**`, `${notification.round.pollType === PollType.Binary ? "Binary" : "Ranked choice"}, ${describeSchedule(notification.opensAt, notification.closesAt)}`, - `-# Created by ${person(notification.actor, isMember)}` + `-# Created by ${person(notification.actor)}` ) ]; - case NotificationType.RoundUpdated: + case NotificationType.RoundStatusChanged: return [ post( telemetry, - Accent.Info, - `**Round updated: ${plain(notification.round.title)}**`, - `${notification.round.pollType === PollType.Binary ? "Binary" : "Ranked choice"}, ${describeSchedule(notification.opensAt, notification.closesAt)}`, - `-# Updated by ${person(notification.actor, isMember)}` + notification.to === RoundStatus.Open ? Accent.Success : null, + `**${plain(notification.round.title)} ${notification.from === RoundStatus.Closed && notification.to === RoundStatus.Open ? "reopened" : statusVerbs[notification.to]}**`, + `-# By ${person(notification.actor)}` ) ]; - case NotificationType.RoundDeleted: - return [ - post( - telemetry, - Accent.Warning, - `**Round deleted: ${plain(notification.round.title)}**`, - `-# Deleted by ${person(notification.actor, isMember)}` - ) - ]; - case NotificationType.RoundStatusChanged: { - const posts: RenderedNotification[] = [ - post( - telemetry, - notification.to === RoundStatus.Voting || notification.to === RoundStatus.Open ? Accent.Success : null, - `**${plain(notification.round.title)} ${statusVerbs[notification.to]}**`, - `-# By ${person(notification.actor, isMember)}` - ) - ]; - if (notification.to === RoundStatus.Voting) { - posts.push( - post( - ChannelPurpose.Announcements, - Accent.Success, - `## Voting is now open for ${plain(notification.round.title)}!`, - `Cast your vote on the platform: ${notification.round.pollType === PollType.Binary ? "Binary vote" : "Ranked choice vote"}.`, - `-# Opened by ${person(notification.actor, isMember)}` - ) - ); - } else if (notification.to === RoundStatus.Open) { - posts.push( - post( - ChannelPurpose.Announcements, - Accent.Success, - `## Submissions are now open for ${plain(notification.round.title)}!`, - `Submit your entries on the platform before voting begins.`, - `-# Opened by ${person(notification.actor, isMember)}` - ) - ); - } - return posts; - } case NotificationType.RoundFinalized: return [ post( @@ -235,8 +159,7 @@ export function renderNotification(notification: PlatformNotification, context: Accent.Info, `## ${plain(notification.round.title)}`, describeWinner(notification), - `-# ${notification.totalBallots.toLocaleString("en-US")} ${notification.totalBallots === 1 ? "ballot" : "ballots"} counted`, - preview(notification.winner?.mediaUrl, notification.winner?.title ?? notification.round.title) + `-# ${notification.totalBallots.toLocaleString("en-US")} ${notification.totalBallots === 1 ? "ballot" : "ballots"} counted` ) ]; case NotificationType.EntrySubmitted: @@ -245,30 +168,8 @@ export function renderNotification(notification: PlatformNotification, context: telemetry, null, `**New entry in ${plain(notification.round.title)}**`, - `${plain(notification.entry.title)} by ${person(notification.author, isMember)}`, - notification.status === EntryStatus.PendingReview ? "-# Waiting for review" : "-# Approved automatically", - preview(notification.entry.mediaUrl, notification.entry.title) - ) - ]; - case NotificationType.EntryUpdated: - return [ - post( - telemetry, - Accent.Info, - `**Entry updated in ${plain(notification.round.title)}**`, - plain(notification.entry.title), - `-# Updated by ${person(notification.actor, isMember)}`, - preview(notification.entry.mediaUrl, notification.entry.title) - ) - ]; - case NotificationType.EntryDeleted: - return [ - post( - telemetry, - Accent.Warning, - `**Entry deleted in ${plain(notification.round.title)}**`, - plain(notification.entry.title), - `-# Deleted by ${person(notification.actor, isMember)}` + `${plain(notification.entry.title)} by ${person(notification.author)}`, + notification.status === EntryStatus.PendingReview ? "-# Waiting for review" : "-# Approved automatically" ) ]; case NotificationType.EntryStatusChanged: { @@ -279,8 +180,7 @@ export function renderNotification(notification: PlatformNotification, context: headline.accent, `**${headline.title}**`, `${plain(notification.entry.title)} in ${plain(notification.round.title)}`, - `-# By ${person(notification.actor, isMember)}`, - preview(notification.entry.mediaUrl, notification.entry.title) + `-# By ${person(notification.actor)}` ) ]; } @@ -291,8 +191,7 @@ export function renderNotification(notification: PlatformNotification, context: Accent.Success, "**Entry reinstated**", `${plain(notification.entry.title)} is back on the ballot in ${plain(notification.round.title)}.`, - `-# By ${person(notification.actor, isMember)}`, - preview(notification.entry.mediaUrl, notification.entry.title) + `-# By ${person(notification.actor)}` ) ]; case NotificationType.ShotCreated: @@ -307,7 +206,7 @@ export function renderNotification(notification: PlatformNotification, context: taskLogs, null, `**Claimed:** ${shotLink(notification.shot, context)}`, - `${person(notification.claimant, isMember)}, due ${when(notification.deadlineAt)}` + `${person(notification.claimant)}, due ${when(notification.deadlineAt)}` ) ]; case NotificationType.ShotReleased: @@ -316,7 +215,7 @@ export function renderNotification(notification: PlatformNotification, context: taskLogs, null, `**Released:** ${shotLink(notification.shot, context)}`, - `By ${person(notification.actor, isMember)}`, + `By ${person(notification.actor)}`, reason(notification.reason) ) ]; @@ -328,7 +227,7 @@ export function renderNotification(notification: PlatformNotification, context: `**Claim expired:** ${shotLink(notification.shot, context)}`, notification.claimant === null ? "The task is open again." - : `${person(notification.claimant, isMember)} ran out of time. The task is open again.` + : `${person(notification.claimant)} ran out of time. The task is open again.` ) ]; case NotificationType.SubmissionCreated: @@ -337,8 +236,7 @@ export function renderNotification(notification: PlatformNotification, context: taskLogs, null, `**Submitted:** ${shotLink(notification.shot, context)}, version ${notification.version}`, - `By ${person(notification.contributor, isMember)}`, - notification.notes === null ? null : quote(notification.notes, 500) + `By ${person(notification.contributor)}` ) ]; case NotificationType.SubmissionReviewed: { @@ -348,7 +246,7 @@ export function renderNotification(notification: PlatformNotification, context: taskLogs, approved ? Accent.Success : Accent.Warning, `**${approved ? "Approved" : "Changes requested"}:** ${shotLink(notification.shot, context)}, version ${notification.version}`, - `Reviewed by ${person(notification.reviewer, isMember)}`, + `Reviewed by ${person(notification.reviewer)}`, notification.notes === null ? null : quote(notification.notes, 600) ) ]; @@ -357,107 +255,11 @@ export function renderNotification(notification: PlatformNotification, context: post( ChannelPurpose.Announcements, Accent.Success, - `**${shotName(notification.shot)} is finished.** Delivered by ${person(notification.contributor, isMember)}.` + `**${shotName(notification.shot)} is finished.** Delivered by ${person(notification.contributor)}.` ) ); } return rendered; } - case NotificationType.PipelineUpdated: { - if (notification.isPhaseTransition) { - return [ - post( - ChannelPurpose.Announcements, - Accent.Success, - `## Phase ${notification.phaseNumber} Unlocked: ${plain(notification.phaseTitle)}`, - `Now entering **Step ${plain(notification.stepId)}: ${plain(notification.stepTitle)}** (${notification.progressPercent}% overall completed).`, - `-# Updated by ${person(notification.actor, isMember)}` - ) - ]; - } - return [ - post( - ChannelPurpose.Announcements, - Accent.Info, - `**Pipeline Update: Step ${plain(notification.stepId)} - ${plain(notification.stepTitle)}**`, - `In **${plain(notification.phaseTitle)}** (${notification.progressPercent}% completed).`, - `-# Updated by ${person(notification.actor, isMember)}` - ) - ]; - } - case NotificationType.MediaFlaggedAi: { - const kindLabel = notification.mediaKind === "entry" ? "Round Entry" : "Task Deliverable"; - const flagLines = notification.flags.map((flag) => `• ${plain(flag, 120)}`).join("\n"); - return [ - post( - ChannelPurpose.Telemetry, - Accent.Warning, - `**AI signatures detected:** ${kindLabel} "${plain(notification.title, 80)}"`, - `Uploaded by ${person(notification.author, isMember)}`, - flagLines, - notification.snippet === null ? null : quote(notification.snippet, 300) - ) - ]; - } - case NotificationType.DocumentUpdated: { - const noteText = notification.note !== null && notification.note.trim().length > 0 ? `\n-# Note: ${plain(notification.note, 200)}` : ""; - return [ - post( - ChannelPurpose.TaskLogs, - Accent.Info, - `**Guidelines Updated (Rev #${notification.revision}): ${plain(notification.title)}**`, - `Updated by ${person(notification.actor, isMember)}${noteText}` - ), - post( - ChannelPurpose.Telemetry, - Accent.Info, - `**Document Published: ${plain(notification.title)} (Rev #${notification.revision})**`, - `Published by ${person(notification.actor, isMember)}${noteText}` - ) - ]; - } } } - -export function htmlToDiscordMarkdown(html: string): string { - return html - .replace(//gi, "\n") - .replace(/<\/p>\s*

/gi, "\n\n") - .replace(/<\/?p>/gi, "") - .replace(/(.*?)<\/strong>/gi, "**$1**") - .replace(/(.*?)<\/b>/gi, "**$1**") - .replace(/(.*?)<\/em>/gi, "*$1*") - .replace(/(.*?)<\/i>/gi, "*$1*") - .replace(/(.*?)<\/code>/gi, "`$1`") - .replace(/

([\s\S]*?)<\/code><\/pre>/gi, "```\n$1\n```")
-        .replace(/
  • (.*?)<\/li>/gi, "• $1\n")
-        .replace(/<\/?ul>/gi, "\n")
-        .replace(/<\/?ol>/gi, "\n")
-        .replace(/]*?\s+)?href="([^"]*)"[^>]*>(.*?)<\/a>/gi, "[$2]($1)")
-        .replace(/>/gi, ">")
-        .replace(/</gi, "<")
-        .replace(/&/gi, "&")
-        .replace(/"/gi, '"')
-        .replace(/\n{3,}/g, "\n\n")
-        .trim();
-}
-
-export function renderRulesMessage(notification: NotificationOf): V2Message {
-    const lines: string[] = [
-        `# 📜 ${notification.title}`,
-        `*Official guidelines, scoring invariants, and fair-play policies.*`,
-        ""
-    ];
-
-    for (const section of notification.sections) {
-        lines.push(`### ${section.title}`);
-        lines.push(htmlToDiscordMarkdown(section.html));
-        lines.push("");
-    }
-
-    lines.push(
-        `-# Revision ${notification.revision} • Synced automatically from web platform • [View Full Documentation](https://dev-api.seraphinteractive.com/documentation)`
-    );
-
-    return message(panel(Accent.Info, lines.join("\n").trim()));
-}
diff --git a/apps/discord/src/Views/RoundViews.ts b/apps/discord/src/Views/RoundViews.ts
index 92e1ee8..ffdee60 100644
--- a/apps/discord/src/Views/RoundViews.ts
+++ b/apps/discord/src/Views/RoundViews.ts
@@ -45,7 +45,7 @@ export enum RoundView {
 const statusLabels: Readonly> = {
     [RoundStatus.Draft]: "Draft",
     [RoundStatus.Open]: "Open",
-    [RoundStatus.Voting]: "Voting",
+    [RoundStatus.Closed]: "Closed",
     [RoundStatus.Finalized]: "Finalized"
 };
 
@@ -54,11 +54,8 @@ function pollLabel(pollType: PollType): string {
 }
 
 function schedule(round: RoundDto): string {
-    if (round.status === RoundStatus.Voting && round.closesAt !== null) {
-        return `closes ${when(round.closesAt)}`;
-    }
     if (round.status === RoundStatus.Open && round.closesAt !== null) {
-        return `submissions close ${when(round.closesAt)}`;
+        return `closes ${when(round.closesAt)}`;
     }
     if (round.status === RoundStatus.Draft && round.opensAt !== null) {
         return `opens ${when(round.opensAt)}`;
@@ -68,10 +65,8 @@ function schedule(round: RoundDto): string {
 
 export function sortRounds(rounds: readonly RoundDto[]): RoundDto[] {
     return [...rounds].sort((a, b) => {
-        const aActive = a.status === RoundStatus.Voting || a.status === RoundStatus.Open;
-        const bActive = b.status === RoundStatus.Voting || b.status === RoundStatus.Open;
-        if (aActive !== bActive) {
-            return aActive ? -1 : 1;
+        if ((a.status === RoundStatus.Open) !== (b.status === RoundStatus.Open)) {
+            return a.status === RoundStatus.Open ? -1 : 1;
         }
         return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
     });
@@ -84,7 +79,7 @@ export function roundList(rounds: readonly RoundDto[]): V2Message {
     const shown = sortRounds(rounds).slice(0, 15);
     const lines = shown.map((round) => {
         const suffix = schedule(round);
-        return `**${plain(round.title, 100)}**\n-# ${statusLabels[round.status]}, ${pollLabel(round.pollType)}${suffix.length > 0 ? `, ${suffix}` : ""}`;
+        return `**${plain(round.title, 100)}**\n-# ${statusLabels[round.status]} · ${pollLabel(round.pollType)}${suffix.length > 0 ? ` · ${suffix}` : ""}`;
     });
     const more = rounds.length > shown.length ? `\n-# and ${rounds.length - shown.length} more` : "";
     return message(panel(null, "## Rounds", divider(), lines.join("\n\n") + more));
@@ -99,7 +94,7 @@ export function roundSelect(action: RoundView, rounds: readonly RoundDto[], prom
                 .slice(0, 25)
                 .map((round) => ({
                     label: truncate(round.title, 90),
-                    description: `${statusLabels[round.status]}, ${pollLabel(round.pollType)}`,
+                    description: `${statusLabels[round.status]} · ${pollLabel(round.pollType)}`,
                     value: round.id
                 }))
         );
@@ -113,9 +108,9 @@ export function roundDetail(round: RoundDetailDto, webAppUrl: string): V2Message
     ].filter((line): line is string => line !== null);
     const lines = [
         `## ${plain(round.title, 200)}`,
-        `${statusLabels[round.status]}, ${pollLabel(round.pollType)}${round.isAcceptingVotes ? ", accepting votes" : ""}`,
+        `${statusLabels[round.status]} · ${pollLabel(round.pollType)}${round.isAcceptingVotes ? " · accepting votes" : ""}`,
         ...times,
-        `${pluralize(round.eligibleEntryCount, "entry", "entries")}, ${pluralize(round.ballotCount, "ballot")}`,
+        `${pluralize(round.eligibleEntryCount, "entry", "entries")} · ${pluralize(round.ballotCount, "ballot")}`,
         ...round.warnings.map((warning) => `-# ${plain(warning, 200)}`)
     ];
     const components = round.isAcceptingVotes ? [buttons(linkButton("Vote on the web", `${webAppUrl}/studio`))] : [];
@@ -131,7 +126,7 @@ export function entryPage(round: RoundDetailDto, entries: readonly EntryDto[], i
     const blocks = [
         `## ${plain(entry.title, 200)}`,
         entry.description === null ? "-# No description" : plain(entry.description, 1500),
-        `-# ${plain(round.title, 100)}, entry ${index + 1} of ${entries.length}, submitted ${when(entry.createdAt)}${status === null ? "" : `, ${status}`}`
+        `-# ${plain(round.title, 100)} · entry ${index + 1} of ${entries.length} · submitted ${when(entry.createdAt)}${status === null ? "" : ` · ${status}`}`
     ].join("\n");
     const media = entry.mediaUrl !== null && /\.(png|jpe?g|gif|webp)$/iu.test(entry.mediaUrl) ? [image(entry.mediaUrl, entry.title)] : [];
     const navigation = buttons(
@@ -148,7 +143,7 @@ export function entryPage(round: RoundDetailDto, entries: readonly EntryDto[], i
 
 function standingLine(item: LeaderboardItemDto, pollType: PollType): string {
     if (pollType === PollType.Binary) {
-        return `${item.position}. **${plain(item.title, 100)}** ${item.voteSharePercentage.toFixed(1)}%, ${pluralize(item.rawScore, "vote")}`;
+        return `${item.position}. **${plain(item.title, 100)}** ${item.voteSharePercentage.toFixed(1)}% · ${pluralize(item.rawScore, "vote")}`;
     }
     const points = (item.regularizedTotalScore ?? item.rawScore).toFixed(1);
     const counts = item.rankCounts.map((count, position) => `${count}× ${["1st", "2nd", "3rd"][position] ?? ""}`).join(", ");
@@ -160,7 +155,7 @@ export function leaderboard(round: RoundDto, board: LeaderboardDto): V2Message {
         return message(panel(null, `## ${plain(round.title)}`, "No votes yet."));
     }
     const lines = board.items.slice(0, 10).map((item) => standingLine(item, board.pollType));
-    const footer = `-# ${pluralize(board.totalBallots, "ballot")}, updated ${when(board.computedAt)}${board.isConserved ? "" : ", point totals don't add up, check the audit"}`;
+    const footer = `-# ${pluralize(board.totalBallots, "ballot")} · updated ${when(board.computedAt)}${board.isConserved ? "" : " · point totals don't add up, check the audit"}`;
     return message(panel(null, `## ${plain(round.title)}`, lines.join("\n"), footer));
 }
 
@@ -181,7 +176,7 @@ export function results(round: RoundDto, result: RoundResultDto): V2Message {
                 `## ${plain(round.title)}: results`,
                 standings.join("\n"),
                 verdict,
-                `-# ${pluralize(result.totalBallots, "ballot")}, finalized ${when(result.finalizedAt, "D")}`
+                `-# ${pluralize(result.totalBallots, "ballot")} · finalized ${when(result.finalizedAt, "D")}`
             ]
                 .filter((line): line is string => line !== null)
                 .join("\n")
@@ -210,7 +205,7 @@ export function telemetry(round: RoundDto, snapshots: readonly RaidTelemetryDto[
                 : snapshot.severity === RaidSeverity.Suspicious
                   ? "suspicious"
                   : "critical";
-        return `**${plain(titles.get(snapshot.entryId) ?? "Unknown entry", 100)}** ${state}\n-# ${flags.length > 0 ? flags.join(", ") : "no anomalies"}, velocity ${snapshot.velocityZScore.toFixed(1)}σ`;
+        return `**${plain(titles.get(snapshot.entryId) ?? "Unknown entry", 100)}** ${state}\n-# ${flags.length > 0 ? flags.join(", ") : "no anomalies"} · velocity ${snapshot.velocityZScore.toFixed(1)}σ`;
     });
     const worst = ordered[0]?.severity ?? RaidSeverity.Normal;
     const accent = worst === RaidSeverity.CriticalRaid ? Accent.Danger : worst === RaidSeverity.Suspicious ? Accent.Warning : null;
diff --git a/apps/discord/src/Views/TaskViews.ts b/apps/discord/src/Views/TaskViews.ts
index 643624e..be4119f 100644
--- a/apps/discord/src/Views/TaskViews.ts
+++ b/apps/discord/src/Views/TaskViews.ts
@@ -24,7 +24,6 @@ import {
     type V2Message
 } from "../Discord/Ui.js";
 
-export const claimButtonPrefix = "claim-task";
 export const reviewButtonPrefix = "review";
 export const deliverablesButtonPrefix = "deliverables";
 
@@ -36,7 +35,7 @@ const tierDays: Readonly> = {
 };
 
 export function threadStarter(shot: ShotReference, description: string | null): V2Message {
-    const details = `${capitalize(shot.difficulty)}, scene ${shot.sceneNumber}, ${tierDays[shot.difficulty]} days once claimed`;
+    const details = `${capitalize(shot.difficulty)} · scene ${shot.sceneNumber} · ${tierDays[shot.difficulty]} days once claimed`;
     return message(
         panel(
             null,
@@ -45,12 +44,11 @@ export function threadStarter(shot: ShotReference, description: string | null):
                 `-# ${plain(shot.code, 50)}`,
                 details,
                 description === null ? null : plain(description, 1500),
-                "-# Click Claim Task or use /take-task to claim."
+                "-# Use /take-task in this post to claim it."
             ]
                 .filter((line): line is string => line !== null)
                 .join("\n")
-        ),
-        buttons(actionButton(`${claimButtonPrefix}:${shot.id}`, "Claim Task", ButtonStyle.Primary))
+        )
     );
 }
 
diff --git a/apps/discord/test/NotificationViews.test.ts b/apps/discord/test/NotificationViews.test.ts
index 04a460e..5e7ef65 100644
--- a/apps/discord/test/NotificationViews.test.ts
+++ b/apps/discord/test/NotificationViews.test.ts
@@ -1,6 +1,5 @@
 import {
     DifficultyTier,
-    DocumentSlug,
     EntryStatus,
     NotificationType,
     platformNotificationSchema,
@@ -8,16 +7,14 @@ import {
     RaidFlag,
     RaidSeverity,
     ReviewDecision,
-    Role,
     RoundStatus,
-    Specialty,
     type PlatformNotification
 } from "@platform/contracts";
 import { MessageFlags } from "discord.js";
 import { describe, expect, it } from "vitest";
 import type { V2Message } from "../src/Discord/Ui.js";
 import { ChannelPurpose } from "../src/State/SettingsStore.js";
-import { htmlToDiscordMarkdown, renderNotification, renderRulesMessage, type RenderedNotification } from "../src/Views/NotificationViews.js";
+import { renderNotification } from "../src/Views/NotificationViews.js";
 import { reviewCard, threadUpdate } from "../src/Views/TaskViews.js";
 
 const occurredAt = "2026-09-27T01:08:00.000Z";
@@ -97,46 +94,28 @@ describe("telemetry alerts", () => {
         expect(text).toBe(["**Entry rejected**", "Option Beta in Binary Test Round", "-# By <@364539598942240768>"].join("\n"));
     });
 
-    it("renders a ballot as a single sentence with mention when in server", () => {
+    it("renders a ballot as a single sentence", () => {
         const { text } = only({
             type: NotificationType.BallotSubmitted,
             occurredAt,
             round,
             voter,
+            picks: [{ id: "b1f3d5c7-1b2e-4c3d-8e9f-0a1b2c3d4e5f", title: "Option Alpha" }],
             isChange: false
         });
-        expect(text).toBe(["**Vote in Binary Test Round**", "<@215537065863938049> cast a ballot."].join("\n"));
+        expect(text).toBe(["**Vote in Binary Test Round**", "<@215537065863938049> voted for Option Alpha"].join("\n"));
     });
 
-    it("renders a ballot with plain name when voter is not in server", () => {
-        const rendered = renderNotification(
-            {
-                type: NotificationType.BallotSubmitted,
-                occurredAt,
-                round,
-                voter,
-                isChange: false
-            },
-            { ...context, isMember: () => false }
-        );
-        expect(rendered).toHaveLength(1);
-        const first = rendered[0];
-        if (first === undefined) {
-            throw new Error("nothing rendered");
-        }
-        expect(texts(first.message).join("\n")).toBe(["**Vote in Binary Test Round**", "TestVoterBL cast a ballot."].join("\n"));
-    });
-
-    it("renders changed votes without revealing individual picks", () => {
+    it("renders ranked ballots and changed votes", () => {
         const { text } = only({
             type: NotificationType.BallotSubmitted,
             occurredAt,
             round: { ...round, pollType: PollType.RankedChoice },
             voter,
+            picks: ["A", "B", "C"].map((title, index) => ({ id: `b1f3d5c7-1b2e-4c3d-8e9f-0a1b2c3d4e5${index}`, title })),
             isChange: true
         });
-        expect(text).toBe(["**Vote in Binary Test Round**", "<@215537065863938049> updated their ballot."].join("\n"));
-        expect(text).not.toMatch(/rank|pick|option|entry/iu);
+        expect(text).toContain("changed their ranking to 1. A  2. B  3. C");
     });
 
     it("renders a ban with actor and reason", () => {
@@ -152,20 +131,6 @@ describe("telemetry alerts", () => {
         );
     });
 
-    it("renders user role updates", () => {
-        const { text } = only({
-            type: NotificationType.UserRoleChanged,
-            occurredAt,
-            user: voter,
-            role: Role.Contributor,
-            specialties: [Specialty.Animator, Specialty.Rigger],
-            actor: admin
-        });
-        expect(text).toBe(
-            ["**User role updated**", "<@215537065863938049> is now contributor (animator, rigger), by <@212401207694721024>"].join("\n")
-        );
-    });
-
     it("omits empty reasons instead of printing placeholders", () => {
         const { text } = only({ type: NotificationType.BallotBlocked, occurredAt, round, voter, reason: null });
         expect(text).not.toMatch(/reason|no reason|n\/a/iu);
@@ -190,25 +155,6 @@ describe("telemetry alerts", () => {
         );
     });
 
-    it("renders AI detection telemetry alerts", () => {
-        const { purpose, text } = only({
-            type: NotificationType.MediaFlaggedAi,
-            occurredAt,
-            mediaKind: "entry",
-            targetId: "a0f3d5c7-1b2e-4c3d-8e9f-0a1b2c3d4e5f",
-            title: "Option Beta",
-            author: voter,
-            flags: ["Stable Diffusion generation parameters", "Negative prompt parameter"],
-            snippet: "A high quality render of a staircase"
-        });
-        expect(purpose).toBe(ChannelPurpose.Telemetry);
-        expect(text).toContain("**AI signatures detected:** Round Entry \"Option Beta\"");
-        expect(text).toContain("<@215537065863938049>");
-        expect(text).toContain("• Stable Diffusion generation parameters");
-        expect(text).toContain("• Negative prompt parameter");
-        expect(text).toContain("> A high quality render of a staircase");
-    });
-
     it("never lets user content ping or inject markdown", () => {
         const { text, payload } = only({
             type: NotificationType.EntrySubmitted,
@@ -225,18 +171,10 @@ describe("telemetry alerts", () => {
 
 describe("every notification", () => {
     const samples: PlatformNotification[] = [
-        { type: NotificationType.BallotSubmitted, occurredAt, round, voter, isChange: false },
+        { type: NotificationType.BallotSubmitted, occurredAt, round, voter, picks: [{ id: shot.id, title: "A" }], isChange: false },
         { type: NotificationType.BallotBlocked, occurredAt, round, voter, reason: null },
         { type: NotificationType.UserBlacklisted, occurredAt, user: voter, actor: admin, reason: null },
         { type: NotificationType.UserReinstated, occurredAt, user: voter, actor: admin },
-        {
-            type: NotificationType.UserRoleChanged,
-            occurredAt,
-            user: voter,
-            role: Role.Contributor,
-            specialties: [Specialty.Animator],
-            actor: admin
-        },
         { type: NotificationType.ContributorPromoted, occurredAt, user: voter, actor: admin },
         {
             type: NotificationType.RaidAlert,
@@ -249,10 +187,7 @@ describe("every notification", () => {
             quarantined: false
         },
         { type: NotificationType.RoundCreated, occurredAt, round, actor: admin, opensAt: null, closesAt: occurredAt },
-        { type: NotificationType.RoundUpdated, occurredAt, round, actor: admin, opensAt: null, closesAt: occurredAt },
-        { type: NotificationType.RoundDeleted, occurredAt, round, actor: admin },
-        { type: NotificationType.RoundStatusChanged, occurredAt, round, from: RoundStatus.Draft, to: RoundStatus.Open, actor: admin },
-        { type: NotificationType.RoundStatusChanged, occurredAt, round, from: RoundStatus.Open, to: RoundStatus.Voting, actor: admin },
+        { type: NotificationType.RoundStatusChanged, occurredAt, round, from: RoundStatus.Closed, to: RoundStatus.Open, actor: admin },
         {
             type: NotificationType.RoundFinalized,
             occurredAt,
@@ -269,20 +204,6 @@ describe("every notification", () => {
             status: EntryStatus.Approved,
             author: voter
         },
-        {
-            type: NotificationType.EntryUpdated,
-            occurredAt,
-            round,
-            entry: { id: shot.id, title: "A" },
-            actor: admin
-        },
-        {
-            type: NotificationType.EntryDeleted,
-            occurredAt,
-            round,
-            entry: { id: shot.id, title: "A" },
-            actor: admin
-        },
         {
             type: NotificationType.EntryStatusChanged,
             occurredAt,
@@ -318,43 +239,6 @@ describe("every notification", () => {
             contributor: voter,
             reviewer: supervisor,
             notes: null
-        },
-        {
-            type: NotificationType.PipelineUpdated,
-            occurredAt,
-            stepId: "1.1",
-            stepTitle: "Art Style",
-            phaseNumber: 1,
-            phaseTitle: "Phase 1: Animatic",
-            progressPercent: 18,
-            isPhaseTransition: true,
-            actor: supervisor
-        },
-        {
-            type: NotificationType.MediaFlaggedAi,
-            occurredAt,
-            mediaKind: "entry",
-            targetId: shot.id,
-            title: "Option Alpha",
-            author: voter,
-            flags: ["Stable Diffusion generation parameters"],
-            snippet: "A detailed 3d render"
-        },
-        {
-            type: NotificationType.DocumentUpdated,
-            occurredAt,
-            slug: DocumentSlug.Guidelines,
-            revision: 4,
-            title: "Community Guidelines & Invariants",
-            sections: [
-                {
-                    id: "voting-math",
-                    title: "Voting Math",
-                    html: "
    3-2-1 Borda count with 6 * N invariant.
    "
-                }
-            ],
-            actor: admin,
-            note: "Updated Borda point conservation invariants"
         }
     ];
 
@@ -376,111 +260,10 @@ describe("every notification", () => {
     });
 
     it("announces winners publicly", () => {
-        const sample = samples.find((s) => s.type === NotificationType.RoundFinalized);
-        expect(sample).toBeDefined();
-        const [rendered] = renderNotification(sample as PlatformNotification, context);
+        const [rendered] = renderNotification(samples[8] as PlatformNotification, context);
         expect(rendered?.purpose).toBe(ChannelPurpose.Announcements);
         expect(texts(rendered?.message as V2Message).join("\n")).toContain("**Option Alpha** wins with 62.5% of the vote.");
     });
-
-    it("announces when a round is opened for submissions and voting", () => {
-        const votingSample = samples.find(
-            (s) => s.type === NotificationType.RoundStatusChanged && s.to === RoundStatus.Voting
-        );
-        expect(votingSample).toBeDefined();
-        const votingRendered = renderNotification(votingSample as PlatformNotification, context);
-        expect(votingRendered).toHaveLength(2);
-        const votingAnnouncement = votingRendered.find((r) => r.purpose === ChannelPurpose.Announcements);
-        expect(votingAnnouncement).toBeDefined();
-        expect(texts((votingAnnouncement as RenderedNotification).message).join("\n")).toContain("## Voting is now open for Binary Test Round!");
-
-        const openSample = samples.find(
-            (s) => s.type === NotificationType.RoundStatusChanged && s.to === RoundStatus.Open
-        );
-        expect(openSample).toBeDefined();
-        const openRendered = renderNotification(openSample as PlatformNotification, context);
-        expect(openRendered).toHaveLength(2);
-        const openAnnouncement = openRendered.find((r) => r.purpose === ChannelPurpose.Announcements);
-        expect(openAnnouncement).toBeDefined();
-        expect(texts((openAnnouncement as RenderedNotification).message).join("\n")).toContain("## Submissions are now open for Binary Test Round!");
-    });
-
-    it("announces phase unlocks and step progress to announcements channel", () => {
-        const phaseUnlock = only({
-            type: NotificationType.PipelineUpdated,
-            occurredAt,
-            stepId: "2.1",
-            stepTitle: "3D Modelling",
-            phaseNumber: 2,
-            phaseTitle: "Phase 2: LookDev",
-            progressPercent: 36,
-            isPhaseTransition: true,
-            actor: supervisor
-        });
-        expect(phaseUnlock.purpose).toBe(ChannelPurpose.Announcements);
-        expect(phaseUnlock.text).toContain("## Phase 2 Unlocked: Phase 2: LookDev");
-        expect(phaseUnlock.text).toContain("3D Modelling");
-        expect(phaseUnlock.text).toContain("36% overall completed");
-
-        const stepProgress = only({
-            type: NotificationType.PipelineUpdated,
-            occurredAt,
-            stepId: "2.2",
-            stepTitle: "Rigging and Deformation",
-            phaseNumber: 2,
-            phaseTitle: "Phase 2: LookDev",
-            progressPercent: 41,
-            isPhaseTransition: false,
-            actor: supervisor
-        });
-        expect(stepProgress.purpose).toBe(ChannelPurpose.Announcements);
-        expect(stepProgress.text).toContain("Rigging and Deformation");
-        expect(stepProgress.text).toContain("Phase 2: LookDev");
-        expect(stepProgress.text).toContain("41% completed");
-    });
-
-    it("shows entry and winner media as a components v2 gallery", () => {
-        const hasGallery = (payload: V2Message): boolean =>
-            payload.components.some((c) => ((c.toJSON() as ComponentJson).components ?? []).some((child) => child.type === 12));
-        const entry = only({
-            type: NotificationType.EntrySubmitted,
-            occurredAt,
-            round,
-            entry: { id: shot.id, title: "Hero Design", mediaUrl: "https://media.example.test/hero.png" },
-            status: EntryStatus.PendingReview,
-            author: voter
-        });
-        expect(hasGallery(entry.payload)).toBe(true);
-        expect(entry.payload).not.toHaveProperty("embeds");
-        expect(entry.text).toContain("Hero Design");
-
-        const winner = only({
-            type: NotificationType.RoundFinalized,
-            occurredAt,
-            round,
-            totalBallots: 40,
-            winner: {
-                entryId: shot.id,
-                title: "Winning Art",
-                mediaUrl: "https://media.example.test/winner.webp",
-                rawScore: 25,
-                voteSharePercentage: 62.5,
-                regularizedTotalScore: null
-            },
-            actor: admin
-        });
-        expect(hasGallery(winner.payload)).toBe(true);
-
-        const noMedia = only({
-            type: NotificationType.EntrySubmitted,
-            occurredAt,
-            round,
-            entry: { id: shot.id, title: "Text Only", mediaUrl: null },
-            status: EntryStatus.PendingReview,
-            author: voter
-        });
-        expect(hasGallery(noMedia.payload)).toBe(false);
-    });
 });
 
 describe("task views", () => {
@@ -528,40 +311,3 @@ describe("task views", () => {
         );
     });
 });
-
-describe("rules views", () => {
-    it("converts rich html tags to discord markdown", () => {
-        const html = "
    Rule one: x > 0 and two.
    • Item A
    • Item B
    ";
-        const converted = htmlToDiscordMarkdown(html);
-        expect(converted).toContain("**one**");
-        expect(converted).toContain("`x > 0`");
-        expect(converted).toContain("*two*");
-        expect(converted).toContain("• Item A");
-        expect(converted).toContain("• Item B");
-    });
-
-    it("renders dynamic rules message for single-message channel pins", () => {
-        const notification = {
-            type: NotificationType.DocumentUpdated as const,
-            occurredAt,
-            slug: DocumentSlug.Guidelines,
-            revision: 3,
-            title: "Studio Guidelines & Math",
-            sections: [
-                {
-                    id: "math",
-                    title: "Borda Count",
-                    html: "
    Points = 6 * N
    "
-                }
-            ],
-            actor: admin,
-            note: null
-        };
-        const rendered = renderRulesMessage(notification);
-        const text = texts(rendered).join("\n");
-        expect(text).toContain("# 📜 Studio Guidelines & Math");
-        expect(text).toContain("### Borda Count");
-        expect(text).toContain("Points = `6 * N`");
-        expect(text).toContain("Revision 3");
-    });
-});
diff --git a/apps/discord/test/ReminderStore.test.ts b/apps/discord/test/ReminderStore.test.ts
deleted file mode 100644
index 7de1a2b..0000000
--- a/apps/discord/test/ReminderStore.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { rmSync } from "node:fs";
-import { mkdtemp } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { ReminderStore } from "../src/State/ReminderStore.js";
-
-describe("ReminderStore", () => {
-    let dir: string;
-    let store: ReminderStore;
-
-    beforeEach(async () => {
-        dir = await mkdtemp(join(tmpdir(), "reminder-test-"));
-        store = new ReminderStore(dir);
-        await store.load();
-    });
-
-    afterEach(async () => {
-        await store.flush();
-        rmSync(dir, { recursive: true, force: true });
-    });
-
-    it("starts empty", () => {
-        expect(store.forUser("u1")).toEqual([]);
-        expect(store.size).toBe(0);
-    });
-
-    it("adds and retrieves reminders", () => {
-        const r = store.add("u1", "test reminder", new Date("2025-12-01T00:00:00Z"));
-        expect(r.userId).toBe("u1");
-        expect(r.message).toBe("test reminder");
-        expect(store.forUser("u1")).toHaveLength(1);
-    });
-
-    it("scopes reminders to users", () => {
-        store.add("u1", "for u1", new Date("2025-12-01T00:00:00Z"));
-        store.add("u2", "for u2", new Date("2025-12-01T00:00:00Z"));
-        expect(store.forUser("u1")).toHaveLength(1);
-        expect(store.forUser("u2")).toHaveLength(1);
-    });
-
-    it("enforces 10-reminder cap per user", () => {
-        for (let i = 0; i < 10; i++) {
-            store.add("u1", `reminder ${i}`, new Date(Date.now() + (i + 1) * 60_000));
-        }
-        expect(() => store.add("u1", "one too many", new Date(Date.now() + 999_999))).toThrow("10 active reminders");
-    });
-
-    it("cap is per-user, not global", () => {
-        for (let i = 0; i < 10; i++) {
-            store.add("u1", `reminder ${i}`, new Date(Date.now() + (i + 1) * 60_000));
-        }
-        // u2 should still be fine
-        expect(() => store.add("u2", "u2 reminder", new Date(Date.now() + 60_000))).not.toThrow();
-    });
-
-    it("removes by id scoped to user", () => {
-        const r = store.add("u1", "to cancel", new Date("2025-12-01T00:00:00Z"));
-        // different user can't remove it
-        expect(store.remove(r.id, "u2")).toBe(false);
-        expect(store.forUser("u1")).toHaveLength(1);
-        // owner can
-        expect(store.remove(r.id, "u1")).toBe(true);
-        expect(store.forUser("u1")).toHaveLength(0);
-    });
-
-    it("drains expired reminders", () => {
-        const past = new Date(Date.now() - 60_000);
-        const future = new Date(Date.now() + 3_600_000);
-        store.add("u1", "expired", past);
-        store.add("u1", "still active", future);
-
-        const fired = store.drain();
-        expect(fired).toHaveLength(1);
-        expect(fired[0]!.message).toBe("expired");
-        expect(store.forUser("u1")).toHaveLength(1);
-        expect(store.forUser("u1")[0]!.message).toBe("still active");
-    });
-
-    it("returns next fire time", () => {
-        const t1 = new Date("2025-12-01T00:00:00Z");
-        const t2 = new Date("2025-11-01T00:00:00Z");
-        store.add("u1", "later", t1);
-        store.add("u1", "earlier", t2);
-        expect(store.nextFireAt()?.getTime()).toBe(t2.getTime());
-    });
-
-    it("returns null nextFireAt when empty", () => {
-        expect(store.nextFireAt()).toBeNull();
-    });
-
-    it("persists across loads", async () => {
-        store.add("u1", "persistent", new Date("2025-12-01T00:00:00Z"));
-        // small delay to let async write settle
-        await new Promise((r) => setTimeout(r, 100));
-
-        const store2 = new ReminderStore(dir);
-        await store2.load();
-        expect(store2.forUser("u1")).toHaveLength(1);
-        expect(store2.forUser("u1")[0]!.message).toBe("persistent");
-    });
-
-    it("sorts by fire time", () => {
-        store.add("u1", "third", new Date("2025-12-03T00:00:00Z"));
-        store.add("u1", "first", new Date("2025-12-01T00:00:00Z"));
-        store.add("u1", "second", new Date("2025-12-02T00:00:00Z"));
-        const list = store.forUser("u1");
-        expect(list.map((r) => r.message)).toEqual(["first", "second", "third"]);
-    });
-});
diff --git a/apps/discord/test/RoleReconciliation.test.ts b/apps/discord/test/RoleReconciliation.test.ts
deleted file mode 100644
index 3c68109..0000000
--- a/apps/discord/test/RoleReconciliation.test.ts
+++ /dev/null
@@ -1,306 +0,0 @@
-import { Role, Specialty } from "@platform/contracts";
-import type { Client, Collection, Guild, GuildMember, Role as DiscordRole, TextChannel } from "discord.js";
-import type { Logger } from "pino";
-import { describe, expect, it, vi } from "vitest";
-import type { PlatformApiClient } from "../src/Api/PlatformApiClient.js";
-import { RoleReconciliationService } from "../src/Services/RoleReconciliationService.js";
-import { getNextScheduledSyncDate } from "../src/Services/RoleSyncScheduler.js";
-import type { ServerProvisioner } from "../src/Services/ServerProvisioner.js";
-import { syncMemberStudioRoles } from "../src/Services/StudioRoles.js";
-import { ChannelPurpose, type SettingsStore } from "../src/State/SettingsStore.js";
-
-function createMockDiscordRole(id: string, name: string): DiscordRole {
-    return { id, name } as unknown as DiscordRole;
-}
-
-function createMockMember(id: string, roleMap: Map, guildRoles: Map): {
-    member: GuildMember;
-    added: string[];
-    removed: string[];
-} {
-    const added: string[] = [];
-    const removed: string[] = [];
-    const cache = {
-        has: (roleId: string) => roleMap.has(roleId),
-        some: (fn: (role: DiscordRole) => boolean) => Array.from(roleMap.values()).some(fn),
-        values: () => roleMap.values()
-    } as unknown as Collection;
-
-    const member = {
-        id,
-        user: { bot: false },
-        roles: {
-            cache,
-            add: vi.fn(async (ids: string | string[]) => {
-                const list = Array.isArray(ids) ? ids : [ids];
-                added.push(...list);
-                for (const rId of list) {
-                    const found = guildRoles.get(rId);
-                    if (found !== undefined) {
-                        roleMap.set(rId, found);
-                    }
-                }
-            }),
-            remove: vi.fn(async (ids: string | string[]) => {
-                const list = Array.isArray(ids) ? ids : [ids];
-                removed.push(...list);
-                for (const rId of list) {
-                    roleMap.delete(rId);
-                }
-            })
-        },
-        guild: {
-            roles: {
-                fetch: vi.fn(async () => guildRoles)
-            }
-        }
-    } as unknown as GuildMember;
-
-    return { member, added, removed };
-}
-
-describe("getNextScheduledSyncDate", () => {
-    it("schedules for coming Sunday at 03:00 UTC from a Wednesday", () => {
-        // Wednesday 2026-10-07 15:30:00 UTC
-        const from = new Date(Date.UTC(2026, 9, 7, 15, 30, 0));
-        const next = getNextScheduledSyncDate(from);
-        expect(next.toISOString()).toBe("2026-10-11T03:00:00.000Z");
-        expect(next.getUTCDay()).toBe(0);
-        expect(next.getUTCHours()).toBe(3);
-        expect(next.getUTCMinutes()).toBe(0);
-    });
-
-    it("schedules for today at 03:00 UTC if currently Sunday morning before 03:00 UTC", () => {
-        // Sunday 2026-10-11 01:15:00 UTC
-        const from = new Date(Date.UTC(2026, 9, 11, 1, 15, 0));
-        const next = getNextScheduledSyncDate(from);
-        expect(next.toISOString()).toBe("2026-10-11T03:00:00.000Z");
-    });
-
-    it("schedules for next Sunday if currently Sunday after 03:00 UTC", () => {
-        // Sunday 2026-10-11 04:00:00 UTC
-        const from = new Date(Date.UTC(2026, 9, 11, 4, 0, 0));
-        const next = getNextScheduledSyncDate(from);
-        expect(next.toISOString()).toBe("2026-10-18T03:00:00.000Z");
-    });
-
-    it("schedules for tomorrow Sunday from Saturday night", () => {
-        // Saturday 2026-10-10 23:59:00 UTC
-        const from = new Date(Date.UTC(2026, 9, 10, 23, 59, 0));
-        const next = getNextScheduledSyncDate(from);
-        expect(next.toISOString()).toBe("2026-10-11T03:00:00.000Z");
-    });
-});
-
-describe("syncMemberStudioRoles result details", () => {
-    it("reports modified = true when adding missing roles", async () => {
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")],
-            ["2", createMockDiscordRole("2", "Media Team")]
-        ]);
-        const memberRoles = new Map();
-        const { member } = createMockMember("100", memberRoles, guildRoles);
-
-        const result = await syncMemberStudioRoles(member, Role.Supervisor, [Specialty.MediaTeam]);
-        expect(result.modified).toBe(true);
-        expect(result.added).toEqual(["1", "2"]);
-        expect(result.removed).toEqual([]);
-    });
-
-    it("reports modified = false when member roles already match", async () => {
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")]
-        ]);
-        const memberRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")]
-        ]);
-        const { member } = createMockMember("100", memberRoles, guildRoles);
-
-        const result = await syncMemberStudioRoles(member, Role.Supervisor, []);
-        expect(result.modified).toBe(false);
-        expect(result.added).toEqual([]);
-        expect(result.removed).toEqual([]);
-    });
-});
-
-describe("RoleReconciliationService", () => {
-    it("reconciles drifted members and posts summary on scheduled runs with changes", async () => {
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Admin")],
-            ["2", createMockDiscordRole("2", "Animators")]
-        ]);
-
-        const memberRoles = new Map();
-        const { member } = createMockMember("111222333444555666", memberRoles, guildRoles);
-
-        const membersMap = new Map([["111222333444555666", member]]);
-        const mockGuild = {
-            id: "guild-123",
-            members: {
-                cache: membersMap,
-                fetch: vi.fn(async (id?: string) => (id === undefined ? membersMap : (membersMap.get(id) ?? null)))
-            }
-        } as unknown as Guild;
-
-        const sentMessages: unknown[] = [];
-        const mockTelemetryChannel = {
-            id: "channel-telemetry",
-            isSendable: () => true,
-            isDMBased: () => false,
-            guildId: "guild-123",
-            send: vi.fn(async (payload) => {
-                sentMessages.push(payload);
-            })
-        } as unknown as TextChannel;
-
-        const mockClient = {
-            channels: {
-                fetch: vi.fn(async (id: string) => (id === "channel-telemetry" ? mockTelemetryChannel : null))
-            }
-        } as unknown as Client;
-
-        const mockApi = {
-            listAllUsers: vi.fn(async () => [
-                {
-                    id: "user-1",
-                    discordId: "111222333444555666",
-                    role: Role.Admin,
-                    specialties: []
-                }
-            ])
-        } as unknown as PlatformApiClient;
-
-        const mockProvisioner = {
-            enforceRoleHierarchy: vi.fn(async () => 4)
-        } as unknown as ServerProvisioner;
-
-        const mockSettings = {
-            channel: (purpose: ChannelPurpose) => (purpose === ChannelPurpose.Telemetry ? "channel-telemetry" : undefined)
-        } as unknown as SettingsStore;
-
-        const mockLogger = {
-            info: vi.fn(),
-            warn: vi.fn(),
-            error: vi.fn()
-        } as unknown as Logger;
-
-        const service = new RoleReconciliationService(mockApi, mockProvisioner, mockSettings, mockClient, mockLogger);
-        const summary = await service.reconcile(mockGuild, "scheduled");
-
-        expect(summary.reorderedRoles).toBe(4);
-        expect(summary.totalUsersChecked).toBe(1);
-        expect(summary.driftedMembersSynced).toBe(1);
-        expect(summary.errors).toEqual([]);
-        expect(sentMessages.length).toBe(1);
-    });
-
-    it("strips unauthorized studio roles from unregistered Discord members", async () => {
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")],
-            ["2", createMockDiscordRole("2", "Members")]
-        ]);
-
-        const memberRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")]
-        ]);
-        const { member } = createMockMember("999888777666555444", memberRoles, guildRoles);
-
-        const membersMap = new Map([["999888777666555444", member]]);
-        const mockGuild = {
-            id: "guild-123",
-            members: {
-                cache: membersMap,
-                fetch: vi.fn(async (id?: string) => (id === undefined ? membersMap : (membersMap.get(id) ?? null)))
-            }
-        } as unknown as Guild;
-
-        const mockClient = {
-            channels: {
-                fetch: vi.fn(async () => null)
-            }
-        } as unknown as Client;
-
-        const mockApi = {
-            listAllUsers: vi.fn(async () => [])
-        } as unknown as PlatformApiClient;
-
-        const mockProvisioner = {
-            enforceRoleHierarchy: vi.fn(async () => 0)
-        } as unknown as ServerProvisioner;
-
-        const mockSettings = {
-            channel: () => undefined
-        } as unknown as SettingsStore;
-
-        const mockLogger = {
-            info: vi.fn(),
-            warn: vi.fn(),
-            error: vi.fn()
-        } as unknown as Logger;
-
-        const service = new RoleReconciliationService(mockApi, mockProvisioner, mockSettings, mockClient, mockLogger);
-        const summary = await service.reconcile(mockGuild, "manual");
-
-        expect(summary.totalUsersChecked).toBe(1);
-        expect(summary.driftedMembersSynced).toBe(1);
-        expect(memberRoles.has("1")).toBe(false);
-        expect(memberRoles.has("2")).toBe(true);
-    });
-
-    it("remains silent when scheduled reconciliation finds 0 drifts and 0 reordered roles", async () => {
-        const emptyMap = new Map();
-        const mockGuild = {
-            id: "guild-123",
-            members: {
-                cache: emptyMap,
-                fetch: vi.fn(async () => emptyMap)
-            }
-        } as unknown as Guild;
-
-        const sentMessages: unknown[] = [];
-        const mockTelemetryChannel = {
-            id: "channel-telemetry",
-            isSendable: () => true,
-            isDMBased: () => false,
-            guildId: "guild-123",
-            send: vi.fn(async (payload) => {
-                sentMessages.push(payload);
-            })
-        } as unknown as TextChannel;
-
-        const mockClient = {
-            channels: {
-                fetch: vi.fn(async () => mockTelemetryChannel)
-            }
-        } as unknown as Client;
-
-        const mockApi = {
-            listAllUsers: vi.fn(async () => [])
-        } as unknown as PlatformApiClient;
-
-        const mockProvisioner = {
-            enforceRoleHierarchy: vi.fn(async () => 0)
-        } as unknown as ServerProvisioner;
-
-        const mockSettings = {
-            channel: () => "channel-telemetry"
-        } as unknown as SettingsStore;
-
-        const mockLogger = {
-            info: vi.fn(),
-            warn: vi.fn(),
-            error: vi.fn()
-        } as unknown as Logger;
-
-        const service = new RoleReconciliationService(mockApi, mockProvisioner, mockSettings, mockClient, mockLogger);
-        const summary = await service.reconcile(mockGuild, "scheduled");
-
-        expect(summary.reorderedRoles).toBe(0);
-        expect(summary.driftedMembersSynced).toBe(0);
-        expect(sentMessages.length).toBe(0);
-        expect(mockLogger.info).toHaveBeenCalledWith(
-            expect.objectContaining({ totalUsersChecked: 0 }),
-            "scheduled role reconciliation clean, no drift detected"
-        );
-    });
-});
diff --git a/apps/discord/test/StudioRoles.test.ts b/apps/discord/test/StudioRoles.test.ts
deleted file mode 100644
index 14e29ab..0000000
--- a/apps/discord/test/StudioRoles.test.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-import { NotificationType, Role, Specialty } from "@platform/contracts";
-import type { Collection, GuildMember, Role as DiscordRole } from "discord.js";
-import { describe, expect, it, vi } from "vitest";
-import { NotificationDispatcher } from "../src/Services/NotificationDispatcher.js";
-import { ServerProvisioner } from "../src/Services/ServerProvisioner.js";
-import {
-    contributorRoleName,
-    syncMemberStudioRoles,
-    targetStudioRoleNames
-} from "../src/Services/StudioRoles.js";
-import { SettingsStore } from "../src/State/SettingsStore.js";
-
-function createMockDiscordRole(id: string, name: string): DiscordRole {
-    return { id, name } as unknown as DiscordRole;
-}
-
-function createMockMember(roleMap: Map, guildRoles: Map): {
-    member: GuildMember;
-    added: string[];
-    removed: string[];
-} {
-    const added: string[] = [];
-    const removed: string[] = [];
-    const cache = {
-        has: (id: string) => roleMap.has(id)
-    } as unknown as Collection;
-
-    const member = {
-        id: "123456789012345678",
-        roles: {
-            cache,
-            add: vi.fn(async (ids: string | string[]) => {
-                const list = Array.isArray(ids) ? ids : [ids];
-                added.push(...list);
-                for (const id of list) {
-                    const found = guildRoles.get(id);
-                    if (found !== undefined) {
-                        roleMap.set(id, found);
-                    }
-                }
-            }),
-            remove: vi.fn(async (ids: string | string[]) => {
-                const list = Array.isArray(ids) ? ids : [ids];
-                removed.push(...list);
-                for (const id of list) {
-                    roleMap.delete(id);
-                }
-            })
-        },
-        guild: {
-            roles: {
-                fetch: vi.fn(async () => guildRoles)
-            }
-        }
-    } as unknown as GuildMember;
-
-    return { member, added, removed };
-}
-
-describe("targetStudioRoleNames", () => {
-    it("returns Members for base members", () => {
-        const names = targetStudioRoleNames(Role.Member, []);
-        expect(names).toEqual(new Set(["Members"]));
-    });
-
-    it("returns Voters for verified voters", () => {
-        const names = targetStudioRoleNames(Role.Voter, []);
-        expect(names).toEqual(new Set(["Voters"]));
-    });
-
-    it("returns General Contributors plus craft specialty roles for contributors", () => {
-        const names = targetStudioRoleNames(Role.Contributor, [Specialty.Animator, Specialty.Modeler3d]);
-        expect(names).toEqual(new Set([contributorRoleName, "Animators", "3D Modelers"]));
-    });
-
-    it("returns General Contributors for senior contributors", () => {
-        const names = targetStudioRoleNames(Role.SeniorContributor, [Specialty.Rigger]);
-        expect(names).toEqual(new Set([contributorRoleName, "Riggers"]));
-    });
-
-    it("returns executive and department roles based on specialty plus base leadership roles", () => {
-        const adminNames = targetStudioRoleNames(Role.Admin, [Specialty.Producer]);
-        expect(adminNames).toEqual(new Set(["Admin", "Producer"]));
-
-        const supervisorNames = targetStudioRoleNames(Role.Supervisor, [Specialty.AnimationSupervisor]);
-        expect(supervisorNames).toEqual(new Set(["Supervisor", "Animation Supervisor"]));
-
-        const generalAdminNames = targetStudioRoleNames(Role.Admin, []);
-        expect(generalAdminNames).toEqual(new Set(["Admin"]));
-
-        const superAdminNames = targetStudioRoleNames(Role.SuperAdmin, []);
-        expect(superAdminNames).toEqual(new Set(["Admin"]));
-
-        const producerAdminNames = targetStudioRoleNames(Role.SuperAdmin, [Specialty.Producer]);
-        expect(producerAdminNames).toEqual(new Set(["Admin", "Producer"]));
-
-        const adminWithCraftSpecialty = targetStudioRoleNames(Role.Admin, [Specialty.Animator]);
-        expect(adminWithCraftSpecialty).toEqual(new Set(["Admin", "Animators"]));
-    });
-});
-
-describe("syncMemberStudioRoles", () => {
-    it("adds missing studio roles and strips obsolete ones without touching non-studio roles", async () => {
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Voters")],
-            ["2", createMockDiscordRole("2", "General Contributors")],
-            ["3", createMockDiscordRole("3", "Animators")],
-            ["4", createMockDiscordRole("4", "Riggers")],
-            ["99", createMockDiscordRole("99", "Server Booster")]
-        ]);
-
-        const heldRoles = new Map([
-            ["1", guildRoles.get("1")!],
-            ["99", guildRoles.get("99")!]
-        ]);
-
-        const { member, added, removed } = createMockMember(heldRoles, guildRoles);
-
-        await syncMemberStudioRoles(member, Role.Contributor, [Specialty.Animator]);
-
-        expect(removed).toEqual(["1"]);
-        expect(new Set(added)).toEqual(new Set(["2", "3"]));
-        expect(heldRoles.has("99")).toBe(true);
-    });
-
-    it("strips legacy Observer role and supports alias matching", async () => {
-        const guildRoles = new Map([
-            ["10", createMockDiscordRole("10", "Observer")],
-            ["20", createMockDiscordRole("20", "Supervisors")],
-            ["30", createMockDiscordRole("30", "Animator")],
-            ["99", createMockDiscordRole("99", "VIP")]
-        ]);
-
-        const heldRoles = new Map([
-            ["10", guildRoles.get("10")!],
-            ["99", guildRoles.get("99")!]
-        ]);
-
-        const { member, added, removed } = createMockMember(heldRoles, guildRoles);
-
-        await syncMemberStudioRoles(member, Role.Supervisor, [Specialty.Animator]);
-
-        expect(removed).toEqual(["10"]);
-        expect(new Set(added)).toEqual(new Set(["20", "30"]));
-        expect(heldRoles.has("99")).toBe(true);
-    });
-});
-
-describe("NotificationDispatcher moderation and role sync side effects", () => {
-    it("bans blacklisted users from the discord guild", async () => {
-        const banFn = vi.fn(async () => undefined);
-        const mockGuild = {
-            members: {
-                cache: new Map(),
-                ban: banFn,
-                fetch: vi.fn(async () => null)
-            },
-            bans: {
-                remove: vi.fn()
-            }
-        };
-        const mockClient = {
-            guilds: {
-                fetch: vi.fn(async () => mockGuild)
-            },
-            channels: {
-                fetch: vi.fn(async () => null)
-            }
-        };
-
-        const settings = new SettingsStore("/tmp/test-settings");
-        const dispatcher = new NotificationDispatcher(
-            mockClient as any,
-            "100000000000000001",
-            settings,
-            { threadFor: () => undefined } as any,
-            { warn: vi.fn(), info: vi.fn() } as any
-        );
-
-        await dispatcher.handle({
-            type: NotificationType.UserBlacklisted,
-            occurredAt: new Date().toISOString(),
-            user: { discordId: "215537065863938049", username: "badactor" },
-            actor: { discordId: "100000000000000000", username: "admin" },
-            reason: "sockpuppet abuse"
-        });
-
-        expect(banFn).toHaveBeenCalledWith("215537065863938049", { reason: "sockpuppet abuse" });
-    });
-
-    it("unbans reinstated users from the discord guild", async () => {
-        const unbanFn = vi.fn(async () => undefined);
-        const mockGuild = {
-            members: {
-                cache: new Map(),
-                ban: vi.fn(),
-                fetch: vi.fn(async () => null)
-            },
-            bans: {
-                remove: unbanFn
-            }
-        };
-        const mockClient = {
-            guilds: {
-                fetch: vi.fn(async () => mockGuild)
-            },
-            channels: {
-                fetch: vi.fn(async () => null)
-            }
-        };
-
-        const settings = new SettingsStore("/tmp/test-settings");
-        const dispatcher = new NotificationDispatcher(
-            mockClient as any,
-            "100000000000000001",
-            settings,
-            { threadFor: () => undefined } as any,
-            { warn: vi.fn(), info: vi.fn() } as any
-        );
-
-        await dispatcher.handle({
-            type: NotificationType.UserReinstated,
-            occurredAt: new Date().toISOString(),
-            user: { discordId: "215537065863938049", username: "reinstateduser" },
-            actor: { discordId: "100000000000000000", username: "admin" }
-        });
-
-        expect(unbanFn).toHaveBeenCalledWith("215537065863938049", "Reinstated on platform");
-    });
-});
-
-describe("ServerProvisioner hierarchy", () => {
-    it("sorts guild role positions from Executive down to Community", async () => {
-        const setPositionsFn = vi.fn(async (_positions: { role: string; position: number }[]) => undefined);
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Producer")],
-            ["2", createMockDiscordRole("2", "Admin")],
-            ["3", createMockDiscordRole("3", "Supervisor")],
-            ["4", createMockDiscordRole("4", "Animators")],
-            ["5", createMockDiscordRole("5", "Voters")]
-        ]);
-
-        const mockGuild = {
-            roles: {
-                fetch: vi.fn(async () => guildRoles),
-                setPositions: setPositionsFn
-            }
-        };
-
-        const settings = new SettingsStore("/tmp/test-settings-hierarchy");
-        const provisioner = new ServerProvisioner(settings, { warn: vi.fn(), info: vi.fn() } as any);
-
-        const count = await provisioner.enforceRoleHierarchy(mockGuild as any);
-        expect(count).toBe(5);
-        expect(setPositionsFn).toHaveBeenCalled();
-
-        const positions = setPositionsFn.mock.calls[0]![0] as { role: string; position: number }[];
-        const posMap = new Map(positions.map((p) => [p.role, p.position]));
-
-        // Producer > Admin > Supervisor > Animators > Voters
-        expect(posMap.get("1")!).toBeGreaterThan(posMap.get("2")!);
-        expect(posMap.get("2")!).toBeGreaterThan(posMap.get("3")!);
-        expect(posMap.get("3")!).toBeGreaterThan(posMap.get("4")!);
-        expect(posMap.get("4")!).toBeGreaterThan(posMap.get("5")!);
-    });
-
-    it("orders Media Team under Supervisor and above Animators", async () => {
-        const setPositionsFn = vi.fn(async (_positions: { role: string; position: number }[]) => undefined);
-        const guildRoles = new Map([
-            ["1", createMockDiscordRole("1", "Supervisor")],
-            ["2", createMockDiscordRole("2", "Media Team")],
-            ["3", createMockDiscordRole("3", "Animators")]
-        ]);
-
-        const mockGuild = {
-            roles: {
-                fetch: vi.fn(async () => guildRoles),
-                setPositions: setPositionsFn
-            }
-        };
-
-        const settings = new SettingsStore("/tmp/test-settings-media-hierarchy");
-        const provisioner = new ServerProvisioner(settings, { warn: vi.fn(), info: vi.fn() } as any);
-
-        await provisioner.enforceRoleHierarchy(mockGuild as any);
-        const positions = setPositionsFn.mock.calls[0]![0] as { role: string; position: number }[];
-        const posMap = new Map(positions.map((p) => [p.role, p.position]));
-
-        // supervisor > media team > animators
-        expect(posMap.get("1")!).toBeGreaterThan(posMap.get("2")!);
-        expect(posMap.get("2")!).toBeGreaterThan(posMap.get("3")!);
-    });
-});
diff --git a/apps/discord/test/TimeParser.test.ts b/apps/discord/test/TimeParser.test.ts
deleted file mode 100644
index 4b4ef32..0000000
--- a/apps/discord/test/TimeParser.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-import { parseReminderTime } from "../src/Common/TimeParser.js";
-
-describe("parseReminderTime", () => {
-    beforeEach(() => {
-        vi.useFakeTimers();
-        vi.setSystemTime(new Date("2025-06-15T12:00:00Z"));
-    });
-
-    afterEach(() => {
-        vi.useRealTimers();
-    });
-
-    it("parses minutes", () => {
-        const result = parseReminderTime("30m");
-        expect(result.getTime()).toBe(new Date("2025-06-15T12:30:00Z").getTime());
-    });
-
-    it("parses hours", () => {
-        const result = parseReminderTime("2h");
-        expect(result.getTime()).toBe(new Date("2025-06-15T14:00:00Z").getTime());
-    });
-
-    it("parses days", () => {
-        const result = parseReminderTime("1d");
-        expect(result.getTime()).toBe(new Date("2025-06-16T12:00:00Z").getTime());
-    });
-
-    it("parses weeks", () => {
-        const result = parseReminderTime("1w");
-        expect(result.getTime()).toBe(new Date("2025-06-22T12:00:00Z").getTime());
-    });
-
-    it("parses combined durations", () => {
-        const result = parseReminderTime("1d12h");
-        expect(result.getTime()).toBe(new Date("2025-06-17T00:00:00Z").getTime());
-    });
-
-    it("parses with spaces", () => {
-        const result = parseReminderTime("1d 6h 30m");
-        expect(result.getTime()).toBe(new Date("2025-06-16T18:30:00Z").getTime());
-    });
-
-    it("is case insensitive", () => {
-        const result = parseReminderTime("2H");
-        expect(result.getTime()).toBe(new Date("2025-06-15T14:00:00Z").getTime());
-    });
-
-    it("parses absolute timestamps", () => {
-        const result = parseReminderTime("2025-07-01 14:00");
-        expect(result.toISOString()).toBe("2025-07-01T14:00:00.000Z");
-    });
-
-    it("rejects durations under 1 minute", () => {
-        expect(() => parseReminderTime("30s")).toThrow("at least 1 minute");
-    });
-
-    it("rejects durations over 90 days", () => {
-        expect(() => parseReminderTime("100d")).toThrow("at most 90 days");
-    });
-
-    it("rejects garbage input", () => {
-        expect(() => parseReminderTime("next tuesday")).toThrow("Couldn't parse");
-    });
-
-    it("rejects past absolute timestamps", () => {
-        expect(() => parseReminderTime("2020-01-01 00:00")).toThrow("past");
-    });
-});
diff --git a/apps/web/components.json b/apps/web/components.json
deleted file mode 100644
index abdfcbc..0000000
--- a/apps/web/components.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://ui.shadcn.com/schema.json",
-    "style": "new-york",
-    "rsc": true,
-    "tsx": true,
-    "tailwind": { "config": "", "css": "src/app/globals.css", "baseColor": "neutral", "cssVariables": true, "prefix": "" },
-    "iconLibrary": "lucide",
-    "aliases": { "components": "@/Components", "utils": "@/Lib/Utils", "ui": "@/Components/Ui", "lib": "@/Lib", "hooks": "@/Hooks" }
-}
diff --git a/apps/web/eslint.config.mjs b/apps/web/eslint.config.mjs
deleted file mode 100644
index 0c64b9d..0000000
--- a/apps/web/eslint.config.mjs
+++ /dev/null
@@ -1,33 +0,0 @@
-import nextVitals from "eslint-config-next/core-web-vitals";
-import nextTypeScript from "eslint-config-next/typescript";
-import tseslint from "typescript-eslint";
-
-export default tseslint.config(
-    { ignores: [".next/**", "node_modules/**", "next-env.d.ts", "src/Components/Ui/**", "*.config.*", "eslint.config.mjs"] },
-    ...nextVitals,
-    ...nextTypeScript,
-    ...tseslint.configs.strictTypeChecked,
-    ...tseslint.configs.stylisticTypeChecked,
-    {
-        settings: { react: { version: "19.3" } },
-        languageOptions: {
-            parserOptions: {
-                projectService: true,
-                tsconfigRootDir: import.meta.dirname
-            }
-        },
-        rules: {
-            "@typescript-eslint/explicit-function-return-type": ["error", { allowExpressions: true, allowTypedFunctionExpressions: true }],
-            "@typescript-eslint/consistent-type-imports": ["error", { fixStyle: "inline-type-imports" }],
-            "@typescript-eslint/no-floating-promises": "error",
-            "@typescript-eslint/require-await": "off",
-            "@typescript-eslint/restrict-template-expressions": ["error", { allowNumber: true }],
-            "@typescript-eslint/no-non-null-assertion": "error",
-            "@typescript-eslint/non-nullable-type-assertion-style": "off",
-            "@next/next/no-img-element": "off",
-            eqeqeq: ["error", "always"],
-            "no-console": "error",
-            curly: ["error", "all"]
-        }
-    }
-);
diff --git a/apps/web/next.config.ts b/apps/web/next.config.ts
deleted file mode 100644
index 7c4ac59..0000000
--- a/apps/web/next.config.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { fileURLToPath } from "node:url";
-import type { NextConfig } from "next";
-
-const securityHeaders = [
-    { key: "Strict-Transport-Security", value: "max-age=63072000; includeSubDomains" },
-    { key: "X-Content-Type-Options", value: "nosniff" },
-    { key: "X-Frame-Options", value: "DENY" },
-    { key: "Referrer-Policy", value: "strict-origin-when-cross-origin" },
-    { key: "Cross-Origin-Opener-Policy", value: "same-origin" },
-    { key: "Cross-Origin-Resource-Policy", value: "same-origin" },
-    { key: "Permissions-Policy", value: "camera=(), microphone=(), geolocation=(), payment=(), usb=(), interest-cohort=()" }
-];
-
-const nextConfig: NextConfig = {
-    output: "standalone",
-    outputFileTracingRoot: fileURLToPath(new URL("../..", import.meta.url)),
-    poweredByHeader: false,
-    reactStrictMode: true,
-    typedRoutes: true,
-    images: { unoptimized: true },
-    async redirects() {
-        return [
-            { source: "/admin", destination: "/studio", permanent: false },
-            { source: "/docs", destination: "/guidelines", permanent: false },
-            { source: "/progress", destination: "/roadmap", permanent: false }
-        ];
-    },
-    async headers() {
-        return [{ source: "/:path*", headers: securityHeaders }];
-    }
-};
-
-export default nextConfig;
diff --git a/apps/web/package.json b/apps/web/package.json
deleted file mode 100644
index a9d9c0b..0000000
--- a/apps/web/package.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "name": "@platform/web",
-    "version": "2.0.0",
-    "private": true,
-    "license": "AGPL-3.0-only",
-    "type": "module",
-    "scripts": {
-        "dev": "next dev",
-        "build": "next build",
-        "start": "next start",
-        "lint": "next typegen && eslint .",
-        "typecheck": "next typegen && tsc --noEmit"
-    },
-    "dependencies": {
-        "@platform/contracts": "2.0.0",
-        "@tanstack/react-query": "^5.104.0",
-        "@tiptap/extension-table": "^3.31.4",
-        "@tiptap/extensions": "^3.31.4",
-        "@tiptap/markdown": "^3.31.4",
-        "@tiptap/pm": "^3.31.3",
-        "@tiptap/react": "^3.31.4",
-        "@tiptap/starter-kit": "^3.31.4",
-        "class-variance-authority": "^0.7.1",
-        "clsx": "^2.1.1",
-        "cmdk": "^1.1.1",
-        "lucide-react": "^1.49.0",
-        "next": "^16.3.8",
-        "next-themes": "^0.4.6",
-        "radix-ui": "^1.6.7",
-        "react": "^19.3.0",
-        "react-dom": "^19.3.0",
-        "react-markdown": "^10.1.0",
-        "remark-gfm": "^4.0.1",
-        "server-only": "^0.0.1",
-        "sonner": "^2.0.8",
-        "tailwind-merge": "^3.7.0",
-        "zod": "^4.6.5"
-    },
-    "devDependencies": {
-        "@tailwindcss/postcss": "^4.3.3",
-        "@types/react": "^19.3.0",
-        "@types/react-dom": "^19.3.0",
-        "eslint-config-next": "^16.3.6",
-        "tailwindcss": "^4.3.3",
-        "tw-animate-css": "^1.4.0"
-    }
-}
diff --git a/apps/web/postcss.config.mjs b/apps/web/postcss.config.mjs
deleted file mode 100644
index a9b5c43..0000000
--- a/apps/web/postcss.config.mjs
+++ /dev/null
@@ -1 +0,0 @@
-export default { plugins: { "@tailwindcss/postcss": {} } };
diff --git a/apps/web/public/branding/project-stairway-what-is-it.png b/apps/web/public/branding/project-stairway-what-is-it.png
deleted file mode 100644
index 0eda957dccc199f2781379cca341be48eb343c3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91772
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�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
KGF2bUzW)z!koYzL

diff --git a/apps/web/src/Api/ApiClient.ts b/apps/web/src/Api/ApiClient.ts
deleted file mode 100644
index e46fbf1..0000000
--- a/apps/web/src/Api/ApiClient.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { problemSchema } from "@platform/contracts";
-import type { z } from "zod";
-
-export interface FieldError {
-    readonly path: string | undefined;
-    readonly message: string;
-}
-
-export class ApiError extends Error {
-    public constructor(
-        public readonly status: number,
-        public readonly code: string,
-        message: string,
-        public readonly fieldErrors: readonly FieldError[] = []
-    ) {
-        super(message);
-        this.name = "ApiError";
-    }
-}
-
-export type QueryValue = string | number | boolean | null | undefined;
-
-export interface RequestOptions {
-    readonly method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-    readonly body?: unknown;
-    readonly query?: Readonly>;
-    readonly signal?: AbortSignal;
-}
-
-export function buildQuery(query: Readonly> | undefined): string {
-    if (query === undefined) {
-        return "";
-    }
-    const params = new URLSearchParams();
-    for (const [key, value] of Object.entries(query)) {
-        if (value !== null && value !== undefined && value !== "") {
-            params.set(key, String(value));
-        }
-    }
-    const serialized = params.toString();
-    return serialized.length === 0 ? "" : `?${serialized}`;
-}
-
-async function toApiError(response: Response): Promise {
-    const payload: unknown = await response.json().catch(() => null);
-    const problem = problemSchema.partial().safeParse(payload);
-    if (problem.success && typeof problem.data.detail === "string") {
-        return new ApiError(
-            response.status,
-            problem.data.code ?? "UNKNOWN",
-            problem.data.detail,
-            (problem.data.errors ?? []).map((error) => ({ path: error.path, message: error.message }))
-        );
-    }
-    return new ApiError(response.status, "UNKNOWN", `The request failed with status ${response.status}.`);
-}
-
-export async function sendRequest(path: string, options: RequestOptions = {}): Promise {
-    const headers: Record = { Accept: "application/json" };
-    let body: string | undefined;
-    if (options.body !== undefined) {
-        headers["Content-Type"] = "application/json";
-        body = JSON.stringify(options.body);
-    }
-    let response: Response;
-    try {
-        response = await fetch(`/api/v1${path}${buildQuery(options.query)}`, {
-            method: options.method ?? "GET",
-            headers,
-            body,
-            credentials: "same-origin",
-            cache: "no-store",
-            signal: options.signal
-        });
-    } catch (error: unknown) {
-        if (error instanceof DOMException && error.name === "AbortError") {
-            throw error;
-        }
-        throw new ApiError(0, "NETWORK_ERROR", "Could not reach the server. Check your connection.");
-    }
-    if (!response.ok) {
-        throw await toApiError(response);
-    }
-    return response;
-}
-
-export async function request(
-    path: string,
-    schema: TSchema,
-    options: RequestOptions = {}
-): Promise> {
-    const response = await sendRequest(path, options);
-    const payload: unknown = await response.json().catch(() => null);
-    const parsed = schema.safeParse(payload);
-    if (!parsed.success) {
-        throw new ApiError(response.status, "INVALID_RESPONSE", "The server sent an unexpected response.");
-    }
-    return parsed.data;
-}
-
-export async function requestNoContent(path: string, options: RequestOptions = {}): Promise {
-    const response = await sendRequest(path, options);
-    await response.body?.cancel();
-}
-
-export function describeError(error: unknown): string {
-    if (error instanceof ApiError) {
-        return error.message;
-    }
-    return "Something went wrong. Try again.";
-}
diff --git a/apps/web/src/Api/PlatformApi.ts b/apps/web/src/Api/PlatformApi.ts
deleted file mode 100644
index 37e8a73..0000000
--- a/apps/web/src/Api/PlatformApi.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-import {
-    ballotSchema,
-    PresenceStatus,
-    shotThreadMapSchema,
-    dataEnvelope,
-    documentRevisionSchema,
-    documentRevisionSummarySchema,
-    documentSchema,
-    legalAcceptanceSchema,
-    emailVerificationSchema,
-    entrySchema,
-    leaderboardSchema,
-    ledgerBallotSchema,
-    moderatedUserSchema,
-    pageEnvelope,
-    pipelineProgressSchema,
-    presignedUploadSchema,
-    raidTelemetrySchema,
-    reclaimResultSchema,
-    reviewQueueItemSchema,
-    roundDetailSchema,
-    roundResultSchema,
-    roundSchema,
-    shotDetailSchema,
-    shotSchema,
-    specialtyHoldersSchema,
-    submissionSchema,
-    userSchema,
-    type SpecialtyHolderDto,
-    type BallotDto,
-    type DeliverableKind,
-    type DifficultyTier,
-    type DocumentDto,
-    type DocumentRevisionDto,
-    type DocumentRevisionSummaryDto,
-    type DocumentSlug,
-    type DocumentUpdateDto,
-    type EmailVerificationDto,
-    type EntryDto,
-    type EntryStatus,
-    type LeaderboardDto,
-    type LedgerBallotDto,
-    type MediaContentType,
-    type ModeratedUserDto,
-    type PaginationMeta,
-    type PipelineProgressDto,
-    type PollType,
-    type PresignedUploadDto,
-    type RaidTelemetryDto,
-    type ReclaimResultDto,
-    type ReviewDecision,
-    type ReviewQueueItemDto,
-    type Role,
-    type RoundDetailDto,
-    type RoundDto,
-    type RoundResultDto,
-    type RoundStatus,
-    type ShotDetailDto,
-    type ShotDto,
-    type ShotStatus,
-    type Specialty,
-    type SubmissionDto,
-    type ShotThreadMapDto,
-    type UserDto
-} from "@platform/contracts";
-import { z } from "zod";
-import { request, requestNoContent } from "./ApiClient";
-
-export interface Page {
-    readonly data: T[];
-    readonly meta: PaginationMeta;
-}
-
-export interface PageQuery {
-    readonly page?: number;
-    readonly perPage?: number;
-}
-
-export interface BinaryChoiceInput {
-    readonly title: string;
-    readonly description?: string | null;
-    readonly mediaKey?: string | null;
-}
-
-export interface BinaryChoiceUpdateInput {
-    readonly id?: string;
-    readonly title: string;
-    readonly description?: string | null;
-    readonly mediaKey?: string | null;
-}
-
-export interface CreateRoundInput {
-    readonly title: string;
-    readonly pollType: PollType;
-    readonly opensAt: string | null;
-    readonly closesAt: string | null;
-    readonly binaryEntries?: readonly [BinaryChoiceInput, BinaryChoiceInput];
-}
-
-export interface UpdateRoundInput {
-    readonly title?: string;
-    readonly pollType?: PollType;
-    readonly status?: RoundStatus;
-    readonly opensAt?: string | null;
-    readonly closesAt?: string | null;
-    readonly binaryEntries?: readonly [BinaryChoiceUpdateInput, BinaryChoiceUpdateInput];
-}
-
-export interface EntryInput {
-    readonly title: string;
-    readonly description: string | null;
-    readonly mediaKey: string | null;
-}
-
-export interface UpdateEntryInput {
-    readonly title?: string;
-    readonly description?: string | null;
-    readonly mediaKey?: string | null;
-}
-
-export type UpdateShotInput = Partial>;
-
-export interface CreateShotInput {
-    readonly roundId: string | null;
-    readonly sceneNumber: number;
-    readonly shotCode: string;
-    readonly title: string;
-    readonly description: string | null;
-    readonly difficultyTier: DifficultyTier;
-    readonly seniorPriorityHours: number;
-    readonly imageKeys?: readonly string[];
-}
-
-export interface ShotQuery extends PageQuery {
-    readonly status?: ShotStatus;
-    readonly difficultyTier?: DifficultyTier;
-    readonly sceneNumber?: number;
-}
-
-export interface SubmitWorkInput {
-    readonly videoKey: string;
-    readonly blendKey: string;
-    readonly notes: string | null;
-}
-
-export interface DeliverableUploadInput {
-    readonly kind: DeliverableKind;
-    readonly fileName: string;
-    readonly contentType: string;
-    readonly sizeBytes: number;
-}
-
-export type PipelineUpdateInput = Omit;
-
-function segment(value: string): string {
-    return encodeURIComponent(value);
-}
-
-export class PlatformApi {
-    public async pipeline(): Promise {
-        return (await request("/pipeline", dataEnvelope(pipelineProgressSchema))).data;
-    }
-
-    public async updatePipeline(input: PipelineUpdateInput): Promise {
-        return (await request("/pipeline/progress", dataEnvelope(pipelineProgressSchema), { method: "POST", body: input })).data;
-    }
-
-    public async rounds(query: PageQuery & { readonly status?: RoundStatus }): Promise> {
-        return request("/rounds", pageEnvelope(roundSchema), { query: { ...query } });
-    }
-
-    public async round(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}`, dataEnvelope(roundDetailSchema))).data;
-    }
-
-    public async createRound(input: CreateRoundInput): Promise {
-        return (await request("/rounds", dataEnvelope(roundSchema), { method: "POST", body: input })).data;
-    }
-
-    public async updateRound(roundId: string, input: UpdateRoundInput): Promise {
-        return (await request(`/rounds/${segment(roundId)}`, dataEnvelope(roundSchema), { method: "PATCH", body: input })).data;
-    }
-
-    public async deleteRound(roundId: string): Promise {
-        await requestNoContent(`/rounds/${segment(roundId)}`, { method: "DELETE" });
-    }
-
-    public async finalizeRound(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/finalize`, dataEnvelope(roundResultSchema), { method: "POST" })).data;
-    }
-
-    public async leaderboard(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/leaderboard`, dataEnvelope(leaderboardSchema))).data;
-    }
-
-    public async results(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/results`, dataEnvelope(roundResultSchema))).data;
-    }
-
-    public async entries(roundId: string, query: PageQuery & { readonly status?: EntryStatus }): Promise> {
-        return request(`/rounds/${segment(roundId)}/entries`, pageEnvelope(entrySchema), { query: { ...query } });
-    }
-
-    public async createEntry(roundId: string, input: EntryInput): Promise {
-        return (await request(`/rounds/${segment(roundId)}/entries`, dataEnvelope(entrySchema), { method: "POST", body: input })).data;
-    }
-
-    public async entry(roundId: string, entryId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/entries/${segment(entryId)}`, dataEnvelope(entrySchema))).data;
-    }
-
-    public async updateEntry(roundId: string, entryId: string, input: UpdateEntryInput): Promise {
-        const path = `/rounds/${segment(roundId)}/entries/${segment(entryId)}`;
-        return (await request(path, dataEnvelope(entrySchema), { method: "PATCH", body: input })).data;
-    }
-
-    public async reviewEntry(roundId: string, entryId: string, status: EntryStatus): Promise {
-        const path = `/rounds/${segment(roundId)}/entries/${segment(entryId)}/status`;
-        return (await request(path, dataEnvelope(entrySchema), { method: "PATCH", body: { status } })).data;
-    }
-
-    public async reinstateEntry(roundId: string, entryId: string): Promise {
-        const path = `/rounds/${segment(roundId)}/entries/${segment(entryId)}/reinstate`;
-        return (await request(path, dataEnvelope(entrySchema), { method: "POST" })).data;
-    }
-
-    public async deleteEntry(roundId: string, entryId: string): Promise {
-        await requestNoContent(`/rounds/${segment(roundId)}/entries/${segment(entryId)}`, { method: "DELETE" });
-    }
-
-    public async myBallot(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/ballots/me`, dataEnvelope(ballotSchema))).data;
-    }
-
-    public async myEntries(): Promise {
-        return (await request("/users/me/entries", dataEnvelope(z.array(entrySchema)))).data;
-    }
-
-    public async castBallot(roundId: string, picks: readonly string[]): Promise {
-        return (await request(`/rounds/${segment(roundId)}/ballots/me`, dataEnvelope(ballotSchema), { method: "PUT", body: { picks } }))
-            .data;
-    }
-
-    public async ledger(roundId: string, query: PageQuery): Promise> {
-        return request(`/rounds/${segment(roundId)}/ballots`, pageEnvelope(ledgerBallotSchema), { query: { ...query } });
-    }
-
-    public async requestMediaUpload(contentType: MediaContentType, sizeBytes: number): Promise {
-        return (await request("/uploads/media", dataEnvelope(presignedUploadSchema), { method: "POST", body: { contentType, sizeBytes } }))
-            .data;
-    }
-
-    public async shots(query: ShotQuery): Promise> {
-        return request("/shots", pageEnvelope(shotSchema), { query: { ...query } });
-    }
-
-    public async shot(shotId: string): Promise {
-        return (await request(`/shots/${segment(shotId)}`, dataEnvelope(shotDetailSchema))).data;
-    }
-
-    public async createShot(input: CreateShotInput): Promise {
-        return (await request("/shots", dataEnvelope(shotSchema), { method: "POST", body: input })).data;
-    }
-
-    public async updateShot(shotId: string, input: UpdateShotInput): Promise {
-        return (await request(`/shots/${segment(shotId)}`, dataEnvelope(shotSchema), { method: "PATCH", body: input })).data;
-    }
-
-    public async deleteShot(shotId: string): Promise {
-        await requestNoContent(`/shots/${segment(shotId)}`, { method: "DELETE" });
-    }
-
-    public async claimShot(shotId: string): Promise {
-        return (await request(`/shots/${segment(shotId)}/claim`, dataEnvelope(shotSchema), { method: "POST" })).data;
-    }
-
-    public async releaseShot(shotId: string, reason: string | null): Promise {
-        return (await request(`/shots/${segment(shotId)}/release`, dataEnvelope(shotSchema), { method: "POST", body: { reason } })).data;
-    }
-
-    public async requestDeliverableUpload(shotId: string, input: DeliverableUploadInput): Promise {
-        return (await request(`/shots/${segment(shotId)}/uploads`, dataEnvelope(presignedUploadSchema), { method: "POST", body: input }))
-            .data;
-    }
-
-    public async submitWork(shotId: string, input: SubmitWorkInput): Promise {
-        return (await request(`/shots/${segment(shotId)}/submissions`, dataEnvelope(submissionSchema), { method: "POST", body: input }))
-            .data;
-    }
-
-    public async reclaimExpired(): Promise {
-        return (await request("/shots/reclaim-expired", dataEnvelope(reclaimResultSchema), { method: "POST" })).data;
-    }
-
-    public async reviewQueue(query: PageQuery): Promise> {
-        return request("/reviews", pageEnvelope(reviewQueueItemSchema), { query: { ...query } });
-    }
-
-    public async reviewSubmission(submissionId: string, decision: ReviewDecision, notes: string | null): Promise {
-        const path = `/submissions/${segment(submissionId)}/review`;
-        return (await request(path, dataEnvelope(submissionSchema), { method: "POST", body: { decision, notes } })).data;
-    }
-
-    public async users(query: PageQuery & { readonly role?: Role }): Promise> {
-        return request("/users", pageEnvelope(moderatedUserSchema), { query: { ...query } });
-    }
-
-    public async specialtyHolders(): Promise> {
-        return (await request("/users/specialty-holders", dataEnvelope(specialtyHoldersSchema))).data;
-    }
-
-    public async setRole(userId: string, role: Role, specialties?: readonly Specialty[], transfer?: boolean): Promise {
-        return (
-            await request(`/users/${segment(userId)}/role`, dataEnvelope(userSchema), {
-                method: "PATCH",
-                body: { role, specialties, transfer }
-            })
-        ).data;
-    }
-
-    public async document(slug: DocumentSlug): Promise {
-        return (await request(`/documents/${segment(slug)}`, dataEnvelope(documentSchema))).data;
-    }
-
-    public async publishDocument(slug: DocumentSlug, update: DocumentUpdateDto): Promise {
-        return (await request(`/documents/${segment(slug)}`, dataEnvelope(documentSchema), { method: "PUT", body: update })).data;
-    }
-
-    public async documentRevisions(slug: DocumentSlug): Promise {
-        return (await request(`/documents/${segment(slug)}/revisions`, dataEnvelope(z.array(documentRevisionSummarySchema)))).data;
-    }
-
-    public async documentRevision(slug: DocumentSlug, revision: number): Promise {
-        return (await request(`/documents/${segment(slug)}/revisions/${revision}`, dataEnvelope(documentRevisionSchema))).data;
-    }
-
-    public async legalAcceptance(): Promise {
-        return (await request("/legal/acceptance", dataEnvelope(legalAcceptanceSchema))).data.version;
-    }
-
-    public async acceptTerms(version: string): Promise {
-        return (await request("/users/me/terms", dataEnvelope(userSchema), { method: "PUT", body: { version } })).data;
-    }
-
-    public async startEmailVerification(email: string, captchaToken: string): Promise {
-        return (
-            await request("/verification/email", dataEnvelope(emailVerificationSchema), { method: "POST", body: { email, captchaToken } })
-        ).data;
-    }
-
-    public async confirmEmailVerification(code: string): Promise {
-        return (await request("/verification/email/confirm", dataEnvelope(userSchema), { method: "POST", body: { code } })).data;
-    }
-
-    public async chooseSpecialties(specialties: readonly Specialty[]): Promise {
-        return (await request("/users/me/specialties", dataEnvelope(userSchema), { method: "PUT", body: { specialties } })).data;
-    }
-
-    public async setRoleByDiscord(
-        discordId: string,
-        input: { readonly role: Role; readonly specialties?: readonly Specialty[]; readonly discordUsername?: string }
-    ): Promise {
-        return (
-            await request(`/users/by-discord/${segment(discordId)}/role`, dataEnvelope(userSchema), {
-                method: "PUT",
-                body: input
-            })
-        ).data;
-    }
-    public async promote(userId: string): Promise {
-        return (await request(`/users/${segment(userId)}/promote`, dataEnvelope(userSchema), { method: "POST" })).data;
-    }
-
-    public async blacklist(userId: string, reason: string | null): Promise {
-        return (
-            await request(`/users/${segment(userId)}/blacklist`, dataEnvelope(moderatedUserSchema), { method: "PUT", body: { reason } })
-        ).data;
-    }
-
-    public async liftBlacklist(userId: string): Promise {
-        return (await request(`/users/${segment(userId)}/blacklist`, dataEnvelope(moderatedUserSchema), { method: "DELETE" })).data;
-    }
-
-    public async entryTelemetry(roundId: string, entryId: string, limit = 100): Promise {
-        const path = `/rounds/${segment(roundId)}/entries/${segment(entryId)}/telemetry`;
-        return (await request(path, dataEnvelope(z.array(raidTelemetrySchema)), { query: { limit } })).data;
-    }
-
-    public async presence(discordIds: readonly string[]): Promise> {
-        const query = { ids: discordIds.slice(0, 20).join(",") };
-        return (await request("/users/presence", dataEnvelope(z.record(z.string(), z.enum(PresenceStatus))), { query })).data;
-    }
-
-    public async threadMaps(): Promise {
-        return (await request("/shot-thread-maps", dataEnvelope(z.array(shotThreadMapSchema)))).data;
-    }
-
-    public async unbindThread(shotId: string): Promise {
-        await requestNoContent(`/shot-thread-maps/${segment(shotId)}`, { method: "DELETE" });
-    }
-
-    public async telemetry(roundId: string): Promise {
-        return (await request(`/rounds/${segment(roundId)}/telemetry`, dataEnvelope(z.array(raidTelemetrySchema)))).data;
-    }
-}
-
-export const platformApi = new PlatformApi();
diff --git a/apps/web/src/Api/QueryKeys.ts b/apps/web/src/Api/QueryKeys.ts
deleted file mode 100644
index 59ed9c1..0000000
--- a/apps/web/src/Api/QueryKeys.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type { PageQuery, ShotQuery } from "./PlatformApi";
-
-export const queryKeys = {
-    me: ["me"] as const,
-    myEntries: ["my-entries"] as const,
-    pipeline: ["pipeline"] as const,
-    rounds: (query: PageQuery & { readonly status?: string }) => ["rounds", query] as const,
-    roundsAll: ["rounds"] as const,
-    round: (roundId: string) => ["round", roundId] as const,
-    entries: (roundId: string, query: PageQuery & { readonly status?: string }) => ["round", roundId, "entries", query] as const,
-    entriesAll: (roundId: string) => ["round", roundId, "entries"] as const,
-    approvedEntries: (roundId: string) => ["round", roundId, "entries", "approved"] as const,
-    leaderboard: (roundId: string) => ["round", roundId, "leaderboard"] as const,
-    results: (roundId: string) => ["round", roundId, "results"] as const,
-    myBallot: (roundId: string) => ["round", roundId, "ballot"] as const,
-    ledger: (roundId: string, page: number) => ["round", roundId, "ledger", page] as const,
-    telemetry: (roundId: string) => ["round", roundId, "telemetry"] as const,
-    shots: (query: ShotQuery) => ["shots", query] as const,
-    shotsAll: ["shots"] as const,
-    shot: (shotId: string) => ["shot", shotId] as const,
-    reviewQueue: (query: PageQuery) => ["reviews", query] as const,
-    reviewsAll: ["reviews"] as const,
-    users: (query: PageQuery & { readonly role?: string }) => ["users", query] as const,
-    usersAll: ["users"] as const,
-    entry: (roundId: string, entryId: string) => ["round", roundId, "entry", entryId] as const,
-    entryTelemetry: (roundId: string, entryId: string) => ["round", roundId, "telemetry", entryId] as const,
-    presence: (discordIds: readonly string[]) => ["presence", [...discordIds].sort().join(",")] as const,
-    threadMaps: ["thread-maps"] as const,
-    document: (slug: string) => ["document", slug] as const,
-    documentRevisions: (slug: string) => ["document", slug, "revisions"] as const,
-    legalAcceptance: ["legal-acceptance"] as const,
-    specialtyHolders: ["users", "specialty-holders"] as const
-};
diff --git a/apps/web/src/Api/Uploads.ts b/apps/web/src/Api/Uploads.ts
deleted file mode 100644
index 4ef479e..0000000
--- a/apps/web/src/Api/Uploads.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type { PresignedUploadDto } from "@platform/contracts";
-import { ApiError } from "./ApiClient";
-
-const browserManagedHeaders = new Set(["content-length", "host", "connection"]);
-
-export type UploadProgressHandler = (fraction: number) => void;
-
-export async function uploadToStorage(
-    upload: PresignedUploadDto,
-    file: Blob,
-    onProgress?: UploadProgressHandler,
-    signal?: AbortSignal
-): Promise {
-    const target = new URL(upload.url);
-    if (target.protocol !== "https:" && target.protocol !== window.location.protocol) {
-        throw new ApiError(0, "INSECURE_UPLOAD", "Refusing to upload over an insecure connection.");
-    }
-
-    await new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.open(upload.method, target.toString());
-        for (const [name, value] of Object.entries(upload.headers)) {
-            if (!browserManagedHeaders.has(name.toLowerCase())) {
-                xhr.setRequestHeader(name, value);
-            }
-        }
-        xhr.upload.onprogress = (event: ProgressEvent): void => {
-            if (event.lengthComputable && onProgress !== undefined) {
-                onProgress(event.loaded / event.total);
-            }
-        };
-        xhr.onload = (): void => {
-            if (xhr.status >= 200 && xhr.status < 300) {
-                onProgress?.(1);
-                resolve();
-            } else {
-                reject(new ApiError(xhr.status, "UPLOAD_FAILED", "Storage rejected the upload. Try again."));
-            }
-        };
-        xhr.onerror = (): void => {
-            reject(new ApiError(0, "UPLOAD_FAILED", "The upload failed. Check your connection and try again."));
-        };
-        xhr.onabort = (): void => {
-            reject(new DOMException("Upload cancelled.", "AbortError"));
-        };
-        if (signal !== undefined) {
-            if (signal.aborted) {
-                reject(new DOMException("Upload cancelled.", "AbortError"));
-                return;
-            }
-            signal.addEventListener(
-                "abort",
-                () => {
-                    xhr.abort();
-                },
-                { once: true }
-            );
-        }
-        xhr.send(file);
-    });
-}
diff --git a/apps/web/src/Assets/project-stairway-what-is-it.png b/apps/web/src/Assets/project-stairway-what-is-it.png
deleted file mode 100644
index 0eda957dccc199f2781379cca341be48eb343c3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91772
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�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
KGF2bUzW)z!koYzL

diff --git a/apps/web/src/Components/Common/ConfirmButton.tsx b/apps/web/src/Components/Common/ConfirmButton.tsx
deleted file mode 100644
index 0cd6e79..0000000
--- a/apps/web/src/Components/Common/ConfirmButton.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-"use client";
-
-import { useState, type ComponentProps, type ReactNode } from "react";
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-    AlertDialogTrigger
-} from "@/Components/Ui/alert-dialog";
-import { Button } from "@/Components/Ui/button";
-
-interface ConfirmButtonProps {
-    readonly title: string;
-    readonly description: ReactNode;
-    readonly confirmLabel: string;
-    readonly onConfirm: () => void;
-    readonly disabled?: boolean;
-    readonly destructive?: boolean;
-    readonly size?: ComponentProps["size"];
-    readonly variant?: ComponentProps["variant"];
-    readonly requireCheckbox?: boolean;
-    readonly checkboxLabel?: string;
-    readonly children: ReactNode;
-}
-
-export function ConfirmButton({
-    title,
-    description,
-    confirmLabel,
-    onConfirm,
-    disabled = false,
-    destructive = false,
-    size = "sm",
-    variant = "outline",
-    requireCheckbox = false,
-    checkboxLabel = "I confirm that I want to finalize and certify this round. This action cannot be undone.",
-    children
-}: ConfirmButtonProps): ReactNode {
-    const [open, setOpen] = useState(false);
-    const [confirmed, setConfirmed] = useState(false);
-
-    return (
-         {
-                setOpen(next);
-                if (!next) {
-                    setConfirmed(false);
-                }
-            }}
-        >
-            
-                
-            
-            
-                
-                    {title}
-                    
-                        
    
-                            
    {description}
    
-                            {requireCheckbox && (
-                                
-                            )}
-                        
    
-                        
-                    
-                
-                    Cancel
-                     {
-                            setOpen(false);
-                            setConfirmed(false);
-                            onConfirm();
-                        }}
-                    >
-                        {confirmLabel}
-                    
-                
-                
-            
-    );
-}
diff --git a/apps/web/src/Components/Common/CountdownTimer.tsx b/apps/web/src/Components/Common/CountdownTimer.tsx
deleted file mode 100644
index f939534..0000000
--- a/apps/web/src/Components/Common/CountdownTimer.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-"use client";
-
-import { Clock, Lock } from "lucide-react";
-import { useEffect, useState, type ReactNode } from "react";
-import { formatDateTime } from "@/Lib/Format";
-import { cn } from "@/Lib/Utils";
-
-export interface CountdownTimerProps {
-    readonly targetDate: string | Date | null | undefined;
-    readonly prefix?: string;
-    readonly expiredLabel?: string;
-    readonly icon?: "clock" | "lock" | "none";
-    readonly className?: string;
-}
-
-function formatRemaining(diffMs: number, prefix?: string): string {
-    const totalSeconds = Math.max(0, Math.floor(diffMs / 1000));
-    const days = Math.floor(totalSeconds / 86400);
-    const hours = Math.floor((totalSeconds % 86400) / 3600);
-    const minutes = Math.floor((totalSeconds % 3600) / 60);
-    const seconds = totalSeconds % 60;
-
-    let timeStr = "";
-    if (days >= 1) {
-        timeStr = `${days}d ${hours}h left`;
-    } else if (hours >= 1) {
-        timeStr = `${hours}h ${minutes}m left`;
-    } else {
-        timeStr = `${minutes}m ${seconds}s left`;
-    }
-
-    return prefix ? `${prefix} ${timeStr}` : timeStr;
-}
-
-export function CountdownTimer({
-    targetDate,
-    prefix,
-    expiredLabel = "Ended",
-    icon = "clock",
-    className
-}: CountdownTimerProps): ReactNode {
-    const [now, setNow] = useState(() => Date.now());
-
-    if (!targetDate) {
-        return null;
-    }
-
-    const targetTime = typeof targetDate === "string" ? new Date(targetDate).getTime() : targetDate.getTime();
-    const diff = targetTime - now;
-
-    // accelerate tick rate when time is running short
-    const tickInterval = diff <= 3_600_000 ? 1000 : diff <= 86_400_000 ? 10_000 : 60_000;
-
-    useEffect(() => {
-        const timer = window.setInterval(() => {
-            setNow(Date.now());
-        }, tickInterval);
-        return () => window.clearInterval(timer);
-    }, [tickInterval]);
-
-    const isExpired = diff <= 0;
-    const isUrgent = diff > 0 && diff <= 3_600_000;
-    const isWarning = diff > 3_600_000 && diff <= 86_400_000;
-
-    const IconComponent = icon === "lock" ? Lock : icon === "clock" ? Clock : null;
-
-    return (
-        
-            {IconComponent && }
-            {isExpired ? expiredLabel : formatRemaining(diff, prefix)}
-        
-    );
-}
diff --git a/apps/web/src/Components/Common/DataList.tsx b/apps/web/src/Components/Common/DataList.tsx
deleted file mode 100644
index e573f3e..0000000
--- a/apps/web/src/Components/Common/DataList.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { Route } from "next";
-import Link from "next/link";
-import type { ReactNode } from "react";
-import { cn } from "@/Lib/Utils";
-
-export function Toolbar({
-    children,
-    trailing,
-    className
-}: {
-    readonly children: ReactNode;
-    readonly trailing?: ReactNode;
-    readonly className?: string;
-}): ReactNode {
-    return (
-        
    
-            
    
-                {children}
-            
    
-            {trailing !== undefined && 
    {trailing}
    }
-        
    
-    );
-}
-
-export function DataList({ children }: { readonly children: ReactNode }): ReactNode {
-    return 
      {children}
    ;
-}
-
-interface DataRowProps {
-    readonly href: Route;
-    readonly code?: ReactNode;
-    readonly thumbnail?: ReactNode;
-    readonly title: ReactNode;
-    readonly meta?: ReactNode;
-    readonly fields?: ReactNode;
-    readonly highlight?: boolean;
-}
-
-export function DataRow({ href, code, thumbnail, title, meta, fields, highlight = false }: DataRowProps): ReactNode {
-    return (
-        
  • 
-            
-                {thumbnail !== undefined && 
    {thumbnail}
    }
-                {code !== undefined && {code}}
-                
-                    {title}
-                    {meta !== undefined && {meta}}
-                
-                {fields !== undefined && {fields}}
-            
-        
    • 
-    );
-}
diff --git a/apps/web/src/Components/Common/FilePicker.tsx b/apps/web/src/Components/Common/FilePicker.tsx
deleted file mode 100644
index 48754de..0000000
--- a/apps/web/src/Components/Common/FilePicker.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-"use client";
-
-import { X } from "lucide-react";
-import { useRef, type ReactNode } from "react";
-import { Button } from "@/Components/Ui/button";
-import { Input } from "@/Components/Ui/input";
-import { formatBytes } from "@/Lib/Format";
-import { cn } from "@/Lib/Utils";
-
-interface FilePickerProps {
-    readonly id: string;
-    readonly file: File | null;
-    readonly accept: string;
-    readonly required?: boolean;
-    readonly disabled?: boolean;
-    readonly invalid?: boolean;
-    readonly onChange: (file: File | null) => void;
-}
-
-export function FilePicker({ id, file, accept, required, disabled, invalid = false, onChange }: FilePickerProps): ReactNode {
-    const inputRef = useRef(null);
-
-    const clear = (): void => {
-        if (inputRef.current !== null) {
-            inputRef.current.value = "";
-        }
-        onChange(null);
-    };
-
-    return (
-        
    
-             {
-                    onChange(event.target.files?.[0] ?? null);
-                }}
-            />
-            {file !== null && (
-                
    
-                    {file.name}
-                    {formatBytes(file.size)}
-                    
-                
    
-            )}
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Common/FormField.tsx b/apps/web/src/Components/Common/FormField.tsx
deleted file mode 100644
index 13fc598..0000000
--- a/apps/web/src/Components/Common/FormField.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-"use client";
-
-import { problemOf } from "@platform/contracts";
-import { useState, type ComponentProps, type ReactNode } from "react";
-import type { z } from "zod";
-import { RichTextField } from "@/Components/Editor/RichTextField";
-import { Input } from "@/Components/Ui/input";
-import { Label } from "@/Components/Ui/label";
-import { cn } from "@/Lib/Utils";
-
-interface FieldFrameProps {
-    readonly id: string;
-    readonly label: string;
-    readonly length: number;
-    readonly limit: number;
-    readonly problem: string | null;
-    readonly hint?: string;
-    readonly children: ReactNode;
-}
-
-function FieldFrame({ id, label, length, limit, problem, hint, children }: FieldFrameProps): ReactNode {
-    return (
-        
    
-            
-            {children}
-            
    
-                
    
-                    {problem ?? hint}
-                
    
-                 limit ? "text-destructive" : "text-muted-foreground")}>
-                    {length}/{limit}
-                
-            
    
-        
    
-    );
-}
-
-function useVisibleProblem(rule: z.ZodType, value: string, invalidWhenEmpty: boolean): { problem: string | null; touch: () => void } {
-    const [touched, setTouched] = useState(false);
-    const problem = problemOf(rule, value);
-    const visible = problem !== null && (touched || value.length > 0 || invalidWhenEmpty) ? problem : null;
-    return {
-        problem: visible,
-        touch: () => {
-            setTouched(true);
-        }
-    };
-}
-
-interface TextInputFieldProps extends Omit, "id" | "value" | "onChange" | "maxLength"> {
-    readonly id: string;
-    readonly label: string;
-    readonly value: string;
-    readonly rule: z.ZodType;
-    readonly limit: number;
-    readonly hint?: string;
-    readonly onValueChange: (value: string) => void;
-}
-
-export function TextInputField({ id, label, value, rule, limit, hint, onValueChange, onBlur, ...props }: TextInputFieldProps): ReactNode {
-    const { problem, touch } = useVisibleProblem(rule, value, false);
-    return (
-        
-             {
-                    touch();
-                    onBlur?.(event);
-                }}
-                onChange={(event) => {
-                    onValueChange(event.target.value);
-                }}
-            />
-        
-    );
-}
-
-interface RichTextInputFieldProps {
-    readonly id: string;
-    readonly label: string;
-    readonly value: string;
-    readonly rule: z.ZodType;
-    readonly limit: number;
-    readonly hint?: string;
-    readonly placeholder?: string;
-    readonly disabled?: boolean;
-    readonly forceInvalid?: string | null;
-    readonly onValueChange: (value: string) => void;
-}
-
-export function RichTextInputField({
-    id,
-    label,
-    value,
-    rule,
-    limit,
-    hint,
-    placeholder,
-    disabled,
-    forceInvalid = null,
-    onValueChange
-}: RichTextInputFieldProps): ReactNode {
-    const { problem } = useVisibleProblem(rule, value, false);
-    const shown = forceInvalid ?? problem;
-    return (
-        
-            
-        
-    );
-}
diff --git a/apps/web/src/Components/Common/MarkdownText.tsx b/apps/web/src/Components/Common/MarkdownText.tsx
deleted file mode 100644
index b08a706..0000000
--- a/apps/web/src/Components/Common/MarkdownText.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { ReactNode } from "react";
-import ReactMarkdown, { type Components } from "react-markdown";
-import remarkGfm from "remark-gfm";
-import { cn } from "@/Lib/Utils";
-
-const allowedElements = ["p", "br", "strong", "em", "del", "code", "a", "ul", "ol", "li", "blockquote"];
-
-const components: Components = {
-    a: ({ href, children }) => {
-        const isInternal = href?.startsWith("/") === true && !href.startsWith("//");
-        return isInternal ? (
-                {children}
-        ) : (
-            
-                {children}
-            
-        );
-    }
-};
-
-export function MarkdownText({ children, className }: { readonly children: string; readonly className?: string }): ReactNode {
-    return (
-        
    
-            
-                {children}
-            
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Common/PageHeader.tsx b/apps/web/src/Components/Common/PageHeader.tsx
deleted file mode 100644
index 4462dec..0000000
--- a/apps/web/src/Components/Common/PageHeader.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ReactNode } from "react";
-
-interface PageHeaderProps {
-    readonly title: string;
-    readonly eyebrow?: string;
-    readonly description?: ReactNode;
-    readonly actions?: ReactNode;
-}
-
-export function PageHeader({ title, eyebrow, description, actions }: PageHeaderProps): ReactNode {
-    return (
-        
    
-            
    
-                {eyebrow !== undefined && 
    {eyebrow}
    }
-                
    {title}
    
-                {description !== undefined && 
    {description}
    }
-            
    
-            {actions !== undefined && 
    {actions}
    }
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Common/Pagination.tsx b/apps/web/src/Components/Common/Pagination.tsx
deleted file mode 100644
index 1afdbde..0000000
--- a/apps/web/src/Components/Common/Pagination.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { PaginationMeta } from "@platform/contracts";
-import { ChevronLeft, ChevronRight } from "lucide-react";
-import type { ReactNode } from "react";
-import { Button } from "@/Components/Ui/button";
-
-interface PaginationProps {
-    readonly meta: PaginationMeta;
-    readonly onPageChange: (page: number) => void;
-}
-
-export function Pagination({ meta, onPageChange }: PaginationProps): ReactNode {
-    if (meta.totalPages <= 1) {
-        return null;
-    }
-    return (
-        
-    );
-}
diff --git a/apps/web/src/Components/Common/RelativeTime.tsx b/apps/web/src/Components/Common/RelativeTime.tsx
deleted file mode 100644
index 551d8b9..0000000
--- a/apps/web/src/Components/Common/RelativeTime.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-"use client";
-
-import type { ReactNode } from "react";
-import { useNow } from "@/Hooks/UseNow";
-import { formatDateTime, formatRelative } from "@/Lib/Format";
-
-export function RelativeTime({ value, prefix }: { readonly value: string; readonly prefix?: string }): ReactNode {
-    const now = useNow();
-    return (
-        
-    );
-}
diff --git a/apps/web/src/Components/Common/Section.tsx b/apps/web/src/Components/Common/Section.tsx
deleted file mode 100644
index a045c71..0000000
--- a/apps/web/src/Components/Common/Section.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { ReactNode } from "react";
-
-interface SectionProps {
-    readonly title: string;
-    readonly description?: ReactNode;
-    readonly actions?: ReactNode;
-    readonly children: ReactNode;
-}
-
-export function Section({ title, description, actions, children }: SectionProps): ReactNode {
-    return (
-        
    
-            
    
-                
    
-                    
    {title}
    
-                    {description !== undefined && 
    {description}
    }
-                
    
-                {actions}
-            
    
-            {children}
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Common/StatTile.tsx b/apps/web/src/Components/Common/StatTile.tsx
deleted file mode 100644
index 2b6c5ae..0000000
--- a/apps/web/src/Components/Common/StatTile.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { Route } from "next";
-import Link from "next/link";
-import type { ReactNode } from "react";
-import { cn } from "@/Lib/Utils";
-
-interface StatTileProps {
-    readonly label: string;
-    readonly value: ReactNode;
-    readonly hint?: ReactNode;
-    readonly href?: Route;
-    readonly emphasis?: boolean;
-}
-
-export function StatTile({ label, value, hint, href, emphasis = false }: StatTileProps): ReactNode {
-    const body = (
-        
    
-            {label}
-            {value}
-            {hint !== undefined && {hint}}
-        
    
-    );
-    return href === undefined ? (
-        body
-    ) : (
-        
-            {body}
-        
-    );
-}
diff --git a/apps/web/src/Components/Common/States.tsx b/apps/web/src/Components/Common/States.tsx
deleted file mode 100644
index 1673e9e..0000000
--- a/apps/web/src/Components/Common/States.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-"use client";
-
-import type { Role } from "@platform/contracts";
-import { AlertTriangle, Inbox, Lock } from "lucide-react";
-import { usePathname } from "next/navigation";
-import type { ReactNode } from "react";
-import { describeError } from "@/Api/ApiClient";
-import { Alert, AlertDescription, AlertTitle } from "@/Components/Ui/alert";
-import { Button } from "@/Components/Ui/button";
-import { Skeleton } from "@/Components/Ui/skeleton";
-import { loginHref, useSession } from "@/Hooks/UseSession";
-import { cn } from "@/Lib/Utils";
-import { hasAtLeast, roleLabels } from "@/Lib/Roles";
-
-const titleWidths = ["w-2/5", "w-3/5", "w-1/3", "w-1/2", "w-2/3", "w-1/4"];
-const metaWidths = ["w-1/5", "w-1/4", "w-1/6", "w-1/5", "w-1/3", "w-1/4"];
-
-export function LoadingRows({ rows = 5 }: { readonly rows?: number }): ReactNode {
-    return (
-        
    
-            {Array.from({ length: rows }, (_, index) => (
-                
    
-                    
    
-                        
-                        
-                    
    
-                    
-                
    
-            ))}
-        
    
-    );
-}
-
-export function PageSkeleton(): ReactNode {
-    return (
-        
    
-            
    
-                
-            
    
-            
    
-                
-                
-            
    
-            
-        
    
-    );
-}
-
-export function ErrorState({ error, onRetry }: { readonly error: unknown; readonly onRetry?: () => void }): ReactNode {
-    return (
-        
-            
-            Could not load this
-            
-                {describeError(error)}
-                {onRetry !== undefined && (
-                    
-                )}
-            
-        
-    );
-}
-
-export function EmptyState({ title, children }: { readonly title: string; readonly children?: ReactNode }): ReactNode {
-    return (
-        
    
-            
-            
    {title}
    
-            {children}
-        
    
-    );
-}
-
-export function SignInPrompt({ message }: { readonly message: string }): ReactNode {
-    const pathname = usePathname();
-    return (
-        
    
-            
-            
    {message}
    
-            
-        
    
-    );
-}
-
-interface RequireRoleProps {
-    readonly role: Role;
-    readonly children: ReactNode;
-}
-
-export function RequireRole({ role, children }: RequireRoleProps): ReactNode {
-    const { user, isLoading } = useSession();
-    if (isLoading) {
-        return ;
-    }
-    if (user === null) {
-        return ;
-    }
-    if (!hasAtLeast(user, role)) {
-        return This area needs the {roleLabels[role]} role or higher.;
-    }
-    return children;
-}
diff --git a/apps/web/src/Components/Common/StatusBadge.tsx b/apps/web/src/Components/Common/StatusBadge.tsx
deleted file mode 100644
index 7362b80..0000000
--- a/apps/web/src/Components/Common/StatusBadge.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import { EntryStatus, RoundStatus, ShotStatus, SubmissionStatus } from "@platform/contracts";
-import type { ReactNode } from "react";
-import { Badge } from "@/Components/Ui/badge";
-import { entryStatusLabels, roundStatusLabels, shotStatusLabels, submissionStatusLabels } from "@/Lib/Format";
-import { cn } from "@/Lib/Utils";
-
-export enum Tone {
-    Neutral = "neutral",
-    Positive = "positive",
-    Warning = "warning",
-    Negative = "negative",
-    Info = "info"
-}
-
-const toneClasses: Readonly> = {
-    [Tone.Neutral]: "bg-muted text-muted-foreground",
-    [Tone.Positive]: "bg-success/15 text-success",
-    [Tone.Warning]: "bg-warning/15 text-warning",
-    [Tone.Negative]: "bg-destructive/12 text-destructive",
-    [Tone.Info]: "bg-primary/12 text-primary"
-};
-
-export function ToneBadge({ tone, children }: { readonly tone: Tone; readonly children: ReactNode }): ReactNode {
-    return (
-        
-            {children}
-        
-    );
-}
-
-const roundTones: Readonly> = {
-    [RoundStatus.Draft]: Tone.Neutral,
-    [RoundStatus.Open]: Tone.Info,
-    [RoundStatus.Voting]: Tone.Positive,
-    [RoundStatus.Finalized]: Tone.Neutral
-};
-
-const entryTones: Readonly> = {
-    [EntryStatus.PendingReview]: Tone.Warning,
-    [EntryStatus.Approved]: Tone.Positive,
-    [EntryStatus.Rejected]: Tone.Negative,
-    [EntryStatus.Flagged]: Tone.Negative
-};
-
-const shotTones: Readonly> = {
-    [ShotStatus.Available]: Tone.Positive,
-    [ShotStatus.Claimed]: Tone.Info,
-    [ShotStatus.Submitted]: Tone.Warning,
-    [ShotStatus.Approved]: Tone.Neutral
-};
-
-const submissionTones: Readonly> = {
-    [SubmissionStatus.PendingReview]: Tone.Warning,
-    [SubmissionStatus.RevisionRequested]: Tone.Negative,
-    [SubmissionStatus.Approved]: Tone.Positive
-};
-
-export function RoundStatusBadge({ status }: { readonly status: RoundStatus }): ReactNode {
-    return {roundStatusLabels[status]};
-}
-
-export function EntryStatusBadge({ status }: { readonly status: EntryStatus }): ReactNode {
-    return {entryStatusLabels[status]};
-}
-
-export function ShotStatusBadge({ status }: { readonly status: ShotStatus }): ReactNode {
-    return {shotStatusLabels[status]};
-}
-
-export function SubmissionStatusBadge({ status }: { readonly status: SubmissionStatus }): ReactNode {
-    return {submissionStatusLabels[status]};
-}
diff --git a/apps/web/src/Components/Common/TaskImageCarousel.tsx b/apps/web/src/Components/Common/TaskImageCarousel.tsx
deleted file mode 100644
index 73ffb35..0000000
--- a/apps/web/src/Components/Common/TaskImageCarousel.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-"use client";
-
-import { useEffect, useState, type ReactNode } from "react";
-import { cn } from "@/Lib/Utils";
-
-interface TaskImageCarouselProps {
-    readonly images: readonly string[];
-    readonly alt?: string;
-    readonly className?: string;
-}
-
-const autoCycleIntervalMs = 4_000;
-
-export function TaskImageCarousel({ images, alt = "Task reference image", className }: TaskImageCarouselProps): ReactNode {
-    const [activeIndex, setActiveIndex] = useState(0);
-    const [isPaused, setIsPaused] = useState(false);
-
-    const count = images.length;
-
-    useEffect(() => {
-        if (count <= 1 || isPaused) {
-            return;
-        }
-
-        const timer = setInterval(() => {
-            setActiveIndex((current) => (current + 1) % count);
-        }, autoCycleIntervalMs);
-
-        return () => clearInterval(timer);
-    }, [count, isPaused]);
-
-    if (count === 0) {
-        return null;
-    }
-
-    if (count === 1) {
-        return (
-            
    
-                
    
-                    {alt}
-                
    
-            
    
-        );
-    }
-
-    return (
-        
     setIsPaused(true)}
-            onMouseLeave={() => setIsPaused(false)}
-            onTouchStart={() => setIsPaused(true)}
-            onTouchEnd={() => setIsPaused(false)}
-        >
-            
    
-                {images.map((url, idx) => (
-                    
    
-                        {`${alt}
-                    
    
-                ))}
-            
    
-
-            {/* dot indicators */}
-            
    
-                {images.map((_, idx) => (
-                    
    
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Editor/EditorTools.tsx b/apps/web/src/Components/Editor/EditorTools.tsx
deleted file mode 100644
index a18697d..0000000
--- a/apps/web/src/Components/Editor/EditorTools.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-"use client";
-
-import type { Editor } from "@tiptap/react";
-import { Link2, type LucideIcon } from "lucide-react";
-import { useState, type ReactNode } from "react";
-import { Button } from "@/Components/Ui/button";
-import { Input } from "@/Components/Ui/input";
-import { Popover, PopoverContent, PopoverTrigger } from "@/Components/Ui/popover";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@/Components/Ui/tooltip";
-import { cn } from "@/Lib/Utils";
-
-export const safeLink = /^(?:https?:\/\/|mailto:|\/(?![/\\])|#)/iu;
-
-interface ToolProps {
-    readonly label: string;
-    readonly icon: LucideIcon;
-    readonly active?: boolean;
-    readonly disabled?: boolean;
-    readonly onClick: () => void;
-}
-
-export function Tool({ label, icon: Icon, active = false, disabled = false, onClick }: ToolProps): ReactNode {
-    return (
-        
-            
-                
-            
-            {label}
-        
-    );
-}
-
-export function LinkTool({ editor, active }: { readonly editor: Editor; readonly active: boolean }): ReactNode {
-    const [open, setOpen] = useState(false);
-    const [href, setHref] = useState("");
-    const valid = safeLink.test(href.trim());
-
-    const apply = (): void => {
-        if (!valid) {
-            return;
-        }
-        editor.chain().focus().extendMarkRange("link").setLink({ href: href.trim() }).run();
-        setOpen(false);
-    };
-
-    return (
-         {
-                setOpen(next);
-                if (next) {
-                    setHref((editor.getAttributes("link").href as string | undefined) ?? "");
-                }
-            }}
-        >
-            
-                
-            
-            
-                
     {
-                        event.preventDefault();
-                        event.stopPropagation();
-                        apply();
-                    }}
-                >
-                     {
-                            setHref(event.target.value);
-                        }}
-                    />
-                    
-                
    
-                
    Use https://, mailto: or a site path like /grabbox.
    
-                
-            
-    );
-}
diff --git a/apps/web/src/Components/Editor/RichTextField.tsx b/apps/web/src/Components/Editor/RichTextField.tsx
deleted file mode 100644
index 1cebe50..0000000
--- a/apps/web/src/Components/Editor/RichTextField.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-"use client";
-
-import { Placeholder } from "@tiptap/extensions";
-import { Markdown } from "@tiptap/markdown";
-import { EditorContent, useEditor, useEditorState, type ChainedCommands, type Editor } from "@tiptap/react";
-import StarterKit from "@tiptap/starter-kit";
-import { Bold, Code, Italic, List, ListOrdered, Quote, Strikethrough, Unlink } from "lucide-react";
-import { useEffect, type ReactNode } from "react";
-import { cn } from "@/Lib/Utils";
-import { LinkTool, safeLink, Tool } from "./EditorTools";
-
-function Toolbar({ editor }: { readonly editor: Editor }): ReactNode {
-    const state = useEditorState({
-        editor,
-        selector: ({ editor: current }) => ({
-            editable: current.isEditable,
-            bold: current.isActive("bold"),
-            italic: current.isActive("italic"),
-            strike: current.isActive("strike"),
-            code: current.isActive("code"),
-            link: current.isActive("link"),
-            bulletList: current.isActive("bulletList"),
-            orderedList: current.isActive("orderedList"),
-            blockquote: current.isActive("blockquote")
-        })
-    });
-    const chain = (): ChainedCommands => editor.chain().focus();
-    if (!state.editable) {
-        return null;
-    }
-    return (
-        
    
-             chain().toggleBold().run()} />
-             chain().toggleItalic().run()} />
-             chain().toggleStrike().run()} />
-             chain().toggleCode().run()} />
-            
-             chain().extendMarkRange("link").unsetLink().run()}
-            />
-             chain().toggleBulletList().run()} />
-             chain().toggleOrderedList().run()} />
-             chain().toggleBlockquote().run()} />
-        
    
-    );
-}
-
-interface RichTextFieldProps {
-    readonly id?: string;
-    readonly value: string;
-    readonly placeholder?: string;
-    readonly disabled?: boolean;
-    readonly invalid?: boolean;
-    readonly className?: string;
-    readonly maxLength?: number;
-    readonly onChange: (markdown: string) => void;
-}
-
-export function RichTextField({
-    id,
-    value,
-    placeholder,
-    disabled = false,
-    invalid = false,
-    className,
-    maxLength,
-    onChange
-}: RichTextFieldProps): ReactNode {
-    const editor = useEditor({
-        immediatelyRender: false,
-        extensions: [
-            StarterKit.configure({
-                heading: false,
-                underline: false,
-                horizontalRule: false,
-                codeBlock: false,
-                link: {
-                    openOnClick: false,
-                    autolink: true,
-                    protocols: ["https", "http", "mailto"],
-                    isAllowedUri: (url) => safeLink.test(url)
-                }
-            }),
-            Markdown,
-            Placeholder.configure({ placeholder: placeholder ?? "" })
-        ],
-        content: value,
-        contentType: "markdown",
-        editable: !disabled,
-        editorProps: {
-            attributes: {
-                class: "doc-prose min-h-20 max-h-80 overflow-y-auto px-3 py-2 focus:outline-none",
-                role: "textbox",
-                "aria-multiline": "true",
-                ...(id === undefined ? {} : { id })
-            }
-        },
-        onUpdate: ({ editor: current }) => {
-            if (!current.isDestroyed) {
-                onChange(current.isEmpty ? "" : current.getMarkdown().trim());
-            }
-        }
-    });
-
-    useEffect(() => {
-        editor?.setEditable(!disabled);
-    }, [editor, disabled]);
-
-    useEffect(() => {
-        if (editor !== null && !editor.isDestroyed && value !== (editor.isEmpty ? "" : editor.getMarkdown().trim())) {
-            if (value === "") {
-                editor.commands.clearContent(false);
-            } else {
-                editor.commands.setContent(value, { contentType: "markdown", emitUpdate: false });
-            }
-        }
-    }, [editor, value]);
-
-    return (
-        
     maxLength)) && "border-destructive",
-                disabled && "opacity-60",
-                className
-            )}
-        >
-            {editor === null ? 
     : }
-            
-            {maxLength !== undefined && (
-                
     maxLength ? "text-destructive" : "text-muted-foreground"
-                    )}
-                >
-                    {value.length}/{maxLength}
-                
    
-            )}
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Icons/BrandIcons.tsx b/apps/web/src/Components/Icons/BrandIcons.tsx
deleted file mode 100644
index 1941c1b..0000000
--- a/apps/web/src/Components/Icons/BrandIcons.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ComponentProps, ReactNode } from "react";
-
-export function YouTubeIcon({ className, ...props }: ComponentProps<"svg">): ReactNode {
-    return (
-        
-    );
-}
-
-export function DiscordIcon({ className, ...props }: ComponentProps<"svg">): ReactNode {
-    return (
-        
-    );
-}
diff --git a/apps/web/src/Components/Layout/AppFooter.tsx b/apps/web/src/Components/Layout/AppFooter.tsx
deleted file mode 100644
index fddcdca..0000000
--- a/apps/web/src/Components/Layout/AppFooter.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-"use client";
-
-// import { ExternalLink } from "lucide-react";
-import Link from "next/link";
-import type { ReactNode } from "react";
-
-// const partners = [
-//     { label: "Prism Nodes", href: "https://prismnodes.com/" },
-//     { label: "Squared Media", href: "https://www.youtube.com/@SquaredMediaYT" },
-//     { label: "Seraph Interactive", href: "https://seraphinteractive.com/" }
-// ] as const;
-
-export function AppFooter(): ReactNode {
-    return (
-        
    
-            
    
-                © {new Date().getFullYear()} Seraph Interactive, Inc.
-                
    
-                    
-                        Terms
-                    
-                    
-                        Privacy
-                    
-                    
-                        Acceptable use
-                    
-                
    
-                {/* 
    
-                    {partners.map((partner, i) => (
-                        
-                            {i > 0 && ·}
-                            
-                                {partner.label}
-                                
-                            
-                        
-                    ))}
-                
     */}
-            
    
-        
    
-    );
-}
diff --git a/apps/web/src/Components/Layout/AppShell.tsx b/apps/web/src/Components/Layout/AppShell.tsx
deleted file mode 100644
index 1363f28..0000000
--- a/apps/web/src/Components/Layout/AppShell.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-"use client";
-
-import { CircleUser, LogIn, LogOut, Moon, Sun, UserRound } from "lucide-react";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { useTheme } from "next-themes";
-import { Suspense, type ReactNode } from "react";
-import { Avatar, AvatarFallback, AvatarImage } from "@/Components/Ui/avatar";
-import { Button } from "@/Components/Ui/button";
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuLabel,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger
-} from "@/Components/Ui/dropdown-menu";
-import { Separator } from "@/Components/Ui/separator";
-import { SidebarInset, SidebarProvider, SidebarTrigger } from "@/Components/Ui/sidebar";
-import { Skeleton } from "@/Components/Ui/skeleton";
-import { TermsGate } from "@/Features/Legal/TermsGate";
-import { loginHref, useLogout, useSession } from "@/Hooks/UseSession";
-import { roleLabels } from "@/Lib/Roles";
-import { safeHttpUrl } from "@/Lib/SafeUrl";
-import { AppFooter } from "./AppFooter";
-import { AppSidebar } from "./AppSidebar";
-import { BreadcrumbProvider, Breadcrumbs } from "./Breadcrumbs";
-import { CommandMenu } from "./CommandMenu";
-import { TopProgress } from "./TopProgress";
-
-function ThemeToggle(): ReactNode {
-    const { resolvedTheme, setTheme } = useTheme();
-    return (
-        
-    );
-}
-
-function UserMenu(): ReactNode {
-    const pathname = usePathname();
-    const { user, isLoading } = useSession();
-    const logout = useLogout();
-
-    if (isLoading) {
-        return ;
-    }
-    if (user === null) {
-        return (
-            
-        );
-    }
-    const avatar = safeHttpUrl(user.avatarUrl);
-    return (
-        
-            
-                
-            
-            
-                
-                    {user.username}
-                    {roleLabels[user.role]}
-                
-                
-                
-                    
-                        
-                        Profile
-                    
-                
-                
-                    
-                        
-                        My work
-                    
-                
-                 {
-                        logout.mutate();
-                    }}
-                >
-                    
-                    Sign out
-                
-            
-        
-    );
-}
-
-export function AppShell({ defaultOpen, children }: { readonly defaultOpen: boolean; readonly children: ReactNode }): ReactNode {
-    return (
-        
-            
-                
-                    
-                
-                
-                    Skip to content
-                
-                
-                
-                    
    
-                        
-                        
-                        
    
-                            
-                        
    
-                        
-                        
-                        
    
-                            
-                        
    
-                    
    
-                    
    
-                        {children}
-                    
    
-                    
-                    
-                
-            
-    );
-}
diff --git a/apps/web/src/Components/Layout/AppSidebar.tsx b/apps/web/src/Components/Layout/AppSidebar.tsx
deleted file mode 100644
index a96e92d..0000000
--- a/apps/web/src/Components/Layout/AppSidebar.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-"use client";
-
-import { RoundStatus, ShotStatus, type UserDto } from "@platform/contracts";
-import { useQueryClient, type QueryClient } from "@tanstack/react-query";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import type { ReactNode } from "react";
-import { platformApi } from "@/Api/PlatformApi";
-import { queryKeys } from "@/Api/QueryKeys";
-import { DiscordIcon, YouTubeIcon } from "@/Components/Icons/BrandIcons";
-import { toDiscordAppInviteUrl, useSiteConfig } from "@/Components/SiteConfig";
-import {
-    Sidebar,
-    SidebarContent,
-    SidebarFooter,
-    SidebarGroup,
-    SidebarGroupContent,
-    SidebarGroupLabel,
-    SidebarHeader,
-    SidebarMenu,
-    SidebarMenuButton,
-    SidebarMenuItem,
-    SidebarRail,
-    useSidebar
-} from "@/Components/Ui/sidebar";
-import { useSession } from "@/Hooks/UseSession";
-import { hasAtLeast } from "@/Lib/Roles";
-import { isActivePath, navigationGroups, type NavigationItem } from "./Navigation";
-
-export function isVisible(item: NavigationItem, user: UserDto | null): boolean {
-    if (item.requiresSession === true && user === null) {
-        return false;
-    }
-    return item.minimumRole === undefined || hasAtLeast(user, item.minimumRole);
-}
-
-function preloadData(queryClient: QueryClient, href: string): void {
-    if (href === "/voting") {
-        const query = { status: RoundStatus.Open, page: 1, perPage: 25 };
-        queryClient.query({ queryKey: queryKeys.rounds(query), queryFn: () => platformApi.rounds(query) }).catch(() => undefined);
-    } else if (href === "/grabbox") {
-        const query = { page: 1, perPage: 25, status: ShotStatus.Available };
-        queryClient.query({ queryKey: queryKeys.shots(query), queryFn: () => platformApi.shots(query) }).catch(() => undefined);
-    } else if (href === "/roadmap" || href === "/") {
-        queryClient.query({ queryKey: queryKeys.pipeline, queryFn: () => platformApi.pipeline() }).catch(() => undefined);
-    }
-}
-
-export function AppSidebar(): ReactNode {
-    const pathname = usePathname();
-    const { user } = useSession();
-    const { discordInviteUrl } = useSiteConfig();
-    const { setOpenMobile } = useSidebar();
-    const queryClient = useQueryClient();
-
-    return (
-        
-            
-                
-                    Project Stairway
-                
-            
-            
-                {navigationGroups.map((group) => {
-                    const items = group.items.filter((item) => isVisible(item, user));
-                    if (items.length === 0) {
-                        return null;
-                    }
-                    return (
-                        
-                            {group.label}
-                            
-                                
-                                    {items.map((item) => (
-                                        
-                                            
-                                                 {
-                                                        preloadData(queryClient, item.href);
-                                                    }}
-                                                    onFocus={() => {
-                                                        preloadData(queryClient, item.href);
-                                                    }}
-                                                    onClick={() => {
-                                                        setOpenMobile(false);
-                                                    }}
-                                                >
-                                                    
-                                                    {item.label}
-                                                
-                                            
-                                        
-                                    ))}
-                                
-                            
-                        
-                    );
-                })}
-            
-            
-                
-                    
-                        
-                            
-                                
-                                YouTube
-                            
-                        
-                    
-                    {toDiscordAppInviteUrl(discordInviteUrl) !== null && (
-                        
-                            
-                                
-                                    
-                                    Join the Discord
-                                
-                            
-                        
-                    )}
-                
-            
-            
-        
-    );
-}
diff --git a/apps/web/src/Components/Layout/Breadcrumbs.tsx b/apps/web/src/Components/Layout/Breadcrumbs.tsx
deleted file mode 100644
index 449b713..0000000
--- a/apps/web/src/Components/Layout/Breadcrumbs.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-"use client";
-
-import type { Route } from "next";
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { createContext, Fragment, useCallback, useContext, useEffect, useMemo, useState, type ReactNode } from "react";
-import {
-    Breadcrumb,
-    BreadcrumbItem,
-    BreadcrumbLink,
-    BreadcrumbList,
-    BreadcrumbPage,
-    BreadcrumbSeparator
-} from "@/Components/Ui/breadcrumb";
-import { segmentLabels } from "./Navigation";
-
-interface BreadcrumbLabels {
-    readonly labels: ReadonlyMap;
-    readonly setLabel: (segment: string, label: string | null) => void;
-}
-
-const BreadcrumbContext = createContext({ labels: new Map(), setLabel: () => undefined });
-
-export function BreadcrumbProvider({ children }: { readonly children: ReactNode }): ReactNode {
-    const [labels, setLabels] = useState>(new Map());
-    const setLabel = useCallback((segment: string, label: string | null): void => {
-        setLabels((current) => {
-            if ((current.get(segment) ?? null) === label) {
-                return current;
-            }
-            const next = new Map(current);
-            if (label === null) {
-                next.delete(segment);
-            } else {
-                next.set(segment, label);
-            }
-            return next;
-        });
-    }, []);
-    const value = useMemo(() => ({ labels, setLabel }), [labels, setLabel]);
-    return {children};
-}
-
-export function useBreadcrumbLabel(segment: string, label: string | undefined): void {
-    const { setLabel } = useContext(BreadcrumbContext);
-    useEffect(() => {
-        if (label === undefined) {
-            return;
-        }
-        setLabel(segment, label);
-        return () => {
-            setLabel(segment, null);
-        };
-    }, [segment, label, setLabel]);
-}
-
-export function Breadcrumbs(): ReactNode {
-    const pathname = usePathname();
-    const { labels } = useContext(BreadcrumbContext);
-    const segments = pathname.split("/").filter((segment) => segment.length > 0);
-    if (segments.length === 0) {
-        return Overview;
-    }
-    return (
-        
-            
-                {segments.map((segment, index) => {
-                    const href = `/${segments.slice(0, index + 1).join("/")}`;
-                    const label = labels.get(segment) ?? segmentLabels[segment] ?? "…";
-                    const isLast = index === segments.length - 1;
-                    return (
-                        
-                            {index > 0 && }
-                            
-                                {isLast ? (
-                                    {label}
-                                ) : (
-                                    
-                                        {label}
-                                    
-                                )}
-                            
-                        
-                    );
-                })}
-            
-        
-    );
-}
diff --git a/apps/web/src/Components/Layout/CommandMenu.tsx b/apps/web/src/Components/Layout/CommandMenu.tsx
deleted file mode 100644
index ec302a2..0000000
--- a/apps/web/src/Components/Layout/CommandMenu.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-"use client";
-
-import { useQuery } from "@tanstack/react-query";
-import { Hammer, LogIn, LogOut, Moon, Search, Vote } from "lucide-react";
-import type { Route } from "next";
-import { usePathname, useRouter } from "next/navigation";
-import { useTheme } from "next-themes";
-import { useEffect, useState, type ReactNode } from "react";
-import { platformApi } from "@/Api/PlatformApi";
-import { queryKeys } from "@/Api/QueryKeys";
-import { Button } from "@/Components/Ui/button";
-import {
-    CommandDialog,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList,
-    CommandSeparator
-} from "@/Components/Ui/command";
-import { Kbd } from "@/Components/Ui/kbd";
-import { loginHref, useLogout, useSession } from "@/Hooks/UseSession";
-import { roundStatusLabels, shotStatusLabels } from "@/Lib/Format";
-import { isVisible } from "./AppSidebar";
-import { navigationGroups } from "./Navigation";
-
-export function CommandMenu(): ReactNode {
-    const router = useRouter();
-    const pathname = usePathname();
-    const { user } = useSession();
-    const logout = useLogout();
-    const { resolvedTheme, setTheme } = useTheme();
-    const [open, setOpen] = useState(false);
-
-    useEffect(() => {
-        const onKeyDown = (event: KeyboardEvent): void => {
-            if (event.key.toLowerCase() === "k" && (event.metaKey || event.ctrlKey)) {
-                event.preventDefault();
-                setOpen((current) => !current);
-            }
-        };
-        window.addEventListener("keydown", onKeyDown);
-        return () => {
-            window.removeEventListener("keydown", onKeyDown);
-        };
-    }, []);
-
-    const roundsQuery = { page: 1, perPage: 50 };
-    const rounds = useQuery({ queryKey: queryKeys.rounds(roundsQuery), queryFn: () => platformApi.rounds(roundsQuery), enabled: open });
-    const shotsQuery = { page: 1, perPage: 50 };
-    const shots = useQuery({ queryKey: queryKeys.shots(shotsQuery), queryFn: () => platformApi.shots(shotsQuery), enabled: open });
-
-    const go = (href: string): void => {
-        setOpen(false);
-        router.push(href as Route);
-    };
-
-    return (
-        <>
-            
-            
-                
-                
-                    Nothing matches that.
-                    {navigationGroups.map((group) => {
-                        const items = group.items.filter((item) => isVisible(item, user));
-                        return items.length === 0 ? null : (
-                            
-                                {items.map((item) => (
-                                     {
-                                            go(item.href);
-                                        }}
-                                    >
-                                        
-                                        {item.label}
-                                        
-                                            {item.description}
-                                        
-                                    
-                                ))}
-                            
-                        );
-                    })}
-                    {(rounds.data?.data.length ?? 0) > 0 && (
-                        
-                            {rounds.data?.data.map((round) => (
-                                 {
-                                        go(`/voting/${round.id}`);
-                                    }}
-                                >
-                                    
-                                    {round.title}
-                                    {roundStatusLabels[round.status]}
-                                
-                            ))}
-                        
-                    )}
-                    {(shots.data?.data.length ?? 0) > 0 && (
-                        
-                            {shots.data?.data.map((shot) => (
-                                 {
-                                        go(`/grabbox/${shot.id}`);
-                                    }}
-                                >
-                                    
-                                    
-                                        {shot.shotCode} · {shot.title}
-                                    
-                                    {shotStatusLabels[shot.status]}
-                                
-                            ))}
-                        
-                    )}
-                    
-                    
-                         {
-                                setTheme(resolvedTheme === "dark" ? "light" : "dark");
-                                setOpen(false);
-                            }}
-                        >
-                            
-                            Toggle light and dark
-                        
-                        {user === null ? (
-                             {
-                                    window.location.assign(loginHref(pathname));
-                                }}
-                            >
-                                
-                                Sign in with Discord
-                            
-                        ) : (
-                             {
-                                    setOpen(false);
-                                    logout.mutate();
-                                }}
-                            >
-                                
-                                Sign out
-                            
-                        )}
-                    
-                
-            
-        
-    );
-}
diff --git a/apps/web/src/Components/Layout/Navigation.ts b/apps/web/src/Components/Layout/Navigation.ts
deleted file mode 100644
index 6347233..0000000
--- a/apps/web/src/Components/Layout/Navigation.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Role } from "@platform/contracts";
-import {
-    Activity,
-    BookOpen,
-    ClipboardCheck,
-    FileText,
-    Gauge,
-    Hammer,
-    Home,
-    LayoutDashboard,
-    ListChecks,
-    Map,
-    UserRound,
-    Users,
-    Vote,
-    type LucideIcon
-} from "lucide-react";
-import type { Route } from "next";
-
-export interface NavigationItem {
-    readonly href: Route;
-    readonly label: string;
-    readonly description: string;
-    readonly icon: LucideIcon;
-    readonly minimumRole?: Role;
-    readonly requiresSession?: boolean;
-    readonly exact?: boolean;
-}
-
-export interface NavigationGroup {
-    readonly label: string;
-    readonly items: readonly NavigationItem[];
-}
-
-export const navigationGroups: readonly NavigationGroup[] = [
-    {
-        label: "Take part",
-        items: [
-            { href: "/", label: "Overview", description: "What's happening on the project right now", icon: Home, exact: true },
-            { href: "/voting", label: "Vote", description: "Pitch ideas and rank your favourites", icon: Vote },
-            { href: "/grabbox", label: "Grab-box", description: "Claim a production task and deliver it", icon: Hammer },
-            { href: "/roadmap", label: "Roadmap", description: "The road from pitch to final mix", icon: Map },
-            { href: "/me", label: "My work", description: "Your role, claims and submissions", icon: UserRound, requiresSession: true }
-        ]
-    },
-    {
-        label: "Learn",
-        items: [{ href: "/guidelines", label: "Guidelines", description: "How voting, contributing and fair play work", icon: BookOpen }]
-    },
-    {
-        label: "Studio",
-        items: [
-            {
-                href: "/studio",
-                label: "Dashboard",
-                description: "Everything waiting on staff",
-                icon: LayoutDashboard,
-                minimumRole: Role.Moderator,
-                exact: true
-            },
-            {
-                href: "/studio/rounds",
-                label: "Rounds",
-                description: "Run voting rounds and moderate entries",
-                icon: ListChecks,
-                minimumRole: Role.Moderator
-            },
-            {
-                href: "/studio/telemetry" as Route,
-                label: "Telemetry",
-                description: "Raid detection, invariance, and ballot network",
-                icon: Activity,
-                minimumRole: Role.Moderator
-            },
-            {
-                href: "/studio/reviews",
-                label: "Reviews",
-                description: "Approve delivered work",
-                icon: ClipboardCheck,
-                minimumRole: Role.Supervisor
-            },
-            {
-                href: "/studio/tasks",
-                label: "Tasks",
-                description: "Create and manage grab-box tasks",
-                icon: Gauge,
-                minimumRole: Role.Supervisor
-            },
-            {
-                href: "/studio/people",
-                label: "People",
-                description: "Roles, specialties and voting access",
-                icon: Users,
-                minimumRole: Role.Moderator
-            },
-            {
-                href: "/studio/content",
-                label: "Content",
-                description: "Edit the guidelines and legal pages",
-                icon: FileText,
-                minimumRole: Role.SuperAdmin
-            }
-        ]
-    }
-];
-
-export const segmentLabels: Readonly> = {
-    voting: "Vote",
-    grabbox: "Grab-box",
-    roadmap: "Roadmap",
-    me: "My work",
-    profile: "Profile",
-    guidelines: "Guidelines",
-    studio: "Studio",
-    rounds: "Rounds",
-    telemetry: "Telemetry",
-    reviews: "Reviews",
-    tasks: "Tasks",
-    people: "People",
-    auth: "Sign in",
-    callback: "Signing in",
-    content: "Content",
-    legal: "Legal",
-    terms: "Terms",
-    privacy: "Privacy",
-    "acceptable-use": "Acceptable use",
-    verify: "Verify"
-};
-
-export function isActivePath(pathname: string, item: NavigationItem): boolean {
-    return item.exact === true ? pathname === item.href : pathname === item.href || pathname.startsWith(`${item.href}/`);
-}
diff --git a/apps/web/src/Components/Layout/TopProgress.tsx b/apps/web/src/Components/Layout/TopProgress.tsx
deleted file mode 100644
index 9fad5fc..0000000
--- a/apps/web/src/Components/Layout/TopProgress.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-"use client";
-
-import { useIsFetching, useIsMutating } from "@tanstack/react-query";
-import { usePathname, useSearchParams } from "next/navigation";
-import { useEffect, useRef, useState, type ReactNode } from "react";
-import { cn } from "@/Lib/Utils";
-
-const showDelayMs = 120;
-const settleMs = 250;
-
-function isInternalNavigation(event: MouseEvent): boolean {
-    if (event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
-        return false;
-    }
-    const anchor = (event.target as Element | null)?.closest("a");
-    if (anchor === null || anchor === undefined || anchor.target === "_blank" || anchor.hasAttribute("download")) {
-        return false;
-    }
-    const url = new URL(anchor.href, window.location.href);
-    return (
-        url.origin === window.location.origin &&
-        !url.pathname.startsWith("/api/") &&
-        !url.pathname.startsWith("/auth/") &&
-        url.pathname + url.search !== window.location.pathname + window.location.search
-    );
-}
-
-export function TopProgress(): ReactNode {
-    const pathname = usePathname();
-    const searchParams = useSearchParams();
-    const fetching = useIsFetching({ predicate: (query) => query.state.data === undefined });
-    const mutating = useIsMutating();
-    const [navigating, setNavigating] = useState(false);
-    const [visible, setVisible] = useState(false);
-    const [width, setWidth] = useState(0);
-    const location = `${pathname}?${searchParams.toString()}`;
-    const lastLocation = useRef(location);
-    const busy = navigating || fetching > 0 || mutating > 0;
-
-    useEffect(() => {
-        const onClick = (event: MouseEvent): void => {
-            if (isInternalNavigation(event)) {
-                setNavigating(true);
-            }
-        };
-        document.addEventListener("click", onClick, true);
-        return () => {
-            document.removeEventListener("click", onClick, true);
-        };
-    }, []);
-
-    useEffect(() => {
-        if (lastLocation.current === location) {
-            return;
-        }
-        lastLocation.current = location;
-        const timer = window.setTimeout(() => {
-            setNavigating(false);
-        }, 0);
-        return () => {
-            window.clearTimeout(timer);
-        };
-    }, [location]);
-
-    useEffect(() => {
-        if (busy) {
-            const show = window.setTimeout(() => {
-                setVisible(true);
-                setWidth((current) => (current < 10 ? 10 : current));
-            }, showDelayMs);
-            const grow = window.setInterval(() => {
-                setWidth((current) => current + (90 - current) * 0.08);
-            }, 200);
-            return () => {
-                window.clearTimeout(show);
-                window.clearInterval(grow);
-            };
-        }
-        const finish = window.setTimeout(() => {
-            setWidth((current) => (current > 0 ? 100 : 0));
-        }, 0);
-        const hide = window.setTimeout(() => {
-            setVisible(false);
-            setWidth(0);
-        }, settleMs);
-        return () => {
-            window.clearTimeout(finish);
-            window.clearTimeout(hide);
-        };
-    }, [busy]);
-
-    return (
-