From ee8f595eccb2bedb472e287f7a52512093d335a2 Mon Sep 17 00:00:00 2001 From: bytedream Date: Sat, 21 Jun 2025 14:45:39 +0200 Subject: [PATCH] add feedback and report things --- .env.example | 2 + astro.config.mjs | 3 + src/actions/feedback.ts | 9 + src/actions/report.ts | 119 +++++++++++- src/app/website/report/AdversarySearch.svelte | 77 ++++++++ src/app/website/report/Dropzone.svelte | 183 ++++++++++++++++++ src/components/admin/search/Search.svelte | 22 ++- src/components/admin/search/TeamSearch.svelte | 17 +- src/components/admin/search/UserSearch.svelte | 17 +- src/components/input/Select.svelte | 4 +- src/components/popup/Popup.svelte | 1 + src/components/popup/Popup.ts | 4 +- src/db/database.sql | 9 + src/db/database.ts | 42 +++- src/db/schema/feedback.ts | 29 ++- src/db/schema/report.ts | 96 ++++++++- src/db/schema/reportAttachment.ts | 39 ++++ src/db/schema/settings.ts | 3 +- src/db/schema/strike.ts | 13 ++ src/db/schema/team.ts | 25 ++- src/db/schema/teamMember.ts | 14 ++ src/pages/feedback/[urlHash].astro | 66 +++++++ src/pages/report/[urlHash].astro | 23 +++ src/pages/report/_draft.astro | 105 ++++++++++ src/pages/report/_submitted.astro | 33 ++++ 25 files changed, 898 insertions(+), 57 deletions(-) create mode 100644 src/app/website/report/AdversarySearch.svelte create mode 100644 src/app/website/report/Dropzone.svelte create mode 100644 src/db/schema/reportAttachment.ts create mode 100644 src/pages/feedback/[urlHash].astro create mode 100644 src/pages/report/[urlHash].astro create mode 100644 src/pages/report/_draft.astro create mode 100644 src/pages/report/_submitted.astro diff --git a/.env.example b/.env.example index 8a842af..2ecc2a7 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,8 @@ ADMIN_USER=admin ADMIN_PASSWORD=admin ADMIN_COOKIE=muelleel +UPLOAD_PATH=/tmp + YOUTUBE_INTRO_LINK=https://www.youtube-nocookie.com/embed/e78_QbTNb4s TEAMSPEAK_LINK=http://example.com DISCORD_LINK=http://example.com diff --git a/astro.config.mjs b/astro.config.mjs index a7a7d21..8029926 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -38,6 +38,9 @@ export default defineConfig({ ADMIN_PASSWORD: envField.string({ context: 'server', access: 'secret', optional: true }), ADMIN_COOKIE: envField.string({ context: 'server', access: 'secret', default: 'muelleel' }), + UPLOAD_PATH: envField.string({ context: 'server', access: 'secret', optional: true }), + MAX_UPLOAD_BYTES: envField.number({ context: 'server', access: 'secret', default: 20 * 1024 * 1024 }), + START_DATE: envField.string({ context: 'server', access: 'secret', default: '1970-01-01' }), WEBHOOK_ENDPOINT: envField.string({ context: 'server', access: 'secret', optional: true }), diff --git a/src/actions/feedback.ts b/src/actions/feedback.ts index f8df930..7678052 100644 --- a/src/actions/feedback.ts +++ b/src/actions/feedback.ts @@ -28,6 +28,15 @@ export const feedback = { }); } }), + submitFeedback: defineAction({ + input: z.object({ + urlHash: z.string(), + content: z.string() + }), + handler: async (input) => { + await db.submitFeedback(input); + } + }), feedbacks: defineAction({ handler: async (_, context) => { Session.actionSessionFromCookies(context.cookies, Permissions.Feedback); diff --git a/src/actions/report.ts b/src/actions/report.ts index 9f47f87..c0a7f29 100644 --- a/src/actions/report.ts +++ b/src/actions/report.ts @@ -1,10 +1,84 @@ -import { defineAction } from 'astro:actions'; +import { ActionError, defineAction } from 'astro:actions'; import { Session } from '@util/session.ts'; import { Permissions } from '@util/permissions.ts'; import { db } from '@db/database.ts'; import { z } from 'astro:schema'; +import { UPLOAD_PATH } from 'astro:env/server'; +import fs from 'node:fs'; +import crypto from 'node:crypto'; +import path from 'node:path'; +import { sendWebhook, WebhookAction } from '@util/webhook.ts'; export const report = { + submitReport: defineAction({ + input: z.object({ + urlHash: z.string(), + reason: z.string(), + body: z.string(), + files: z.array(z.instanceof(File)).nullable() + }), + handler: async (input) => { + const report = await db.getReportByUrlHash({ urlHash: input.urlHash }); + if (!report) { + throw new ActionError({ + code: 'NOT_FOUND' + }); + } + + if (!UPLOAD_PATH) { + throw new ActionError({ + code: 'FORBIDDEN', + message: 'Es dürfen keine Anhänge hochgeladen werden' + }); + } + + const filePaths = [] as string[]; + try { + await db.transaction(async (tx) => { + for (const file of input.files ?? []) { + const uuid = crypto.randomUUID(); + const tmpFilePath = path.join(UPLOAD_PATH!, uuid); + const tmpFileStream = fs.createWriteStream(tmpFilePath); + + filePaths.push(tmpFilePath); + + const md5Hash = crypto.createHash('md5'); + + for await (const chunk of file.stream()) { + md5Hash.update(chunk); + tmpFileStream.write(chunk); + } + + const hash = md5Hash.digest('hex'); + const filePath = path.join(UPLOAD_PATH!, hash); + + await tx.addReportAttachment({ + type: 'video', + hash: hash, + reportId: report.id + }); + + fs.renameSync(tmpFilePath, filePath); + filePaths.pop(); + filePaths.push(filePath); + } + + await tx.submitReport({ + urlHash: input.urlHash, + reason: input.reason, + body: input.body + }); + }); + } catch (e) { + for (const filePath of filePaths) { + fs.rmSync(filePath); + } + + throw e; + } + }, + accept: 'form' + }), addReport: defineAction({ input: z.object({ reason: z.string(), @@ -19,7 +93,7 @@ export const report = { const { id } = await db.addReport({ reason: input.reason, body: input.body, - createdAt: input.createdAt, + createdAt: input.createdAt ? new Date(input.createdAt) : null, reporterTeamId: input.reporter, reportedTeamId: input.reported }); @@ -52,6 +126,9 @@ export const report = { handler: async (input, context) => { Session.actionSessionFromCookies(context.cookies, Permissions.Reports); + let preReportStrike; + if (input.status === 'closed') preReportStrike = await db.getStrikeByReportId({ reportId: input.reportId }); + await db.transaction(async (tx) => { await tx.editReportStatus(input); @@ -62,6 +139,20 @@ export const report = { }); } }); + + if (input.status === 'closed' && preReportStrike?.strikeReasonId != input.strikeReasonId) { + const report = await db.getReportById({ id: input.reportId }); + if (report.reported) { + const strikes = await db.getStrikesByTeamId({ teamId: report.reported.id }); + const teamMembers = await db.getTeamMembersByTeamId({ teamId: report.reported.id }); + + // send webhook in background + sendWebhook(WebhookAction.Strike, { + users: teamMembers.map((tm) => tm.user.uuid!), + totalWeight: strikes.map((strike) => strike.reason.weight).reduce((a, b) => a + b, 0) + }); + } + } } }), reports: defineAction({ @@ -118,5 +209,29 @@ export const report = { strikeReasons: await db.getStrikeReasons({}) }; } + }), + teamNamesByUsername: defineAction({ + input: z.object({ + username: z.string().nullish() + }), + handler: async (input) => { + const teams = await db.getTeamsByUsername({ username: input.username ?? '', limit: 5 }); + + return { + teamNames: teams.map((team) => ({ name: team.user.username, value: team.team.name })) + }; + } + }), + teamNamesByTeamName: defineAction({ + input: z.object({ + teamName: z.string().nullish() + }), + handler: async (input) => { + const teams = await db.getTeams({ name: input.teamName, limit: 5 }); + + return { + teamNames: teams.map((team) => ({ name: team.name, value: team.name })) + }; + } }) }; diff --git a/src/app/website/report/AdversarySearch.svelte b/src/app/website/report/AdversarySearch.svelte new file mode 100644 index 0000000..81023ab --- /dev/null +++ b/src/app/website/report/AdversarySearch.svelte @@ -0,0 +1,77 @@ + + +
+
+ + + setTimeout(() => (previewUploadFile = null), 300)}> +
+ {#if previewUploadFile?.type === 'image'} + {previewUploadFile.name} + {:else if previewUploadFile?.type === 'video'} + + + {/if} +
+
+ + +
+ diff --git a/src/components/admin/search/Search.svelte b/src/components/admin/search/Search.svelte index 26ceebc..e21261c 100644 --- a/src/components/admin/search/Search.svelte +++ b/src/components/admin/search/Search.svelte @@ -8,9 +8,9 @@ required?: boolean; mustMatch?: boolean; - requestSuggestions: (query: string, limit: number) => Promise; + requestSuggestions: (query: string, limit: number) => Promise<{ name: string; value: string }[]>; - onSubmit?: (value: string | null) => void; + onSubmit?: (value: { name: string; value: string } | null) => void; } // html bindings @@ -21,7 +21,7 @@ // states let inputValue = $derived(value); - let suggestions = $state([]); + let suggestions = $state<{ name: string; value: string }[]>([]); let matched = $state(false); // callbacks @@ -34,9 +34,9 @@ suggestions = await requestSuggestions(inputValue ?? '', 5); - let suggestion = suggestions.find((s) => s === inputValue); + let suggestion = suggestions.find((s) => s.name === inputValue); if (suggestion != null) { - inputValue = value = suggestion; + inputValue = value = suggestion.name; matched = true; onSubmit?.(suggestion); } else if (!mustMatch) { @@ -49,8 +49,10 @@ } } - function onSuggestionClick(suggestion: string) { - inputValue = value = suggestion; + function onSuggestionClick(name: string) { + const suggestion = suggestions.find((s) => s.name === name)!; + + inputValue = value = suggestion.name; suggestions = []; onSubmit?.(suggestion); } @@ -77,7 +79,7 @@ bind:value={inputValue} oninput={() => onSearchInput()} onfocusin={() => onSearchInput()} - pattern={mustMatch && matched ? `^(${suggestions.join('|')})$` : undefined} + pattern={mustMatch && matched ? `^(${suggestions.map((s) => s.name).join('|')})$` : undefined} /> {#if suggestions.length > 0}
    @@ -85,8 +87,8 @@
  • onSuggestionClick(suggestion.name)}>{suggestion.name}
    • {/each} diff --git a/src/components/admin/search/TeamSearch.svelte b/src/components/admin/search/TeamSearch.svelte index 828d6fb..68d146a 100644 --- a/src/components/admin/search/TeamSearch.svelte +++ b/src/components/admin/search/TeamSearch.svelte @@ -20,9 +20,6 @@ // inputs let { id, value = $bindable(), label, readonly, required, mustMatch, onSubmit }: Props = $props(); - // states - let teamSuggestionCache = $state([]); - // functions async function getSuggestions(query: string, limit: number) { const { data, error } = await actions.team.teams({ @@ -35,17 +32,7 @@ return []; } - teamSuggestionCache = data.teams; - return teamSuggestionCache.map((team) => team.name); - } - - async function getTeamByTeamName(teamName: string) { - let team = teamSuggestionCache.find((team) => team.name === teamName); - if (!team) { - await getSuggestions(teamName, 5); - return await getTeamByTeamName(teamName); - } - return team; + return data.teams.map((team) => ({ name: team.name, value: team })); } @@ -57,5 +44,5 @@ {required} {mustMatch} requestSuggestions={async (teamName) => getSuggestions(teamName, 5)} - onSubmit={async (teamName) => onSubmit?.(teamName != null ? await getTeamByTeamName(teamName) : null)} + onSubmit={async (suggestion) => onSubmit?.(suggestion != null ? suggestion.value : null)} /> diff --git a/src/components/admin/search/UserSearch.svelte b/src/components/admin/search/UserSearch.svelte index 90b39b9..c406fee 100644 --- a/src/components/admin/search/UserSearch.svelte +++ b/src/components/admin/search/UserSearch.svelte @@ -20,9 +20,6 @@ // inputs let { id, value = $bindable(), label, readonly, required, mustMatch, onSubmit }: Props = $props(); - // states - let userSuggestionCache = $state([]); - // functions async function getSuggestions(query: string, limit: number) { const { data, error } = await actions.user.users({ @@ -35,17 +32,7 @@ return []; } - userSuggestionCache = data.users; - return userSuggestionCache.map((user) => user.username); - } - - async function getUserByUsername(username: string) { - let user = userSuggestionCache.find((user) => user.username === username); - if (!user) { - await getSuggestions(username, 5); - return await getUserByUsername(username); - } - return user; + return data.users.map((user) => ({ name: user.username, value: user })); } @@ -57,5 +44,5 @@ {required} {mustMatch} requestSuggestions={async (username) => getSuggestions(username, 5)} - onSubmit={async (username) => onSubmit?.(username != null ? await getUserByUsername(username) : null)} + onSubmit={async (suggestion) => onSubmit?.(suggestion != null ? suggestion.value : null)} /> diff --git a/src/components/input/Select.svelte b/src/components/input/Select.svelte index 9c057cd..1332852 100644 --- a/src/components/input/Select.svelte +++ b/src/components/input/Select.svelte @@ -56,8 +56,8 @@ {#if defaultValue != null} {/if} - {#each Object.entries(values) as [value, label] (value)} - + {#each Object.entries(values) as [v, label] (v)} + {/each}

    diff --git a/src/components/popup/Popup.svelte b/src/components/popup/Popup.svelte index c6362c2..c7d00f2 100644 --- a/src/components/popup/Popup.svelte +++ b/src/components/popup/Popup.svelte @@ -14,6 +14,7 @@ // callbacks function onModalClose() { + $popupState?.onClose?.(); setTimeout(() => ($popupState = null), 300); } diff --git a/src/components/popup/Popup.ts b/src/components/popup/Popup.ts index 76f92ec..07b5c5a 100644 --- a/src/components/popup/Popup.ts +++ b/src/components/popup/Popup.ts @@ -1,3 +1,5 @@ import { atom } from 'nanostores'; -export const popupState = atom<{ type: 'info' | 'error'; title: string; message: string } | null>(null); +export const popupState = atom<{ type: 'info' | 'error'; title: string; message: string; onClose?: () => void } | null>( + null +); diff --git a/src/db/database.sql b/src/db/database.sql index 51f799c..b4ae7a5 100644 --- a/src/db/database.sql +++ b/src/db/database.sql @@ -81,6 +81,15 @@ CREATE TABLE IF NOT EXISTS report ( FOREIGN KEY (reported_team_id) REFERENCES team(id) ON DELETE CASCADE ); +-- report attachment +CREATE TABLE IF NOT EXISTS report_attachment ( + id INT AUTO_INCREMENT PRIMARY KEY, + type ENUM('image', 'video') NOT NULL, + hash CHAR(32) NOT NULL, + report_id INT NOT NULL, + FOREIGN KEY (report_id) REFERENCES report(id) ON DELETE CASCADE +); + -- report status CREATE TABLE IF NOT EXISTS report_status ( status ENUM('open', 'closed'), diff --git a/src/db/database.ts b/src/db/database.ts index dd662b8..ea6d75c 100644 --- a/src/db/database.ts +++ b/src/db/database.ts @@ -30,7 +30,9 @@ import { type EditTeamReq, editTeam, type GetTeamsFullReq, - getTeamsFull + getTeamsFull, + type GetTeamsByUsernameReq, + getTeamsByUsername } from './schema/team'; import { addTeamDraft, @@ -48,6 +50,8 @@ import { type AddTeamMemberReq, deleteTeamMemberByTeamId, type DeleteTeamMemberByTeamIdReq, + getTeamMembersByTeamId, + type GetTeamMembersByTeamIdReq, teamMember } from './schema/teamMember'; import { @@ -93,10 +97,26 @@ import { addUserFeedbacks, type AddUserFeedbacksReq, feedback, + getFeedbackByUrlHash, + type GetFeedbackByUrlHash, getFeedbacks, - type GetFeedbacksReq + type GetFeedbacksReq, + submitFeedback, + type SubmitFeedbackReq } from './schema/feedback.ts'; -import { addReport, type AddReportReq, getReports, type GetReportsReq, report } from './schema/report.ts'; +import { + addReport, + type AddReportReq, + getReportById, + type GetReportById, + getReportByUrlHash, + type GetReportByUrlHash, + getReports, + type GetReportsReq, + report, + submitReport, + type SubmitReportReq +} from './schema/report.ts'; import { DATABASE_URI } from 'astro:env/server'; import { type GetStrikeReasonsReq, @@ -112,6 +132,8 @@ import { import { editStrike, type EditStrikeReq, + getStrikeByReportId, + type GetStrikeByReportIdReq, getStrikesByTeamId, type GetStrikesByTeamIdReq, strike @@ -136,6 +158,7 @@ import { type DeleteBlockedUserReq, deleteBlockedUser } from '@db/schema/blockedUser.ts'; +import { addReportAttachment, type AddReportAttachmentReq, reportAttachment } from '@db/schema/reportAttachment.ts'; export class Database { protected readonly db: MySql2Database<{ @@ -147,6 +170,7 @@ export class Database { blockedUser: typeof blockedUser; death: typeof death; report: typeof report; + reportAttachment: typeof reportAttachment; reportStatus: typeof reportStatus; strike: typeof strike; strikeReason: typeof strikeReason; @@ -174,6 +198,7 @@ export class Database { blockedUser, death, report, + reportAttachment, reportStatus, strike, strikeReason, @@ -223,6 +248,7 @@ export class Database { getTeamById = (values: GetTeamByIdReq) => getTeamById(this.db, values); getTeamByName = (values: GetTeamByNameReq) => getTeamByName(this.db, values); getTeamByUserUuid = (values: GetTeamByUserUuidReq) => getTeamByUserUuid(this.db, values); + getTeamsByUsername = (values: GetTeamsByUsernameReq) => getTeamsByUsername(this.db, values); /* team draft */ addTeamDraft = (values: AddTeamDraftReq) => addTeamDraft(this.db, values); @@ -233,6 +259,7 @@ export class Database { /* team member */ addTeamMember = (values: AddTeamMemberReq) => addTeamMember(this.db, values); deleteTeamMemberByTeamId = (values: DeleteTeamMemberByTeamIdReq) => deleteTeamMemberByTeamId(this.db, values); + getTeamMembersByTeamId = (values: GetTeamMembersByTeamIdReq) => getTeamMembersByTeamId(this.db, values); /* death */ addDeath = (values: AddDeathReq) => addDeath(this.db, values); @@ -241,7 +268,13 @@ export class Database { /* report */ addReport = (values: AddReportReq) => addReport(this.db, values); + submitReport = (values: SubmitReportReq) => submitReport(this.db, values); getReports = (values: GetReportsReq) => getReports(this.db, values); + getReportById = (values: GetReportById) => getReportById(this.db, values); + getReportByUrlHash = (values: GetReportByUrlHash) => getReportByUrlHash(this.db, values); + + /* report attachment */ + addReportAttachment = (values: AddReportAttachmentReq) => addReportAttachment(this.db, values); /* report status */ getReportStatus = (values: GetReportStatusReq) => getReportStatus(this.db, values); @@ -255,12 +288,15 @@ export class Database { /* strikes */ editStrike = (values: EditStrikeReq) => editStrike(this.db, values); + getStrikeByReportId = (values: GetStrikeByReportIdReq) => getStrikeByReportId(this.db, values); getStrikesByTeamId = (values: GetStrikesByTeamIdReq) => getStrikesByTeamId(this.db, values); /* feedback */ addFeedback = (values: AddFeedbackReq) => addFeedback(this.db, values); addUserFeedbacks = (values: AddUserFeedbacksReq) => addUserFeedbacks(this.db, values); + submitFeedback = (values: SubmitFeedbackReq) => submitFeedback(this.db, values); getFeedbacks = (values: GetFeedbacksReq) => getFeedbacks(this.db, values); + getFeedbackByUrlHash = (values: GetFeedbackByUrlHash) => getFeedbackByUrlHash(this.db, values); /* settings */ getSettings = (values: GetSettingsReq) => getSettings(this.db, values); diff --git a/src/db/schema/feedback.ts b/src/db/schema/feedback.ts index 3d9175d..f3aae84 100644 --- a/src/db/schema/feedback.ts +++ b/src/db/schema/feedback.ts @@ -12,7 +12,7 @@ export const feedback = mysqlTable('feedback', { title: varchar('title', { length: 255 }), content: text('content'), urlHash: varchar('url_hash', { length: 255 }).unique().notNull(), - lastChanged: timestamp('last_changed', { mode: 'date' }).notNull().defaultNow(), + lastChanged: timestamp('last_changed', { mode: 'date' }).notNull().defaultNow().onUpdateNow(), userId: int('user_id').references(() => user.id) }); @@ -27,8 +27,17 @@ export type AddUserFeedbacksReq = { uuids: string[]; }; +export type SubmitFeedbackReq = { + urlHash: string; + content: string; +}; + export type GetFeedbacksReq = {}; +export type GetFeedbackByUrlHash = { + urlHash: string; +}; + export async function addFeedback(db: Database, values: AddFeedbackReq) { return db.insert(feedback).values({ event: values.event, @@ -58,8 +67,16 @@ export async function addUserFeedbacks(db: Database, values: AddUserFeedbacksReq return userFeedbacks; } -// eslint-disable-next-line @typescript-eslint/no-unused-vars -export async function getFeedbacks(db: Database, values: GetFeedbacksReq) { +export async function submitFeedback(db: Database, values: SubmitFeedbackReq) { + return db + .update(feedback) + .set({ + content: values.content + }) + .where(eq(feedback.urlHash, values.urlHash)); +} + +export async function getFeedbacks(db: Database, _values: GetFeedbacksReq) { return db .select({ id: feedback.id, @@ -73,3 +90,9 @@ export async function getFeedbacks(db: Database, values: GetFeedbacksReq) { .from(feedback) .leftJoin(user, eq(feedback.userId, user.id)); } + +export async function getFeedbackByUrlHash(db: Database, values: GetFeedbackByUrlHash) { + return db.query.feedback.findFirst({ + where: eq(feedback.urlHash, values.urlHash) + }); +} diff --git a/src/db/schema/report.ts b/src/db/schema/report.ts index d79f729..07e02c1 100644 --- a/src/db/schema/report.ts +++ b/src/db/schema/report.ts @@ -13,7 +13,7 @@ export const report = mysqlTable('report', { reason: varchar('reason', { length: 255 }).notNull(), body: text('body'), urlHash: varchar('url_hash', { length: 255 }).notNull(), - createdAt: timestamp('created_at', { mode: 'string' }), + createdAt: timestamp('created_at', { mode: 'date' }), reporterTeamId: int('reporter_team_id').references(() => team.id), reportedTeamId: int('reported_team_id').references(() => team.id) }); @@ -21,16 +21,30 @@ export const report = mysqlTable('report', { export type AddReportReq = { reason: string; body: string | null; - createdAt?: string | null; + createdAt?: Date | null; reporterTeamId?: number; reportedTeamId?: number | null; }; +export type SubmitReportReq = { + urlHash: string; + reason: string; + body: string; +}; + export type GetReportsReq = { reporter?: string | null; reported?: string | null; }; +export type GetReportById = { + id: number; +}; + +export type GetReportByUrlHash = { + urlHash: string; +}; + export async function addReport(db: Database, values: AddReportReq) { const urlHash = generateRandomString(16); @@ -49,6 +63,17 @@ export async function addReport(db: Database, values: AddReportReq) { return Object.assign(r[0], { url: `${BASE_PATH}/report/${urlHash}` }); } +export async function submitReport(db: Database, values: SubmitReportReq) { + return db + .update(report) + .set({ + reason: values.reason, + body: values.body, + createdAt: new Date() + }) + .where(eq(report.urlHash, values.urlHash)); +} + export async function getReports(db: Database, values: GetReportsReq) { const reporterTeam = alias(team, 'reporter'); const reportedTeam = alias(team, 'reported'); @@ -101,3 +126,70 @@ export async function getReports(db: Database, values: GetReportsReq) { ) ); } + +export async function getReportById(db: Database, values: GetReportById) { + const reporterTeam = alias(team, 'reporter'); + const reportedTeam = alias(team, 'reported'); + + const reports = await db + .select({ + id: report.id, + reason: report.reason, + body: report.body, + createdAt: report.createdAt, + reporter: { + id: reporterTeam.id, + name: reporterTeam.name + }, + reported: { + id: reportedTeam.id, + name: reportedTeam.name + }, + status: { + status: reportStatus.status, + notice: reportStatus.notice, + statement: reportStatus.statement + } + }) + .from(report) + .innerJoin(reporterTeam, eq(report.reporterTeamId, reporterTeam.id)) + .leftJoin(reportedTeam, eq(report.reportedTeamId, reportedTeam.id)) + .leftJoin(reportStatus, eq(report.id, reportStatus.reportId)) + .where(eq(report.id, values.id)); + + return reports[0] ?? null; +} + +export async function getReportByUrlHash(db: Database, values: GetReportByUrlHash) { + const reporterTeam = alias(team, 'reporter'); + const reportedTeam = alias(team, 'reported'); + + const reports = await db + .select({ + id: report.id, + reason: report.reason, + body: report.body, + createdAt: report.createdAt, + urlHash: report.urlHash, + reporter: { + id: reporterTeam.id, + name: reporterTeam.name + }, + reported: { + id: reportedTeam.id, + name: reportedTeam.name + }, + status: { + status: reportStatus.status, + notice: reportStatus.notice, + statement: reportStatus.statement + } + }) + .from(report) + .innerJoin(reporterTeam, eq(report.reporterTeamId, reporterTeam.id)) + .leftJoin(reportedTeam, eq(report.reportedTeamId, reportedTeam.id)) + .leftJoin(reportStatus, eq(report.id, reportStatus.reportId)) + .where(eq(report.urlHash, values.urlHash)); + + return reports[0] ?? null; +} diff --git a/src/db/schema/reportAttachment.ts b/src/db/schema/reportAttachment.ts new file mode 100644 index 0000000..ce0e134 --- /dev/null +++ b/src/db/schema/reportAttachment.ts @@ -0,0 +1,39 @@ +import { char, int, mysqlEnum, mysqlTable } from 'drizzle-orm/mysql-core'; +import { report } from '@db/schema/report.ts'; +import type { MySql2Database } from 'drizzle-orm/mysql2'; +import { eq } from 'drizzle-orm'; + +type Database = MySql2Database<{ reportAttachment: typeof reportAttachment }>; + +export const reportAttachment = mysqlTable('report_attachment', { + type: mysqlEnum('type', ['image', 'video']), + hash: char('hash', { length: 32 }), + reportId: int('report_id') + .notNull() + .references(() => report.id) +}); + +export type AddReportAttachmentReq = { + type: 'image' | 'video'; + hash: string; + reportId: number; +}; + +export type GetReportAttachmentsReq = { + reportId: number; + fileIds: number[]; +}; + +export async function addReportAttachment(db: Database, values: AddReportAttachmentReq) { + await db.insert(reportAttachment).values(values); +} + +export async function getReportAttachments(db: Database, values: GetReportAttachmentsReq) { + return db + .select({ + type: reportAttachment.type, + hash: reportAttachment.hash + }) + .from(reportAttachment) + .where(eq(reportAttachment.reportId, values.reportId)); +} diff --git a/src/db/schema/settings.ts b/src/db/schema/settings.ts index 14f651c..502fd8a 100644 --- a/src/db/schema/settings.ts +++ b/src/db/schema/settings.ts @@ -34,7 +34,8 @@ export async function getSettings(db: Database, values: GetSettingsReq) { export async function setSettings(db: Database, values: SetSettingsReq) { return db.transaction(async (tx) => { for (const setting of values.settings) { - await tx.insert(settings) + await tx + .insert(settings) .values(setting) .onDuplicateKeyUpdate({ set: { diff --git a/src/db/schema/strike.ts b/src/db/schema/strike.ts index 14df30e..2a86a9a 100644 --- a/src/db/schema/strike.ts +++ b/src/db/schema/strike.ts @@ -22,6 +22,10 @@ export type EditStrikeReq = { strikeReasonId: number; }; +export type GetStrikeByReportIdReq = { + reportId: number; +}; + export type GetStrikesByTeamIdReq = { teamId: number; }; @@ -42,6 +46,15 @@ export async function editStrike(db: Database, values: EditStrikeReq) { }); } +export async function getStrikeByReportId(db: Database, values: GetStrikeByReportIdReq) { + return db.query.strike.findFirst({ + with: { + strikeReason: true + }, + where: eq(strike.reportId, values.reportId) + }); +} + export async function getStrikesByTeamId(db: Database, values: GetStrikesByTeamIdReq) { return db .select({ diff --git a/src/db/schema/team.ts b/src/db/schema/team.ts index 128328c..c731875 100644 --- a/src/db/schema/team.ts +++ b/src/db/schema/team.ts @@ -1,6 +1,6 @@ import { char, int, mysqlTable, timestamp, varchar } from 'drizzle-orm/mysql-core'; import type { MySql2Database } from 'drizzle-orm/mysql2'; -import { aliasedTable, and, asc, desc, eq, like, sql } from 'drizzle-orm'; +import { aliasedTable, and, asc, desc, eq, like, or, sql } from 'drizzle-orm'; import { teamMember } from './teamMember.ts'; import { user } from './user.ts'; import { teamDraft } from './teamDraft.ts'; @@ -49,6 +49,11 @@ export type GetTeamByUserUuidReq = { uuid: string; }; +export type GetTeamsByUsernameReq = { + username: string; + limit?: number; +}; + export async function addTeam(db: Database, values: AddTeamReq) { let color = values.color; if (!color) { @@ -122,8 +127,10 @@ export async function getTeams(db: Database, values: GetTeamsReq) { .where( and( values?.name != null ? like(team.name, `%${values.name}%`) : undefined, - values?.username != null ? like(teamDraft.memberOneName, `%${values.username}%`) : undefined, - values?.username != null ? like(teamDraft.memberTwoName, `%${values.username}%`) : undefined + or( + values?.username != null ? like(teamDraft.memberOneName, `%${values.username}%`) : undefined, + values?.username != null ? like(teamDraft.memberTwoName, `%${values.username}%`) : undefined + ) ) ) .orderBy(asc(team.id)) @@ -182,6 +189,18 @@ export async function getTeamByUserUuid(db: Database, values: GetTeamByUserUuidR return teams[0] ?? null; } +export async function getTeamsByUsername(db: Database, values: GetTeamsByUsernameReq) { + return db + .select({ + user: user, + team: team + }) + .from(user) + .where(like(user.username, `%${values.username}%`)) + .innerJoin(teamMember, eq(user.id, teamMember.userId)) + .innerJoin(team, eq(teamMember.teamId, team.id)); +} + const teamColors = [ '#cd853f', '#ff7f50', diff --git a/src/db/schema/teamMember.ts b/src/db/schema/teamMember.ts index e83637e..2aefac8 100644 --- a/src/db/schema/teamMember.ts +++ b/src/db/schema/teamMember.ts @@ -24,6 +24,10 @@ export type DeleteTeamMemberByTeamIdReq = { teamId: number; }; +export type GetTeamMembersByTeamIdReq = { + teamId: number; +}; + export async function addTeamMember(db: Database, values: AddTeamMemberReq) { const teamMemberIds = await db.insert(teamMember).values(values).$returningId(); @@ -33,3 +37,13 @@ export async function addTeamMember(db: Database, values: AddTeamMemberReq) { export async function deleteTeamMemberByTeamId(db: Database, values: DeleteTeamMemberByTeamIdReq) { await db.delete(teamMember).where(eq(teamMember.teamId, values.teamId)); } + +export async function getTeamMembersByTeamId(db: Database, values: GetTeamMembersByTeamIdReq) { + return db + .select({ + user: user + }) + .from(teamMember) + .innerJoin(user, eq(teamMember.userId, user.id)) + .where(eq(teamMember.teamId, values.teamId)); +} diff --git a/src/pages/feedback/[urlHash].astro b/src/pages/feedback/[urlHash].astro new file mode 100644 index 0000000..150b162 --- /dev/null +++ b/src/pages/feedback/[urlHash].astro @@ -0,0 +1,66 @@ +--- +import WebsiteLayout from '@layouts/website/WebsiteLayout.astro'; +import Input from '@components/input/Input.svelte'; +import Textarea from '@components/input/Textarea.svelte'; +import { db } from '@db/database.ts'; + +const { urlHash } = Astro.params; + +const feedback = urlHash ? await db.getFeedbackByUrlHash({ urlHash: urlHash }) : null; + +if (!feedback) { + return new Response(null, { status: 404 }); +} +--- + + +

    +
    +

    Feedback

    +
    +
    + +