Compare commits

..

5 Commits

Author SHA1 Message Date
naomi e728968fc9 feat: add comment report management to admin interface
Updated the admin-reports component to handle both profile and comment reports:
- Added report type toggle to switch between profile and comment reports
- Duplicated report display logic for comment reports
- Comment reports show the comment content with truncation
- Added separate review modals for profile and comment reports
- Comment reports display comment author instead of reported user
- Maintains all existing functionality for profile reports

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-02-19 19:32:02 -08:00
hikari e1bac9fd3e feat: integrate CommentDisplayComponent into all remaining media components
Completed the integration of the shared CommentDisplayComponent across all media list views.

Updated Components:
- books-list.component.ts
- music-list.component.ts
- art-gallery.component.ts
- shows-list.component.ts
- manga-list.component.ts

All components now:
- Use the centralized CommentDisplayComponent for consistent UI
- Support comment reporting via the Report button
- Display pending review messages for reported comments
- Handle comment editing through the shared component

This completes the frontend integration for comment reporting across all media types!
2026-02-19 19:11:51 -08:00
hikari c514849f12 feat: implement comment reporting system
Added comprehensive comment reporting infrastructure similar to profile reporting.

API Changes:
- New CommentReport model in Prisma schema with relations to User and Comment
- CommentReportService with CRUD operations, duplicate prevention, and rate limiting
- API routes at /comment-reports for creating and managing comment reports
- Updated CommentService to include hasPendingReports flag for all comments

Frontend Changes:
- Created shared CommentDisplayComponent for reusable comment display with report button
- Updated ReportModalComponent to handle both profile and comment reports
- CommentReportService for API communication
- Integrated CommentDisplayComponent into games-list component
- Comments with pending reports show "[comment pending admin review]" message

Features:
- Users can report comments they didn't write
- Duplicate prevention (one pending report per comment per user)
- Rate limiting (5 pending reports maximum per user)
- Admins can review and action comment reports
- Comments are hidden during review to prevent abuse

Remaining Work:
- Need to integrate CommentDisplayComponent into remaining media components (books, music, art, shows, manga)
- Need to extend admin-reports page to display comment reports alongside profile reports
2026-02-19 19:06:49 -08:00
hikari 8f569e0bb4 chore: add missing pieces for profile reporting and fix formatting
- Added Reports link to admin dropdown menu
- Fixed log route path (changed from '/log' to '/')
- Exported report types from shared-types index
- Fixed whitespace alignment in auth and game types
- Fixed formatting in e2e test files (newlines, comment style)
2026-02-19 18:38:16 -08:00
hikari d797d38ddd feat: implement profile reporting system with admin review
Added comprehensive profile reporting system to allow users to report
inappropriate profiles and admins to review reports.

Features:
- User can report profiles with predefined reasons + custom details
- Duplicate prevention (one pending report per profile per user)
- Rate limiting (5 pending reports maximum per user)
- Admin dashboard to view and filter reports (All, Pending, Reviewed, etc.)
- Admin review modal to update status and add review notes
- Report button on profile page (only visible when viewing others)
- Font Awesome icons for better UI consistency

Database changes:
- New ProfileReport model with ReportReason/ReportStatus enums
- User relations for reports (reportsMade, reportsReceived, reportsReviewed)
- Indices for efficient querying
2026-02-19 18:33:58 -08:00
31 changed files with 3716 additions and 396 deletions
+63
View File
@@ -205,6 +205,11 @@ model User {
suggestions Suggestion[]
likes Like[]
refreshTokens RefreshToken[]
reportsMade ProfileReport[] @relation("Reporter")
reportsReceived ProfileReport[] @relation("ReportedUser")
reportsReviewed ProfileReport[] @relation("Reviewer")
commentReportsMade CommentReport[] @relation("CommentReporter")
commentReportsReviewed CommentReport[] @relation("CommentReviewer")
@@index([slug], map: "User_slug_key")
}
@@ -227,6 +232,7 @@ model Comment {
show Show? @relation(fields: [showId], references: [id])
mangaId String? @db.ObjectId
manga Manga? @relation(fields: [mangaId], references: [id])
reports CommentReport[]
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}
@@ -329,3 +335,60 @@ model RefreshToken {
@@index([userId])
@@index([expiresAt])
}
enum ReportReason {
INAPPROPRIATE_CONTENT
HARASSMENT
SPAM
IMPERSONATION
OFFENSIVE_NAME
MALICIOUS_LINKS
OTHER
}
enum ReportStatus {
PENDING
REVIEWED
DISMISSED
ACTION_TAKEN
}
model ProfileReport {
id String @id @default(auto()) @map("_id") @db.ObjectId
reportedUserId String @db.ObjectId
reportedUser User @relation("ReportedUser", fields: [reportedUserId], references: [id])
reporterId String @db.ObjectId
reporter User @relation("Reporter", fields: [reporterId], references: [id])
reason ReportReason
details String
status ReportStatus @default(PENDING)
reviewedBy String? @db.ObjectId
reviewer User? @relation("Reviewer", fields: [reviewedBy], references: [id])
reviewNotes String?
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
@@index([reportedUserId])
@@index([reporterId])
@@index([status])
}
model CommentReport {
id String @id @default(auto()) @map("_id") @db.ObjectId
reportedCommentId String @db.ObjectId
reportedComment Comment @relation(fields: [reportedCommentId], references: [id])
reporterId String @db.ObjectId
reporter User @relation("CommentReporter", fields: [reporterId], references: [id])
reason ReportReason
details String
status ReportStatus @default(PENDING)
reviewedBy String? @db.ObjectId
reviewer User? @relation("CommentReviewer", fields: [reviewedBy], references: [id])
reviewNotes String?
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
@@index([reportedCommentId])
@@index([reporterId])
@@index([status])
}
+140
View File
@@ -0,0 +1,140 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { FastifyPluginAsync } from "fastify";
import type {
CreateCommentReportDto,
CommentReportWithDetails,
ReportStatus,
UpdateCommentReportDto,
} from "@library/shared-types";
import { ReportReason } from "@library/shared-types";
import { CommentReportService } from "../../services/comment-report.service.js";
import { adminGuard } from "../../middleware/admin-guard.js";
const commentReportsRoutes: FastifyPluginAsync = async (fastify) => {
const commentReportService = new CommentReportService();
// Create a new comment report (authenticated users)
fastify.post<{
Body: CreateCommentReportDto;
Reply: CommentReportWithDetails | { error: string };
}>(
"/",
{
preValidation: [fastify.authenticate],
schema: {
body: {
type: "object",
required: ["reportedCommentId", "reason", "details"],
properties: {
reportedCommentId: { type: "string" },
reason: {
type: "string",
enum: Object.values(ReportReason),
},
details: { type: "string", minLength: 10, maxLength: 1000 },
},
},
},
},
async (request, reply) => {
try {
const report = await commentReportService.createReport(
request.user.id,
request.body,
);
return reply.status(201).send(report);
} catch (error) {
if (
error instanceof Error &&
(error.message.includes("already have a pending report") ||
error.message.includes("maximum number of pending reports"))
) {
return reply.status(409).send({ error: error.message });
}
throw error;
}
},
);
// Get all comment reports (admin only)
fastify.get<{
Querystring: { status?: ReportStatus };
Reply: CommentReportWithDetails[];
}>(
"/",
{
preValidation: [fastify.authenticate, adminGuard],
schema: {
querystring: {
type: "object",
properties: {
status: { type: "string" },
},
},
},
},
async (request, reply) => {
const reports = await commentReportService.getAllReports(
request.query.status,
);
return reply.send(reports);
},
);
// Get a single comment report by ID (admin only)
fastify.get<{
Params: { id: string };
Reply: CommentReportWithDetails | { error: string };
}>(
"/:id",
{
preValidation: [fastify.authenticate, adminGuard],
},
async (request, reply) => {
const report = await commentReportService.getReportById(request.params.id);
if (!report) {
return reply.status(404).send({ error: "Report not found" });
}
return reply.send(report);
},
);
// Update a comment report (admin only)
fastify.put<{
Params: { id: string };
Body: UpdateCommentReportDto;
Reply: CommentReportWithDetails;
}>(
"/:id",
{
preValidation: [fastify.authenticate, adminGuard],
schema: {
body: {
type: "object",
required: ["status"],
properties: {
status: { type: "string" },
reviewNotes: { type: "string", maxLength: 1000 },
},
},
},
},
async (request, reply) => {
const report = await commentReportService.updateReport(
request.params.id,
request.user.id,
request.body,
);
return reply.send(report);
},
);
};
export default commentReportsRoutes;
+1 -1
View File
@@ -19,7 +19,7 @@ interface LogBody {
}
export default async function (fastify: FastifyInstance) {
fastify.post('/log', async function (request: FastifyRequest<{ Body: LogBody }>) {
fastify.post('/', async function (request: FastifyRequest<{ Body: LogBody }>) {
const { level, message, context, error } = request.body;
if (level === 'error' && error) {
+139
View File
@@ -0,0 +1,139 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { FastifyPluginAsync } from "fastify";
import type {
CreateReportDto,
ProfileReportWithUsers,
ReportStatus,
UpdateReportDto,
} from "@library/shared-types";
import { ReportReason } from "@library/shared-types";
import { ReportService } from "../../services/report.service.js";
import { adminGuard } from "../../middleware/admin-guard.js";
const reportsRoutes: FastifyPluginAsync = async (fastify) => {
const reportService = new ReportService();
// Create a new report (authenticated users)
fastify.post<{
Body: CreateReportDto;
Reply: ProfileReportWithUsers | { error: string };
}>(
"/",
{
preValidation: [fastify.authenticate],
schema: {
body: {
type: "object",
required: ["reportedUserId", "reason", "details"],
properties: {
reportedUserId: { type: "string" },
reason: {
type: "string",
enum: Object.values(ReportReason),
},
details: { type: "string", minLength: 10, maxLength: 1000 },
},
},
},
},
async (request, reply) => {
try {
const report = await reportService.createReport(
request.user.id,
request.body,
);
return reply.status(201).send(report);
} catch (error) {
if (
error instanceof Error &&
error.message.includes("already have a pending report")
) {
return reply.status(409).send({ error: error.message });
}
throw error;
}
},
);
// Get all reports (admin only)
fastify.get<{
Querystring: { status?: ReportStatus };
Reply: ProfileReportWithUsers[];
}>(
"/",
{
preValidation: [fastify.authenticate, adminGuard],
schema: {
querystring: {
type: "object",
properties: {
status: { type: "string" },
},
},
},
},
async (request, reply) => {
const reports = await reportService.getAllReports(
request.query.status,
);
return reply.send(reports);
},
);
// Get a single report by ID (admin only)
fastify.get<{
Params: { id: string };
Reply: ProfileReportWithUsers | { error: string };
}>(
"/:id",
{
preValidation: [fastify.authenticate, adminGuard],
},
async (request, reply) => {
const report = await reportService.getReportById(request.params.id);
if (!report) {
return reply.status(404).send({ error: "Report not found" });
}
return reply.send(report);
},
);
// Update a report (admin only)
fastify.put<{
Params: { id: string };
Body: UpdateReportDto;
Reply: ProfileReportWithUsers;
}>(
"/:id",
{
preValidation: [fastify.authenticate, adminGuard],
schema: {
body: {
type: "object",
required: ["status"],
properties: {
status: { type: "string" },
reviewNotes: { type: "string", maxLength: 1000 },
},
},
},
},
async (request, reply) => {
const report = await reportService.updateReport(
request.params.id,
request.user.id,
request.body,
);
return reply.send(report);
},
);
};
export default reportsRoutes;
@@ -0,0 +1,369 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import {
ReportStatus as PrismaReportStatus,
ReportReason as PrismaReportReason,
} from "@prisma/client";
import type {
CreateCommentReportDto,
CommentReportWithDetails,
ReportStatus,
UpdateCommentReportDto,
} from "@library/shared-types";
import { ReportReason } from "@library/shared-types";
import { prisma } from "../lib/prisma.js";
export class CommentReportService {
private prisma = prisma;
/**
* Convert Prisma ReportReason to shared-types ReportReason
*/
private toPrismaReportReason(reason: ReportReason): PrismaReportReason {
return reason as unknown as PrismaReportReason;
}
/**
* Convert Prisma ReportStatus to shared-types ReportStatus
*/
private toPrismaReportStatus(status: ReportStatus): PrismaReportStatus {
return status as unknown as PrismaReportStatus;
}
/**
* Convert Prisma enum back to shared-types enum
*/
private fromPrismaReportReason(reason: PrismaReportReason): ReportReason {
return reason as unknown as ReportReason;
}
/**
* Convert Prisma enum back to shared-types enum
*/
private fromPrismaReportStatus(status: PrismaReportStatus): ReportStatus {
return status as unknown as ReportStatus;
}
/**
* Create a new comment report.
*
* @param reporterId - The ID of the user making the report
* @param createDto - The report details
* @returns The created report
* @throws Error if user already has a pending report for this comment
*/
async createReport(
reporterId: string,
createDto: CreateCommentReportDto,
): Promise<CommentReportWithDetails> {
// Check if user already has a pending report for this comment
const existingReport = await this.prisma.commentReport.findFirst({
where: {
reporterId,
reportedCommentId: createDto.reportedCommentId,
status: PrismaReportStatus.PENDING,
},
});
if (existingReport) {
throw new Error(
"You already have a pending report for this comment. Please wait for it to be reviewed.",
);
}
// Check if user has reached the limit of pending reports (5 max)
const pendingReportsCount = await this.prisma.commentReport.count({
where: {
reporterId,
status: PrismaReportStatus.PENDING,
},
});
if (pendingReportsCount >= 5) {
throw new Error(
"You have reached the maximum number of pending reports (5). Please wait for your existing reports to be reviewed.",
);
}
const report = await this.prisma.commentReport.create({
data: {
reporterId,
reportedCommentId: createDto.reportedCommentId,
reason: this.toPrismaReportReason(createDto.reason),
details: createDto.details,
},
include: {
reportedComment: {
include: {
user: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
});
return {
id: report.id,
reportedCommentId: report.reportedCommentId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedComment: {
id: report.reportedComment.id,
content: report.reportedComment.content,
rawContent: report.reportedComment.rawContent ?? undefined,
userId: report.reportedComment.userId,
user: report.reportedComment.user,
},
reporter: report.reporter,
};
}
/**
* Get all comment reports (admin only). Optionally filter by status.
*
* @param status - Optional status filter
* @returns All reports matching the filter
*/
async getAllReports(
status?: ReportStatus,
): Promise<CommentReportWithDetails[]> {
const reports = await this.prisma.commentReport.findMany({
where: status ? { status: this.toPrismaReportStatus(status) } : undefined,
include: {
reportedComment: {
include: {
user: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
orderBy: {
createdAt: "desc",
},
});
return reports.map((report) => ({
id: report.id,
reportedCommentId: report.reportedCommentId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedComment: {
id: report.reportedComment.id,
content: report.reportedComment.content,
rawContent: report.reportedComment.rawContent ?? undefined,
userId: report.reportedComment.userId,
user: report.reportedComment.user,
},
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
}));
}
/**
* Get a single comment report by ID (admin only).
*
* @param id - The report ID
* @returns The report or null
*/
async getReportById(id: string): Promise<CommentReportWithDetails | null> {
const report = await this.prisma.commentReport.findUnique({
where: { id },
include: {
reportedComment: {
include: {
user: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
});
if (!report) {
return null;
}
return {
id: report.id,
reportedCommentId: report.reportedCommentId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedComment: {
id: report.reportedComment.id,
content: report.reportedComment.content,
rawContent: report.reportedComment.rawContent ?? undefined,
userId: report.reportedComment.userId,
user: report.reportedComment.user,
},
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
};
}
/**
* Update a comment report's status and review notes (admin only).
*
* @param id - The report ID
* @param reviewerId - The ID of the admin reviewing the report
* @param updateDto - The update details
* @returns The updated report
*/
async updateReport(
id: string,
reviewerId: string,
updateDto: UpdateCommentReportDto,
): Promise<CommentReportWithDetails> {
const report = await this.prisma.commentReport.update({
where: { id },
data: {
status: this.toPrismaReportStatus(updateDto.status),
reviewNotes: updateDto.reviewNotes,
reviewedBy: reviewerId,
},
include: {
reportedComment: {
include: {
user: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
});
return {
id: report.id,
reportedCommentId: report.reportedCommentId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedComment: {
id: report.reportedComment.id,
content: report.reportedComment.content,
rawContent: report.reportedComment.rawContent ?? undefined,
userId: report.reportedComment.userId,
user: report.reportedComment.user,
},
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
};
}
/**
* Check if a comment has any pending reports.
*
* @param commentId - The comment ID
* @returns True if the comment has pending reports
*/
async hasPendingReports(commentId: string): Promise<boolean> {
const count = await this.prisma.commentReport.count({
where: {
reportedCommentId: commentId,
status: PrismaReportStatus.PENDING,
},
});
return count > 0;
}
}
+26 -20
View File
@@ -50,7 +50,12 @@ export class CommentService {
});
}
private mapComment(comment: any): Comment {
private async mapComment(comment: any): Promise<Comment> {
// Check if comment has pending reports
const hasPendingReports = comment.reports
? comment.reports.some((report: any) => report.status === "PENDING")
: false;
return {
id: comment.id,
content: comment.content,
@@ -71,6 +76,7 @@ export class CommentService {
artId: comment.artId || undefined,
showId: comment.showId || undefined,
mangaId: comment.mangaId || undefined,
hasPendingReports,
createdAt: comment.createdAt,
updatedAt: comment.updatedAt,
};
@@ -79,28 +85,28 @@ export class CommentService {
async getCommentsForGame(gameId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { gameId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async getCommentsForBook(bookId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { bookId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async getCommentsForMusic(musicId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { musicId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async createCommentForGame(
@@ -116,7 +122,7 @@ export class CommentService {
userId,
gameId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -134,7 +140,7 @@ export class CommentService {
userId,
bookId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -152,7 +158,7 @@ export class CommentService {
userId,
musicId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -160,10 +166,10 @@ export class CommentService {
async getCommentsForArt(artId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { artId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async createCommentForArt(
@@ -179,7 +185,7 @@ export class CommentService {
userId,
artId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -187,10 +193,10 @@ export class CommentService {
async getCommentsForShow(showId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { showId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async createCommentForShow(
@@ -206,7 +212,7 @@ export class CommentService {
userId,
showId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -214,10 +220,10 @@ export class CommentService {
async getCommentsForManga(mangaId: string): Promise<Comment[]> {
const comments = await this.prisma.comment.findMany({
where: { mangaId },
include: { user: true },
include: { user: true, reports: true },
orderBy: { createdAt: "desc" },
});
return comments.map((c) => this.mapComment(c));
return Promise.all(comments.map((c) => this.mapComment(c)));
}
async createCommentForManga(
@@ -233,7 +239,7 @@ export class CommentService {
userId,
mangaId,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
@@ -256,7 +262,7 @@ export class CommentService {
content: sanitizedContent,
rawContent: content,
},
include: { user: true },
include: { user: true, reports: true },
});
return this.mapComment(comment);
}
+312
View File
@@ -0,0 +1,312 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import {
ReportStatus as PrismaReportStatus,
ReportReason as PrismaReportReason,
} from "@prisma/client";
import type {
CreateReportDto,
ProfileReportWithUsers,
ReportStatus,
UpdateReportDto,
} from "@library/shared-types";
import { ReportReason } from "@library/shared-types";
import { prisma } from "../lib/prisma.js";
export class ReportService {
private prisma = prisma;
/**
* Convert Prisma ReportReason to shared-types ReportReason
*/
private toPrismaReportReason(reason: ReportReason): PrismaReportReason {
return reason as unknown as PrismaReportReason;
}
/**
* Convert Prisma ReportStatus to shared-types ReportStatus
*/
private toPrismaReportStatus(status: ReportStatus): PrismaReportStatus {
return status as unknown as PrismaReportStatus;
}
/**
* Convert Prisma enum back to shared-types enum
*/
private fromPrismaReportReason(reason: PrismaReportReason): ReportReason {
return reason as unknown as ReportReason;
}
/**
* Convert Prisma enum back to shared-types enum
*/
private fromPrismaReportStatus(status: PrismaReportStatus): ReportStatus {
return status as unknown as ReportStatus;
}
/**
* Create a new profile report.
*
* @param reporterId - The ID of the user making the report
* @param createDto - The report details
* @returns The created report
* @throws Error if user already has a pending report for this profile
*/
async createReport(
reporterId: string,
createDto: CreateReportDto,
): Promise<ProfileReportWithUsers> {
// Check if user already has a pending report for this profile
const existingReport = await this.prisma.profileReport.findFirst({
where: {
reporterId,
reportedUserId: createDto.reportedUserId,
status: PrismaReportStatus.PENDING,
},
});
if (existingReport) {
throw new Error(
"You already have a pending report for this profile. Please wait for it to be reviewed.",
);
}
// Check if user has reached the limit of pending reports (5 max)
const pendingReportsCount = await this.prisma.profileReport.count({
where: {
reporterId,
status: PrismaReportStatus.PENDING,
},
});
if (pendingReportsCount >= 5) {
throw new Error(
"You have reached the maximum number of pending reports (5). Please wait for your existing reports to be reviewed.",
);
}
const report = await this.prisma.profileReport.create({
data: {
reporterId,
reportedUserId: createDto.reportedUserId,
reason: this.toPrismaReportReason(createDto.reason),
details: createDto.details,
},
include: {
reportedUser: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
},
});
return {
id: report.id,
reportedUserId: report.reportedUserId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedUser: report.reportedUser,
reporter: report.reporter,
};
}
/**
* Get all reports (admin only). Optionally filter by status.
*
* @param status - Optional status filter
* @returns All reports matching the filter
*/
async getAllReports(
status?: ReportStatus,
): Promise<ProfileReportWithUsers[]> {
const reports = await this.prisma.profileReport.findMany({
where: status ? { status: this.toPrismaReportStatus(status) } : undefined,
include: {
reportedUser: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
orderBy: {
createdAt: "desc",
},
});
return reports.map((report) => ({
id: report.id,
reportedUserId: report.reportedUserId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedUser: report.reportedUser,
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
}));
}
/**
* Get a single report by ID (admin only).
*
* @param id - The report ID
* @returns The report or null
*/
async getReportById(id: string): Promise<ProfileReportWithUsers | null> {
const report = await this.prisma.profileReport.findUnique({
where: { id },
include: {
reportedUser: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
});
if (!report) {
return null;
}
return {
id: report.id,
reportedUserId: report.reportedUserId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedUser: report.reportedUser,
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
};
}
/**
* Update a report's status and review notes (admin only).
*
* @param id - The report ID
* @param reviewerId - The ID of the admin reviewing the report
* @param updateDto - The update details
* @returns The updated report
*/
async updateReport(
id: string,
reviewerId: string,
updateDto: UpdateReportDto,
): Promise<ProfileReportWithUsers> {
const report = await this.prisma.profileReport.update({
where: { id },
data: {
status: this.toPrismaReportStatus(updateDto.status),
reviewNotes: updateDto.reviewNotes,
reviewedBy: reviewerId,
},
include: {
reportedUser: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reporter: {
select: {
id: true,
username: true,
displayName: true,
avatar: true,
},
},
reviewer: {
select: {
id: true,
username: true,
displayName: true,
},
},
},
});
return {
id: report.id,
reportedUserId: report.reportedUserId,
reporterId: report.reporterId,
reason: this.fromPrismaReportReason(report.reason),
details: report.details,
status: this.fromPrismaReportStatus(report.status),
reviewedBy: report.reviewedBy ?? undefined,
reviewNotes: report.reviewNotes ?? undefined,
createdAt: report.createdAt,
updatedAt: report.updatedAt,
reportedUser: report.reportedUser,
reporter: report.reporter,
reviewer: report.reviewer ?? undefined,
};
}
}
+6 -1
View File
@@ -4,4 +4,9 @@
* @license Naomi's Public License
*/
export const getGreeting = (): Cypress.Chainable => cy.get("h1");
/**
*
*/
export const getGreeting = (): Cypress.Chainable => {
return cy.get("h1");
};
+13 -7
View File
@@ -13,7 +13,7 @@
*
* For more comprehensive examples of custom
* commands please read more here:
* https://on.cypress.io/custom-commands
* https://on.cypress.io/custom-commands.
*/
// eslint-disable-next-line @typescript-eslint/no-namespace -- Required for Cypress type extensions
@@ -30,11 +30,17 @@ Cypress.Commands.add("login", (email, password) => {
console.log("Custom command example: Login", email, password);
});
// -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
/*
* -- This is a child command --
* Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
*/
// -- This is a dual command --
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
/*
* -- This is a dual command --
* Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
*/
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
/*
* -- This will overwrite an existing command --
* Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
*/
+1 -1
View File
@@ -16,7 +16,7 @@
* 'supportFile' configuration option.
*
* You can read more here:
* https://on.cypress.io/configuration
* https://on.cypress.io/configuration.
*/
// Import commands.ts using ES2015 syntax:
+4
View File
@@ -41,6 +41,10 @@ export const appRoutes: Route[] = [
path: 'admin/suggestions',
loadComponent: () => import('./components/admin/admin-suggestions.component').then(m => m.AdminSuggestionsComponent)
},
{
path: 'admin/reports',
loadComponent: () => import('./components/admin-reports/admin-reports.component').then(m => m.AdminReportsComponent)
},
{
path: 'my-suggestions',
loadComponent: () => import('./components/my-suggestions/my-suggestions.component').then(m => m.MySuggestionsComponent)
File diff suppressed because it is too large Load Diff
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-art-gallery',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -468,56 +469,11 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
}
}
@if (commentsLoading()[art.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[art.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(art.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(art.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(art.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
}
<app-comment-display
[comments]="getCommentsSignal(art.id)"
(onEdit)="handleCommentEdit(art.id, $event)"
(onDelete)="deleteComment(art.id, $event)"
/>
</div>
}
</div>
@@ -1615,4 +1571,21 @@ export class ArtGalleryComponent implements OnInit {
toggleFilters() {
this.showFilters.update(v => !v);
}
handleCommentEdit(artId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnArt(artId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[artId]: (this.comments()[artId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(artId: string) {
return signal(this.comments()[artId] || []);
}
}
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-books-list',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -655,52 +656,11 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
@if (commentsLoading()[book.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[book.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(book.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(book.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(book.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
<app-comment-display
[comments]="getCommentsSignal(book.id)"
(onEdit)="handleCommentEdit(book.id, $event)"
(onDelete)="deleteComment(book.id, $event)"
/>
}
</div>
}
@@ -1982,4 +1942,21 @@ export class BooksListComponent implements OnInit {
alert('Failed to submit suggestion. Please try again.');
}
}
handleCommentEdit(bookId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnBook(bookId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[bookId]: (this.comments()[bookId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(bookId: string) {
return signal(this.comments()[bookId] || []);
}
}
@@ -0,0 +1,310 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Component, Input, Output, EventEmitter, signal, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import type { Comment } from '@library/shared-types';
import { AuthService } from '../../services/auth.service';
import { SanitizeService } from '../../services/sanitize.service';
import { ReportModalComponent } from '../report-modal/report-modal.component';
@Component({
selector: 'app-comment-display',
standalone: true,
imports: [CommonModule, FormsModule, ReportModalComponent],
template: `
<div class="comments-section">
@if (comments().length > 0) {
@for (comment of comments(); track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEdit(comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="onDelete.emit(comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
@if (canReportComment(comment)) {
<button (click)="openReportModal(comment)" class="btn btn-warning btn-xs">Report</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveEdit(comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
@if (comment.hasPendingReports) {
<div class="comment-pending-review">[comment pending admin review]</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
}
</div>
}
} @else {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
</div>
@if (showReportModal()) {
<app-report-modal
[reportType]="'comment'"
[targetId]="reportingCommentId()"
(closeModal)="closeReportModal()"
/>
}
`,
styles: [`
.comments-section {
margin-top: 1rem;
}
.comment {
background: #f9fafb;
padding: 0.75rem;
border-radius: 0.375rem;
margin-bottom: 0.75rem;
}
.comment-header {
display: flex;
align-items: center;
gap: 0.5rem;
margin-bottom: 0.5rem;
flex-wrap: wrap;
}
.comment-avatar {
width: 2rem;
height: 2rem;
border-radius: 50%;
object-fit: cover;
}
.comment-author {
font-weight: 600;
color: #1f2937;
}
.discord-badge,
.vip-badge,
.mod-badge,
.staff-badge {
padding: 0.125rem 0.5rem;
border-radius: 0.25rem;
font-size: 0.75rem;
font-weight: 600;
}
.discord-badge {
background: #5865f2;
color: white;
}
.vip-badge {
background: #fbbf24;
color: #78350f;
}
.mod-badge {
background: #10b981;
color: white;
}
.staff-badge {
background: #8b5cf6;
color: white;
}
.comment-date {
font-size: 0.75rem;
color: #6b7280;
}
.comment-content {
font-size: 0.9rem;
color: #4b5563;
}
.comment-pending-review {
font-size: 0.9rem;
color: #9b59b6;
font-style: italic;
padding: 0.5rem;
background: #f3e8ff;
border-radius: 0.25rem;
}
.comment-edit-form {
margin-top: 0.5rem;
}
.comment-edit-form textarea {
width: 100%;
padding: 0.5rem;
border: 1px solid #d1d5db;
border-radius: 0.375rem;
font-family: inherit;
resize: vertical;
}
.comment-edit-actions {
display: flex;
gap: 0.5rem;
margin-top: 0.5rem;
}
.no-comments {
text-align: center;
color: #6b7280;
padding: 2rem;
font-style: italic;
}
.btn {
padding: 0.25rem 0.75rem;
border: none;
border-radius: 0.25rem;
cursor: pointer;
font-size: 0.875rem;
transition: all 0.2s;
}
.btn-xs {
padding: 0.125rem 0.5rem;
font-size: 0.75rem;
}
.btn-primary {
background: #3b82f6;
color: white;
}
.btn-primary:hover {
background: #2563eb;
}
.btn-secondary {
background: #6b7280;
color: white;
}
.btn-secondary:hover {
background: #4b5563;
}
.btn-danger {
background: #ef4444;
color: white;
}
.btn-danger:hover {
background: #dc2626;
}
.btn-warning {
background: #f59e0b;
color: white;
}
.btn-warning:hover {
background: #d97706;
}
`]
})
export class CommentDisplayComponent {
private readonly authService = inject(AuthService);
readonly sanitizeService = inject(SanitizeService);
@Input({ required: true }) comments = signal<Comment[]>([]);
@Output() onEdit = new EventEmitter<{ commentId: string; content: string }>();
@Output() onDelete = new EventEmitter<string>();
editingCommentId = signal<string | null>(null);
editCommentContent = '';
showReportModal = signal(false);
reportingCommentId = signal<string>('');
formatDate(date: Date | string): string {
const d = new Date(date);
return d.toLocaleDateString('en-GB', {
year: 'numeric',
month: 'short',
day: 'numeric',
hour: '2-digit',
minute: '2-digit',
});
}
canEditComment(comment: Comment): boolean {
const user = this.authService.user();
if (!user) return false;
return comment.userId === user.id || this.authService.isAdmin();
}
canDeleteComment(comment: Comment): boolean {
const user = this.authService.user();
if (!user) return false;
return comment.userId === user.id || this.authService.isAdmin();
}
canReportComment(comment: Comment): boolean {
const user = this.authService.user();
if (!user) return false;
// Users can report comments they didn't write (but not their own)
return comment.userId !== user.id;
}
startEdit(comment: Comment): void {
this.editingCommentId.set(comment.id);
this.editCommentContent = comment.rawContent ?? comment.content;
}
saveEdit(commentId: string): void {
this.onEdit.emit({ commentId, content: this.editCommentContent });
this.cancelEdit();
}
cancelEdit(): void {
this.editingCommentId.set(null);
this.editCommentContent = '';
}
openReportModal(comment: Comment): void {
this.reportingCommentId.set(comment.id);
this.showReportModal.set(true);
}
closeReportModal(): void {
this.showReportModal.set(false);
this.reportingCommentId.set('');
}
}
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-games-list',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -608,52 +609,11 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
@if (commentsLoading()[game.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[game.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(game.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(game.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(game.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
<app-comment-display
[comments]="getCommentsSignal(game.id)"
(onEdit)="handleCommentEdit(game.id, $event)"
(onDelete)="deleteComment(game.id, $event)"
/>
}
</div>
}
@@ -1739,6 +1699,23 @@ export class GamesListComponent implements OnInit {
});
}
handleCommentEdit(gameId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnGame(gameId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[gameId]: (this.comments()[gameId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(gameId: string) {
return signal(this.comments()[gameId] || []);
}
// Suggestion methods
toggleSuggestForm() {
this.showSuggestForm.update(v => !v);
@@ -60,6 +60,7 @@ import { ApiService } from '../../services/api.service';
<a routerLink="/admin/users" class="dropdown-item" (click)="closeDropdown()">Users</a>
<a routerLink="/admin/audit" class="dropdown-item" (click)="closeDropdown()">Audit</a>
<a routerLink="/admin/suggestions" class="dropdown-item" (click)="closeDropdown()">Suggestions</a>
<a routerLink="/admin/reports" class="dropdown-item" (click)="closeDropdown()">Reports</a>
}
<button (click)="logout()" class="dropdown-item logout-btn">Logout</button>
</div>
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-manga-list',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -610,56 +611,11 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
}
}
@if (commentsLoading()[manga.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[manga.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(manga.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(manga.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(manga.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
}
<app-comment-display
[comments]="getCommentsSignal(manga.id)"
(onEdit)="handleCommentEdit(manga.id, $event)"
(onDelete)="deleteComment(manga.id, $event)"
/>
</div>
}
</div>
@@ -1780,4 +1736,21 @@ export class MangaListComponent implements OnInit {
alert('Failed to submit suggestion. Please try again.');
}
}
handleCommentEdit(mangaId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnManga(mangaId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[mangaId]: (this.comments()[mangaId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(mangaId: string) {
return signal(this.comments()[mangaId] || []);
}
}
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-music-list',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -686,56 +687,11 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
}
}
@if (commentsLoading()[music.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[music.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(music.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(music.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(music.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
}
<app-comment-display
[comments]="getCommentsSignal(music.id)"
(onEdit)="handleCommentEdit(music.id, $event)"
(onDelete)="deleteComment(music.id, $event)"
/>
</div>
}
</div>
@@ -2014,4 +1970,21 @@ export class MusicListComponent implements OnInit {
alert('Failed to submit suggestion. Please try again.');
}
}
handleCommentEdit(musicId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnMusic(musicId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[musicId]: (this.comments()[musicId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(musicId: string) {
return signal(this.comments()[musicId] || []);
}
}
@@ -8,15 +8,17 @@ import { Component, inject, signal, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { CommonModule } from '@angular/common';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { faGlobe, faCloud } from '@fortawesome/free-solid-svg-icons';
import { faGlobe, faCloud, faFlag } from '@fortawesome/free-solid-svg-icons';
import { faGithub, faLinkedin, faTwitch, faYoutube, faDiscord } from '@fortawesome/free-brands-svg-icons';
import { UserService, UserProfileResponse } from '../../services/user.service';
import { ToastService } from '../../services/toast.service';
import { AuthService } from '../../services/auth.service';
import { ReportModalComponent } from '../report-modal/report-modal.component';
@Component({
selector: 'app-profile',
standalone: true,
imports: [CommonModule, FontAwesomeModule],
imports: [CommonModule, FontAwesomeModule, ReportModalComponent],
template: `
<div class="profile-container">
@if (loading()) {
@@ -42,6 +44,17 @@ import { ToastService } from '../../services/toast.service';
<p class="profile-slug">library.nhcarrigan.com/profile/{{ profile()!.slug }}</p>
}
</div>
@if (showReportButton()) {
<button
class="report-button"
(click)="openReportModal()"
[attr.aria-label]="'Report ' + profile()!.username + ' profile'"
type="button"
>
<fa-icon [icon]="faFlag"></fa-icon>
<span>Report</span>
</button>
}
</div>
<div class="badges-section">
@@ -142,6 +155,15 @@ import { ToastService } from '../../services/toast.service';
</div>
</div>
}
@if (reportModalOpen()) {
<app-report-modal
[reportType]="'profile'"
[targetId]="profile()!.id"
[reportedUsername]="profile()!.displayName || profile()!.username"
(closeModal)="closeReportModal()"
/>
}
</div>
`,
styles: [`
@@ -173,6 +195,7 @@ import { ToastService } from '../../services/toast.service';
align-items: center;
gap: 1.5rem;
margin-bottom: 1.5rem;
position: relative;
}
.profile-avatar {
@@ -217,6 +240,33 @@ import { ToastService } from '../../services/toast.service';
font-size: 0.9rem;
}
.report-button {
position: absolute;
top: 0;
right: 0;
display: flex;
align-items: center;
gap: 0.5rem;
padding: 0.6rem 1rem;
background: linear-gradient(135deg, #c41e3a 0%, #e74c3c 100%);
color: white;
border: none;
border-radius: 8px;
font-size: 0.9rem;
font-weight: 600;
cursor: pointer;
transition: all 0.2s ease;
}
.report-button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(196, 30, 58, 0.4);
}
.report-button fa-icon {
font-size: 1rem;
}
.badges-section {
display: flex;
flex-wrap: wrap;
@@ -369,10 +419,12 @@ export class ProfileComponent implements OnInit {
private route = inject(ActivatedRoute);
private userService = inject(UserService);
private toastService = inject(ToastService);
private authService = inject(AuthService);
profile = signal<UserProfileResponse | null>(null);
loading = signal(true);
error = signal<string | null>(null);
reportModalOpen = signal(false);
// Font Awesome icons
faGlobe = faGlobe;
@@ -382,6 +434,7 @@ export class ProfileComponent implements OnInit {
faTwitch = faTwitch;
faYoutube = faYoutube;
faDiscord = faDiscord;
faFlag = faFlag;
ngOnInit(): void {
const identifier = this.route.snapshot.paramMap.get('identifier');
@@ -412,4 +465,34 @@ export class ProfileComponent implements OnInit {
day: 'numeric'
});
}
/**
* Determine whether to show the report button.
* Only show if the user is authenticated and viewing someone else's profile.
*/
showReportButton(): boolean {
const currentUser = this.authService.user();
const profileData = this.profile();
if (!currentUser || !profileData) {
return false;
}
// Don't show report button on your own profile
return currentUser.id !== profileData.id;
}
/**
* Open the report modal.
*/
openReportModal(): void {
this.reportModalOpen.set(true);
}
/**
* Close the report modal.
*/
closeReportModal(): void {
this.reportModalOpen.set(false);
}
}
@@ -0,0 +1,398 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Component, inject, signal, input, output, computed } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { ReportService } from '../../services/report.service';
import { CommentReportService } from '../../services/comment-report.service';
import { ToastService } from '../../services/toast.service';
import { ReportReason } from '@library/shared-types';
@Component({
selector: 'app-report-modal',
standalone: true,
imports: [CommonModule, FormsModule],
template: `
<div class="modal-overlay" (click)="onOverlayClick($event)" (keydown.escape)="closeModal.emit()" tabindex="-1">
<div class="modal-card" role="dialog" aria-labelledby="modal-title" aria-modal="true">
<div class="modal-header">
<h2 id="modal-title">{{ modalTitle() }}</h2>
<button
class="close-button"
(click)="onClose()"
aria-label="Close modal"
type="button"
>
Ă—
</button>
</div>
<div class="modal-body">
<p class="report-info">
{{ reportInfo() }}
</p>
<form (ngSubmit)="onSubmit()" #reportForm="ngForm">
<div class="form-group">
<label for="reason">Reason *</label>
<select
id="reason"
name="reason"
[(ngModel)]="selectedReason"
required
class="form-control"
aria-required="true"
>
<option value="" disabled>Select a reason</option>
<option [value]="ReportReason.INAPPROPRIATE_CONTENT">Inappropriate Content</option>
<option [value]="ReportReason.HARASSMENT">Harassment</option>
<option [value]="ReportReason.SPAM">Spam</option>
<option [value]="ReportReason.IMPERSONATION">Impersonation</option>
<option [value]="ReportReason.OFFENSIVE_NAME">Offensive Name</option>
<option [value]="ReportReason.MALICIOUS_LINKS">Malicious Links</option>
<option [value]="ReportReason.OTHER">Other</option>
</select>
</div>
<div class="form-group">
<label for="details">Details *</label>
<textarea
id="details"
name="details"
[(ngModel)]="details"
required
minlength="10"
maxlength="1000"
rows="5"
class="form-control"
placeholder="Please provide specific details about why you are reporting this profile (10-1000 characters)"
aria-required="true"
[attr.aria-invalid]="detailsInvalid()"
></textarea>
<div class="character-count" [class.invalid]="detailsInvalid()">
{{ details().length }} / 1000 characters
@if (details().length < 10 && details().length > 0) {
<span class="error-text">(minimum 10 characters)</span>
}
</div>
</div>
<div class="modal-footer">
<button
type="button"
class="button button-secondary"
(click)="onClose()"
[disabled]="submitting()"
>
Cancel
</button>
<button
type="submit"
class="button button-danger"
[disabled]="!reportForm.valid || submitting()"
>
@if (submitting()) {
<span>Submitting...</span>
} @else {
<span>Submit Report</span>
}
</button>
</div>
</form>
</div>
</div>
</div>
`,
styles: [`
.modal-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.7);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000;
padding: 1rem;
}
.modal-card {
background: var(--card-background, #1a1a2e);
border-radius: 12px;
width: 100%;
max-width: 600px;
max-height: 90vh;
overflow-y: auto;
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
}
.modal-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 1.5rem;
border-bottom: 2px solid rgba(155, 89, 182, 0.3);
}
.modal-header h2 {
margin: 0;
color: var(--accent-colour, #9b59b6);
font-size: 1.5rem;
}
.close-button {
background: none;
border: none;
font-size: 2rem;
color: var(--text-colour, #e0e0e0);
cursor: pointer;
padding: 0;
width: 2rem;
height: 2rem;
line-height: 1;
transition: color 0.2s ease;
}
.close-button:hover {
color: var(--accent-colour, #9b59b6);
}
.modal-body {
padding: 1.5rem;
}
.report-info {
margin: 0 0 1.5rem 0;
color: var(--text-colour, #e0e0e0);
line-height: 1.6;
}
.report-info strong {
color: var(--accent-colour, #9b59b6);
}
.form-group {
margin-bottom: 1.5rem;
}
.form-group label {
display: block;
margin-bottom: 0.5rem;
color: var(--text-colour, #e0e0e0);
font-weight: 500;
}
.form-control {
width: 100%;
padding: 0.75rem;
background: rgba(155, 89, 182, 0.1);
border: 2px solid rgba(155, 89, 182, 0.3);
border-radius: 8px;
color: var(--text-colour, #e0e0e0);
font-size: 1rem;
font-family: inherit;
transition: border-color 0.2s ease;
}
.form-control:focus {
outline: none;
border-color: var(--accent-colour, #9b59b6);
}
.form-control:invalid:not(:focus):not(:placeholder-shown) {
border-color: var(--error-colour, #c41e3a);
}
textarea.form-control {
resize: vertical;
min-height: 120px;
}
select.form-control {
cursor: pointer;
appearance: none;
background-image: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="%23e0e0e0"><path d="M7 10l5 5 5-5z"/></svg>');
background-repeat: no-repeat;
background-position: right 0.75rem center;
background-size: 1.5rem;
padding-right: 2.5rem;
}
select.form-control option {
background: #2d2d2d;
color: #e0e0e0;
padding: 0.5rem;
}
.character-count {
margin-top: 0.5rem;
font-size: 0.875rem;
color: var(--text-muted, #a0a0a0);
text-align: right;
}
.character-count.invalid {
color: var(--error-colour, #c41e3a);
}
.error-text {
color: var(--error-colour, #c41e3a);
margin-left: 0.5rem;
}
.modal-footer {
display: flex;
justify-content: flex-end;
gap: 1rem;
margin-top: 2rem;
padding-top: 1.5rem;
border-top: 2px solid rgba(155, 89, 182, 0.3);
}
.button {
padding: 0.75rem 1.5rem;
border: none;
border-radius: 8px;
font-size: 1rem;
font-weight: 600;
cursor: pointer;
transition: all 0.2s ease;
}
.button:disabled {
opacity: 0.5;
cursor: not-allowed;
}
.button-secondary {
background: rgba(155, 89, 182, 0.2);
color: var(--text-colour, #e0e0e0);
border: 2px solid rgba(155, 89, 182, 0.3);
}
.button-secondary:hover:not(:disabled) {
background: rgba(155, 89, 182, 0.3);
border-color: var(--accent-colour, #9b59b6);
}
.button-danger {
background: linear-gradient(135deg, #c41e3a 0%, #e74c3c 100%);
color: white;
}
.button-danger:hover:not(:disabled) {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(196, 30, 58, 0.4);
}
`]
})
export class ReportModalComponent {
private reportService = inject(ReportService);
private commentReportService = inject(CommentReportService);
private toastService = inject(ToastService);
// Inputs
reportType = input.required<'profile' | 'comment'>();
targetId = input.required<string>(); // userId for profile, commentId for comment
reportedUsername = input<string>(''); // Only used for profile reports
// Outputs
closeModal = output<void>();
// State
selectedReason = signal<string>('');
details = signal<string>('');
submitting = signal<boolean>(false);
// Computed values
modalTitle = computed(() => {
return this.reportType() === 'profile' ? 'Report Profile' : 'Report Comment';
});
reportInfo = computed(() => {
if (this.reportType() === 'profile') {
return `You are reporting ${this.reportedUsername()}. Please provide a reason and details for this report.`;
} else {
return 'You are reporting this comment. Please provide a reason and details for this report.';
}
});
// Expose enum for template
ReportReason = ReportReason;
/**
* Check if details are invalid (less than 10 characters or more than 1000).
*/
detailsInvalid(): boolean {
const length = this.details().length;
return (length > 0 && length < 10) || length > 1000;
}
/**
* Handle overlay click to close modal.
*/
onOverlayClick(event: MouseEvent): void {
if ((event.target as HTMLElement).classList.contains('modal-overlay')) {
this.onClose();
}
}
/**
* Close the modal.
*/
onClose(): void {
this.closeModal.emit();
}
/**
* Submit the report.
*/
onSubmit(): void {
// Validate form
if (!this.selectedReason() || this.detailsInvalid()) {
this.toastService.error('Please fill in all required fields correctly');
return;
}
this.submitting.set(true);
if (this.reportType() === 'profile') {
this.reportService.createReport(
this.targetId(),
this.selectedReason(),
this.details()
).subscribe(this.getSubscribeHandlers());
} else {
this.commentReportService.createReport({
reportedCommentId: this.targetId(),
reason: this.selectedReason() as ReportReason,
details: this.details(),
}).subscribe(this.getSubscribeHandlers());
}
}
private getSubscribeHandlers() {
return {
next: () => {
this.toastService.success('Report submitted successfully');
this.onClose();
},
error: (err: { status?: number; error?: { error?: string } }) => {
console.error('Error submitting report:', err);
// Check if it's a conflict error (duplicate pending report or rate limit)
if (err.status === 409 && err.error?.error) {
this.toastService.error(err.error.error);
} else {
this.toastService.error('Failed to submit report. Please try again.');
}
this.submitting.set(false);
}
};
}
}
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
import { SuggestionService } from '../../services/suggestion.service';
import { PaginationComponent } from '../shared/pagination.component';
import { LikeButtonComponent } from '../shared/like-button.component';
import { CommentDisplayComponent } from '../comment-display/comment-display.component';
import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
@Component({
selector: 'app-shows-list',
standalone: true,
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
template: `
<div class="container">
<div class="header-section">
@@ -604,56 +605,11 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
}
}
@if (commentsLoading()[show.id]) {
<div class="comments-loading">Loading comments...</div>
} @else {
@for (comment of comments()[show.id] || []; track comment.id) {
<div class="comment">
<div class="comment-header">
@if (comment.user.avatar) {
<img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
}
<span class="comment-author">{{ comment.user.username }}</span>
@if (comment.user.inDiscord) {
<span class="discord-badge">Discord</span>
}
@if (comment.user.isVip) {
<span class="vip-badge">VIP</span>
}
@if (comment.user.isMod) {
<span class="mod-badge">Mod</span>
}
@if (comment.user.isStaff) {
<span class="staff-badge">Staff</span>
}
<span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
@if (canEditComment(comment)) {
<button (click)="startEditComment(show.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
}
@if (canDeleteComment(comment)) {
<button (click)="deleteComment(show.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
}
</div>
@if (editingCommentId() === comment.id) {
<div class="comment-edit-form">
<textarea
[(ngModel)]="editCommentContent"
name="editComment"
rows="3"
></textarea>
<div class="comment-edit-actions">
<button (click)="saveCommentEdit(show.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
<button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
</div>
</div>
} @else {
<div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
}
</div>
} @empty {
<div class="no-comments">No comments yet. Be the first to comment!</div>
}
}
<app-comment-display
[comments]="getCommentsSignal(show.id)"
(onEdit)="handleCommentEdit(show.id, $event)"
(onDelete)="deleteComment(show.id, $event)"
/>
</div>
}
</div>
@@ -1783,4 +1739,21 @@ export class ShowsListComponent implements OnInit {
alert('Failed to submit suggestion. Please try again.');
}
}
handleCommentEdit(showId: string, event: { commentId: string; content: string }) {
this.commentsService.updateCommentOnShow(showId, event.commentId, event.content).subscribe({
next: (updatedComment) => {
this.comments.set({
...this.comments(),
[showId]: (this.comments()[showId] || []).map(c =>
c.id === event.commentId ? updatedComment : c
)
});
}
});
}
getCommentsSignal(showId: string) {
return signal(this.comments()[showId] || []);
}
}
@@ -0,0 +1,50 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import type {
CommentReportWithDetails,
CreateCommentReportDto,
UpdateCommentReportDto,
ReportStatus,
} from '@library/shared-types';
import { environment } from '../../environments/environment';
@Injectable({
providedIn: 'root',
})
export class CommentReportService {
private readonly http = inject(HttpClient);
private readonly apiUrl = `${environment.apiUrl}/comment-reports`;
createReport(
dto: CreateCommentReportDto,
): Observable<CommentReportWithDetails> {
return this.http.post<CommentReportWithDetails>(this.apiUrl, dto);
}
getAllReports(
status?: ReportStatus,
): Observable<CommentReportWithDetails[]> {
const params: Record<string, string> = {};
if (status) {
params['status'] = status;
}
return this.http.get<CommentReportWithDetails[]>(this.apiUrl, { params });
}
getReportById(id: string): Observable<CommentReportWithDetails> {
return this.http.get<CommentReportWithDetails>(`${this.apiUrl}/${id}`);
}
updateReport(
id: string,
dto: UpdateCommentReportDto,
): Observable<CommentReportWithDetails> {
return this.http.put<CommentReportWithDetails>(`${this.apiUrl}/${id}`, dto);
}
}
+1
View File
@@ -9,3 +9,4 @@ export { AuthService } from './auth.service';
export { BooksService } from './books.service';
export { GamesService } from './games.service';
export { MusicService } from './music.service';
export { ReportService } from './report.service';
@@ -0,0 +1,74 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { ApiService } from './api.service';
import type {
ProfileReportWithUsers,
CreateReportDto,
ReportStatus
} from '@library/shared-types';
@Injectable({
providedIn: 'root'
})
export class ReportService {
private api = inject(ApiService);
/**
* Create a new profile report.
*
* @param reportedUserId - The ID of the user being reported
* @param reason - The reason for the report
* @param details - Additional details about the report
* @returns Observable of the created report
*/
createReport(reportedUserId: string, reason: string, details: string): Observable<ProfileReportWithUsers> {
const dto: CreateReportDto = {
reportedUserId,
reason: reason as CreateReportDto['reason'],
details
};
return this.api.post<ProfileReportWithUsers>('/reports', dto);
}
/**
* Get all reports (admin only). Optionally filter by status.
*
* @param status - Optional status to filter by
* @returns Observable of all matching reports
*/
getAllReports(status?: ReportStatus): Observable<ProfileReportWithUsers[]> {
const url = status ? `/reports?status=${status}` : '/reports';
return this.api.get<ProfileReportWithUsers[]>(url);
}
/**
* Get a specific report by ID (admin only).
*
* @param id - The report ID
* @returns Observable of the report
*/
getReportById(id: string): Observable<ProfileReportWithUsers> {
return this.api.get<ProfileReportWithUsers>(`/reports/${id}`);
}
/**
* Update a report's status and review notes (admin only).
*
* @param id - The report ID
* @param status - The new status
* @param reviewNotes - Optional review notes
* @returns Observable of the updated report
*/
updateReport(id: string, status: ReportStatus, reviewNotes?: string): Observable<ProfileReportWithUsers> {
return this.api.put<ProfileReportWithUsers>(`/reports/${id}`, {
status,
reviewNotes
});
}
}
+1
View File
@@ -13,5 +13,6 @@ export * from "./lib/game.types";
export type * from "./lib/like.types";
export * from "./lib/manga.types";
export * from "./lib/music.types";
export * from "./lib/report.types";
export * from "./lib/show.types";
export * from "./lib/suggestion.types";
+1
View File
@@ -26,6 +26,7 @@ interface Comment {
artId?: string;
showId?: string;
mangaId?: string;
hasPendingReports?: boolean;
createdAt: Date;
updatedAt: Date;
}
+110
View File
@@ -0,0 +1,110 @@
export enum ReportReason {
INAPPROPRIATE_CONTENT = "INAPPROPRIATE_CONTENT",
HARASSMENT = "HARASSMENT",
SPAM = "SPAM",
IMPERSONATION = "IMPERSONATION",
OFFENSIVE_NAME = "OFFENSIVE_NAME",
MALICIOUS_LINKS = "MALICIOUS_LINKS",
OTHER = "OTHER",
}
export enum ReportStatus {
PENDING = "PENDING",
REVIEWED = "REVIEWED",
DISMISSED = "DISMISSED",
ACTION_TAKEN = "ACTION_TAKEN",
}
export interface ProfileReport {
id: string;
reportedUserId: string;
reporterId: string;
reason: ReportReason;
details: string;
status: ReportStatus;
reviewedBy?: string;
reviewNotes?: string;
createdAt: Date;
updatedAt: Date;
}
export interface ProfileReportWithUsers extends ProfileReport {
reportedUser: {
id: string;
username: string;
displayName?: string;
avatar?: string;
};
reporter: {
id: string;
username: string;
displayName?: string;
avatar?: string;
};
reviewer?: {
id: string;
username: string;
displayName?: string;
};
}
export interface CreateReportDto {
reportedUserId: string;
reason: ReportReason;
details: string;
}
export interface UpdateReportDto {
status: ReportStatus;
reviewNotes?: string;
}
export interface CommentReport {
id: string;
reportedCommentId: string;
reporterId: string;
reason: ReportReason;
details: string;
status: ReportStatus;
reviewedBy?: string;
reviewNotes?: string;
createdAt: Date;
updatedAt: Date;
}
export interface CommentReportWithDetails extends CommentReport {
reportedComment: {
id: string;
content: string;
rawContent?: string;
userId: string;
user: {
id: string;
username: string;
displayName?: string;
avatar?: string;
};
};
reporter: {
id: string;
username: string;
displayName?: string;
avatar?: string;
};
reviewer?: {
id: string;
username: string;
displayName?: string;
};
}
export interface CreateCommentReportDto {
reportedCommentId: string;
reason: ReportReason;
details: string;
}
export interface UpdateCommentReportDto {
status: ReportStatus;
reviewNotes?: string;
}