generated from nhcarrigan/template
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e728968fc9 | |||
| e1bac9fd3e | |||
| c514849f12 | |||
| 8f569e0bb4 | |||
| d797d38ddd | |||
| 5eec4c7640 | |||
| 34c7ca8ba2 |
+97
-21
@@ -182,6 +182,17 @@ model User {
|
|||||||
username String
|
username String
|
||||||
email String @unique
|
email String @unique
|
||||||
avatar String?
|
avatar String?
|
||||||
|
slug String?
|
||||||
|
displayName String?
|
||||||
|
bio String?
|
||||||
|
profilePublic Boolean @default(true)
|
||||||
|
website String?
|
||||||
|
discordServer String?
|
||||||
|
bluesky String?
|
||||||
|
github String?
|
||||||
|
linkedin String?
|
||||||
|
twitch String?
|
||||||
|
youtube String?
|
||||||
isAdmin Boolean @default(false)
|
isAdmin Boolean @default(false)
|
||||||
isBanned Boolean @default(false)
|
isBanned Boolean @default(false)
|
||||||
inDiscord Boolean @default(false)
|
inDiscord Boolean @default(false)
|
||||||
@@ -190,32 +201,40 @@ model User {
|
|||||||
isStaff Boolean @default(false)
|
isStaff Boolean @default(false)
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
comments Comment[]
|
comments Comment[]
|
||||||
suggestions Suggestion[]
|
suggestions Suggestion[]
|
||||||
likes Like[]
|
likes Like[]
|
||||||
refreshTokens RefreshToken[]
|
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")
|
||||||
}
|
}
|
||||||
|
|
||||||
model Comment {
|
model Comment {
|
||||||
id String @id @default(auto()) @map("_id") @db.ObjectId
|
id String @id @default(auto()) @map("_id") @db.ObjectId
|
||||||
content String
|
content String
|
||||||
rawContent String?
|
rawContent String?
|
||||||
userId String @db.ObjectId
|
userId String @db.ObjectId
|
||||||
user User @relation(fields: [userId], references: [id])
|
user User @relation(fields: [userId], references: [id])
|
||||||
gameId String? @db.ObjectId
|
gameId String? @db.ObjectId
|
||||||
game Game? @relation(fields: [gameId], references: [id])
|
game Game? @relation(fields: [gameId], references: [id])
|
||||||
bookId String? @db.ObjectId
|
bookId String? @db.ObjectId
|
||||||
book Book? @relation(fields: [bookId], references: [id])
|
book Book? @relation(fields: [bookId], references: [id])
|
||||||
musicId String? @db.ObjectId
|
musicId String? @db.ObjectId
|
||||||
music Music? @relation(fields: [musicId], references: [id])
|
music Music? @relation(fields: [musicId], references: [id])
|
||||||
artId String? @db.ObjectId
|
artId String? @db.ObjectId
|
||||||
art Art? @relation(fields: [artId], references: [id])
|
art Art? @relation(fields: [artId], references: [id])
|
||||||
showId String? @db.ObjectId
|
showId String? @db.ObjectId
|
||||||
show Show? @relation(fields: [showId], references: [id])
|
show Show? @relation(fields: [showId], references: [id])
|
||||||
mangaId String? @db.ObjectId
|
mangaId String? @db.ObjectId
|
||||||
manga Manga? @relation(fields: [mangaId], references: [id])
|
manga Manga? @relation(fields: [mangaId], references: [id])
|
||||||
createdAt DateTime @default(now())
|
reports CommentReport[]
|
||||||
updatedAt DateTime @updatedAt
|
createdAt DateTime @default(now())
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
model AuditLog {
|
model AuditLog {
|
||||||
@@ -316,3 +335,60 @@ model RefreshToken {
|
|||||||
@@index([userId])
|
@@index([userId])
|
||||||
@@index([expiresAt])
|
@@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])
|
||||||
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -19,7 +19,7 @@ interface LogBody {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default async function (fastify: FastifyInstance) {
|
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;
|
const { level, message, context, error } = request.body;
|
||||||
|
|
||||||
if (level === 'error' && error) {
|
if (level === 'error' && error) {
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -10,6 +10,49 @@ import { UserService } from "../../services/user.service";
|
|||||||
import { AuditService } from "../../services/audit.service";
|
import { AuditService } from "../../services/audit.service";
|
||||||
import { adminGuard } from "../../middleware/admin-guard";
|
import { adminGuard } from "../../middleware/admin-guard";
|
||||||
|
|
||||||
|
interface UpdateUserSettingsBody {
|
||||||
|
slug?: string;
|
||||||
|
displayName?: string;
|
||||||
|
bio?: string;
|
||||||
|
profilePublic?: boolean;
|
||||||
|
website?: string;
|
||||||
|
discordServer?: string;
|
||||||
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface UserProfileResponse {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
displayName?: string;
|
||||||
|
avatar?: string;
|
||||||
|
bio?: string;
|
||||||
|
slug?: string;
|
||||||
|
website?: string;
|
||||||
|
discordServer?: string;
|
||||||
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
badges: {
|
||||||
|
isStaff: boolean;
|
||||||
|
isMod: boolean;
|
||||||
|
isVip: boolean;
|
||||||
|
inDiscord: boolean;
|
||||||
|
};
|
||||||
|
stats: {
|
||||||
|
suggestionsCount: number;
|
||||||
|
suggestionsAcceptedCount: number;
|
||||||
|
likesCount: number;
|
||||||
|
commentsCount: number;
|
||||||
|
};
|
||||||
|
createdAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
const usersRoutes: FastifyPluginAsync = async (app) => {
|
const usersRoutes: FastifyPluginAsync = async (app) => {
|
||||||
const userService = new UserService();
|
const userService = new UserService();
|
||||||
|
|
||||||
@@ -23,6 +66,107 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
app.get<{ Reply: User }>(
|
||||||
|
"/me",
|
||||||
|
{
|
||||||
|
preValidation: [app.authenticate],
|
||||||
|
},
|
||||||
|
async (request) => {
|
||||||
|
const currentUser = request.user as { id: string };
|
||||||
|
const user = await userService.getUserById(currentUser.id);
|
||||||
|
if (!user) {
|
||||||
|
throw new Error("User not found");
|
||||||
|
}
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
app.put<{ Body: UpdateUserSettingsBody; Reply: User | { error: string } }>(
|
||||||
|
"/me",
|
||||||
|
{
|
||||||
|
preValidation: [app.authenticate],
|
||||||
|
preHandler: [app.csrfProtection],
|
||||||
|
},
|
||||||
|
async (request, reply) => {
|
||||||
|
const currentUser = request.user as { id: string };
|
||||||
|
const updates = request.body;
|
||||||
|
|
||||||
|
// If slug is being updated, check if it's unique
|
||||||
|
if (updates.slug) {
|
||||||
|
const existingUser = await userService.getUserBySlug(updates.slug);
|
||||||
|
if (existingUser && existingUser.id !== currentUser.id) {
|
||||||
|
return reply.code(400).send({ error: "Slug already taken" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const updatedUser = await userService.updateUserSettings(
|
||||||
|
currentUser.id,
|
||||||
|
updates
|
||||||
|
);
|
||||||
|
|
||||||
|
if (!updatedUser) {
|
||||||
|
return reply.code(404).send({ error: "User not found" });
|
||||||
|
}
|
||||||
|
|
||||||
|
return updatedUser;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
app.get<{
|
||||||
|
Params: { identifier: string };
|
||||||
|
Reply: UserProfileResponse | { error: string };
|
||||||
|
}>(
|
||||||
|
"/profile/:identifier",
|
||||||
|
async (request, reply) => {
|
||||||
|
const { identifier } = request.params;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const profile = await userService.getUserProfile(identifier);
|
||||||
|
|
||||||
|
if (!profile) {
|
||||||
|
return reply.code(404).send({ error: "User not found" });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!profile.profilePublic) {
|
||||||
|
// Check if the requesting user is viewing their own profile
|
||||||
|
const currentUser = request.user as { id: string } | undefined;
|
||||||
|
if (!currentUser || currentUser.id !== profile.id) {
|
||||||
|
return reply
|
||||||
|
.code(403)
|
||||||
|
.send({ error: "This profile is private" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: profile.id,
|
||||||
|
username: profile.username,
|
||||||
|
displayName: profile.displayName,
|
||||||
|
avatar: profile.avatar,
|
||||||
|
bio: profile.bio,
|
||||||
|
slug: profile.slug,
|
||||||
|
website: profile.website,
|
||||||
|
discordServer: profile.discordServer,
|
||||||
|
bluesky: profile.bluesky,
|
||||||
|
github: profile.github,
|
||||||
|
linkedin: profile.linkedin,
|
||||||
|
twitch: profile.twitch,
|
||||||
|
youtube: profile.youtube,
|
||||||
|
badges: {
|
||||||
|
isStaff: profile.isStaff,
|
||||||
|
isMod: profile.isMod,
|
||||||
|
isVip: profile.isVip,
|
||||||
|
inDiscord: profile.inDiscord,
|
||||||
|
},
|
||||||
|
stats: profile.stats,
|
||||||
|
createdAt: profile.createdAt,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error fetching profile:", error);
|
||||||
|
return reply.code(500).send({ error: "Failed to fetch profile" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
app.get<{ Params: { id: string }; Reply: User | null }>(
|
app.get<{ Params: { id: string }; Reply: User | null }>(
|
||||||
"/:id",
|
"/:id",
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -71,6 +71,15 @@ export class AuthService {
|
|||||||
username: dbUser.username,
|
username: dbUser.username,
|
||||||
email: dbUser.email,
|
email: dbUser.email,
|
||||||
avatar: dbUser.avatar || undefined,
|
avatar: dbUser.avatar || undefined,
|
||||||
|
slug: dbUser.slug || undefined,
|
||||||
|
displayName: dbUser.displayName || undefined,
|
||||||
|
bio: dbUser.bio || undefined,
|
||||||
|
profilePublic: dbUser.profilePublic,
|
||||||
|
website: dbUser.website || undefined,
|
||||||
|
discordServer: dbUser.discordServer || undefined,
|
||||||
|
bluesky: dbUser.bluesky || undefined,
|
||||||
|
github: dbUser.github || undefined,
|
||||||
|
linkedin: dbUser.linkedin || undefined,
|
||||||
isAdmin: dbUser.isAdmin,
|
isAdmin: dbUser.isAdmin,
|
||||||
isBanned: dbUser.isBanned,
|
isBanned: dbUser.isBanned,
|
||||||
inDiscord: dbUser.inDiscord,
|
inDiscord: dbUser.inDiscord,
|
||||||
@@ -167,6 +176,15 @@ export class AuthService {
|
|||||||
username: dbUser.username,
|
username: dbUser.username,
|
||||||
email: dbUser.email,
|
email: dbUser.email,
|
||||||
avatar: dbUser.avatar || undefined,
|
avatar: dbUser.avatar || undefined,
|
||||||
|
slug: dbUser.slug || undefined,
|
||||||
|
displayName: dbUser.displayName || undefined,
|
||||||
|
bio: dbUser.bio || undefined,
|
||||||
|
profilePublic: dbUser.profilePublic,
|
||||||
|
website: dbUser.website || undefined,
|
||||||
|
discordServer: dbUser.discordServer || undefined,
|
||||||
|
bluesky: dbUser.bluesky || undefined,
|
||||||
|
github: dbUser.github || undefined,
|
||||||
|
linkedin: dbUser.linkedin || undefined,
|
||||||
isAdmin: dbUser.isAdmin,
|
isAdmin: dbUser.isAdmin,
|
||||||
isBanned: dbUser.isBanned,
|
isBanned: dbUser.isBanned,
|
||||||
inDiscord: dbUser.inDiscord,
|
inDiscord: dbUser.inDiscord,
|
||||||
@@ -217,6 +235,15 @@ export class AuthService {
|
|||||||
username: dbUser.username,
|
username: dbUser.username,
|
||||||
email: dbUser.email,
|
email: dbUser.email,
|
||||||
avatar: dbUser.avatar || undefined,
|
avatar: dbUser.avatar || undefined,
|
||||||
|
slug: dbUser.slug || undefined,
|
||||||
|
displayName: dbUser.displayName || undefined,
|
||||||
|
bio: dbUser.bio || undefined,
|
||||||
|
profilePublic: dbUser.profilePublic,
|
||||||
|
website: dbUser.website || undefined,
|
||||||
|
discordServer: dbUser.discordServer || undefined,
|
||||||
|
bluesky: dbUser.bluesky || undefined,
|
||||||
|
github: dbUser.github || undefined,
|
||||||
|
linkedin: dbUser.linkedin || undefined,
|
||||||
isAdmin: dbUser.isAdmin,
|
isAdmin: dbUser.isAdmin,
|
||||||
isBanned: dbUser.isBanned,
|
isBanned: dbUser.isBanned,
|
||||||
inDiscord: dbUser.inDiscord,
|
inDiscord: dbUser.inDiscord,
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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 {
|
return {
|
||||||
id: comment.id,
|
id: comment.id,
|
||||||
content: comment.content,
|
content: comment.content,
|
||||||
@@ -71,6 +76,7 @@ export class CommentService {
|
|||||||
artId: comment.artId || undefined,
|
artId: comment.artId || undefined,
|
||||||
showId: comment.showId || undefined,
|
showId: comment.showId || undefined,
|
||||||
mangaId: comment.mangaId || undefined,
|
mangaId: comment.mangaId || undefined,
|
||||||
|
hasPendingReports,
|
||||||
createdAt: comment.createdAt,
|
createdAt: comment.createdAt,
|
||||||
updatedAt: comment.updatedAt,
|
updatedAt: comment.updatedAt,
|
||||||
};
|
};
|
||||||
@@ -79,28 +85,28 @@ export class CommentService {
|
|||||||
async getCommentsForGame(gameId: string): Promise<Comment[]> {
|
async getCommentsForGame(gameId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { gameId },
|
where: { gameId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
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[]> {
|
async getCommentsForBook(bookId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { bookId },
|
where: { bookId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
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[]> {
|
async getCommentsForMusic(musicId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { musicId },
|
where: { musicId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
orderBy: { createdAt: "desc" },
|
||||||
});
|
});
|
||||||
return comments.map((c) => this.mapComment(c));
|
return Promise.all(comments.map((c) => this.mapComment(c)));
|
||||||
}
|
}
|
||||||
|
|
||||||
async createCommentForGame(
|
async createCommentForGame(
|
||||||
@@ -116,7 +122,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
gameId,
|
gameId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -134,7 +140,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
bookId,
|
bookId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -152,7 +158,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
musicId,
|
musicId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -160,10 +166,10 @@ export class CommentService {
|
|||||||
async getCommentsForArt(artId: string): Promise<Comment[]> {
|
async getCommentsForArt(artId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { artId },
|
where: { artId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
orderBy: { createdAt: "desc" },
|
||||||
});
|
});
|
||||||
return comments.map((c) => this.mapComment(c));
|
return Promise.all(comments.map((c) => this.mapComment(c)));
|
||||||
}
|
}
|
||||||
|
|
||||||
async createCommentForArt(
|
async createCommentForArt(
|
||||||
@@ -179,7 +185,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
artId,
|
artId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -187,10 +193,10 @@ export class CommentService {
|
|||||||
async getCommentsForShow(showId: string): Promise<Comment[]> {
|
async getCommentsForShow(showId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { showId },
|
where: { showId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
orderBy: { createdAt: "desc" },
|
||||||
});
|
});
|
||||||
return comments.map((c) => this.mapComment(c));
|
return Promise.all(comments.map((c) => this.mapComment(c)));
|
||||||
}
|
}
|
||||||
|
|
||||||
async createCommentForShow(
|
async createCommentForShow(
|
||||||
@@ -206,7 +212,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
showId,
|
showId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -214,10 +220,10 @@ export class CommentService {
|
|||||||
async getCommentsForManga(mangaId: string): Promise<Comment[]> {
|
async getCommentsForManga(mangaId: string): Promise<Comment[]> {
|
||||||
const comments = await this.prisma.comment.findMany({
|
const comments = await this.prisma.comment.findMany({
|
||||||
where: { mangaId },
|
where: { mangaId },
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
orderBy: { createdAt: "desc" },
|
orderBy: { createdAt: "desc" },
|
||||||
});
|
});
|
||||||
return comments.map((c) => this.mapComment(c));
|
return Promise.all(comments.map((c) => this.mapComment(c)));
|
||||||
}
|
}
|
||||||
|
|
||||||
async createCommentForManga(
|
async createCommentForManga(
|
||||||
@@ -233,7 +239,7 @@ export class CommentService {
|
|||||||
userId,
|
userId,
|
||||||
mangaId,
|
mangaId,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
@@ -256,7 +262,7 @@ export class CommentService {
|
|||||||
content: sanitizedContent,
|
content: sanitizedContent,
|
||||||
rawContent: content,
|
rawContent: content,
|
||||||
},
|
},
|
||||||
include: { user: true },
|
include: { user: true, reports: true },
|
||||||
});
|
});
|
||||||
return this.mapComment(comment);
|
return this.mapComment(comment);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,6 +6,7 @@
|
|||||||
|
|
||||||
import { User } from "@library/shared-types";
|
import { User } from "@library/shared-types";
|
||||||
import { prisma } from "../lib/prisma";
|
import { prisma } from "../lib/prisma";
|
||||||
|
import { SuggestionStatus } from "@prisma/client";
|
||||||
|
|
||||||
export class UserService {
|
export class UserService {
|
||||||
private prisma = prisma;
|
private prisma = prisma;
|
||||||
@@ -21,6 +22,17 @@ export class UserService {
|
|||||||
username: user.username,
|
username: user.username,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
avatar: user.avatar || undefined,
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
isAdmin: user.isAdmin,
|
isAdmin: user.isAdmin,
|
||||||
isBanned: user.isBanned,
|
isBanned: user.isBanned,
|
||||||
inDiscord: user.inDiscord,
|
inDiscord: user.inDiscord,
|
||||||
@@ -45,6 +57,17 @@ export class UserService {
|
|||||||
username: user.username,
|
username: user.username,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
avatar: user.avatar || undefined,
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
isAdmin: user.isAdmin,
|
isAdmin: user.isAdmin,
|
||||||
isBanned: user.isBanned,
|
isBanned: user.isBanned,
|
||||||
inDiscord: user.inDiscord,
|
inDiscord: user.inDiscord,
|
||||||
@@ -66,6 +89,17 @@ export class UserService {
|
|||||||
username: user.username,
|
username: user.username,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
avatar: user.avatar || undefined,
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
isAdmin: user.isAdmin,
|
isAdmin: user.isAdmin,
|
||||||
isBanned: user.isBanned,
|
isBanned: user.isBanned,
|
||||||
inDiscord: user.inDiscord,
|
inDiscord: user.inDiscord,
|
||||||
@@ -87,6 +121,17 @@ export class UserService {
|
|||||||
username: user.username,
|
username: user.username,
|
||||||
email: user.email,
|
email: user.email,
|
||||||
avatar: user.avatar || undefined,
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
isAdmin: user.isAdmin,
|
isAdmin: user.isAdmin,
|
||||||
isBanned: user.isBanned,
|
isBanned: user.isBanned,
|
||||||
inDiscord: user.inDiscord,
|
inDiscord: user.inDiscord,
|
||||||
@@ -104,4 +149,172 @@ export class UserService {
|
|||||||
|
|
||||||
return user?.isBanned ?? false;
|
return user?.isBanned ?? false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getUserBySlug(slug: string): Promise<User | null> {
|
||||||
|
const user = await this.prisma.user.findFirst({
|
||||||
|
where: { slug },
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: user.id,
|
||||||
|
discordId: user.discordId,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
|
isAdmin: user.isAdmin,
|
||||||
|
isBanned: user.isBanned,
|
||||||
|
inDiscord: user.inDiscord,
|
||||||
|
isVip: user.isVip,
|
||||||
|
isMod: user.isMod,
|
||||||
|
isStaff: user.isStaff,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateUserSettings(
|
||||||
|
id: string,
|
||||||
|
updates: {
|
||||||
|
slug?: string;
|
||||||
|
displayName?: string;
|
||||||
|
bio?: string;
|
||||||
|
profilePublic?: boolean;
|
||||||
|
website?: string;
|
||||||
|
discordServer?: string;
|
||||||
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
}
|
||||||
|
): Promise<User | null> {
|
||||||
|
const user = await this.prisma.user.update({
|
||||||
|
where: { id },
|
||||||
|
data: updates,
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: user.id,
|
||||||
|
discordId: user.discordId,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
avatar: user.avatar || undefined,
|
||||||
|
slug: user.slug || undefined,
|
||||||
|
displayName: user.displayName || undefined,
|
||||||
|
bio: user.bio || undefined,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
website: user.website || undefined,
|
||||||
|
discordServer: user.discordServer || undefined,
|
||||||
|
bluesky: user.bluesky || undefined,
|
||||||
|
github: user.github || undefined,
|
||||||
|
linkedin: user.linkedin || undefined,
|
||||||
|
twitch: user.twitch || undefined,
|
||||||
|
youtube: user.youtube || undefined,
|
||||||
|
isAdmin: user.isAdmin,
|
||||||
|
isBanned: user.isBanned,
|
||||||
|
inDiscord: user.inDiscord,
|
||||||
|
isVip: user.isVip,
|
||||||
|
isMod: user.isMod,
|
||||||
|
isStaff: user.isStaff,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async getUserProfile(identifier: string): Promise<{
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
displayName?: string | null;
|
||||||
|
avatar?: string | null;
|
||||||
|
bio?: string | null;
|
||||||
|
slug?: string | null;
|
||||||
|
website?: string | null;
|
||||||
|
discordServer?: string | null;
|
||||||
|
bluesky?: string | null;
|
||||||
|
github?: string | null;
|
||||||
|
linkedin?: string | null;
|
||||||
|
twitch?: string | null;
|
||||||
|
youtube?: string | null;
|
||||||
|
isStaff: boolean;
|
||||||
|
isMod: boolean;
|
||||||
|
isVip: boolean;
|
||||||
|
inDiscord: boolean;
|
||||||
|
profilePublic: boolean;
|
||||||
|
createdAt: Date;
|
||||||
|
stats: {
|
||||||
|
suggestionsCount: number;
|
||||||
|
suggestionsAcceptedCount: number;
|
||||||
|
likesCount: number;
|
||||||
|
commentsCount: number;
|
||||||
|
};
|
||||||
|
} | null> {
|
||||||
|
// Try to find by slug first, then by id if it's a valid ObjectId
|
||||||
|
const isValidObjectId = /^[0-9a-f]{24}$/i.test(identifier);
|
||||||
|
|
||||||
|
const whereConditions = isValidObjectId
|
||||||
|
? [{ slug: identifier }, { id: identifier }]
|
||||||
|
: [{ slug: identifier }];
|
||||||
|
|
||||||
|
const user = await this.prisma.user.findFirst({
|
||||||
|
where: {
|
||||||
|
OR: whereConditions,
|
||||||
|
},
|
||||||
|
include: {
|
||||||
|
suggestions: {
|
||||||
|
select: { id: true, status: true },
|
||||||
|
},
|
||||||
|
likes: {
|
||||||
|
select: { id: true },
|
||||||
|
},
|
||||||
|
comments: {
|
||||||
|
select: { id: true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: user.id,
|
||||||
|
username: user.username,
|
||||||
|
displayName: user.displayName,
|
||||||
|
avatar: user.avatar,
|
||||||
|
bio: user.bio,
|
||||||
|
slug: user.slug,
|
||||||
|
website: user.website,
|
||||||
|
discordServer: user.discordServer,
|
||||||
|
bluesky: user.bluesky,
|
||||||
|
github: user.github,
|
||||||
|
linkedin: user.linkedin,
|
||||||
|
twitch: user.twitch,
|
||||||
|
youtube: user.youtube,
|
||||||
|
isStaff: user.isStaff,
|
||||||
|
isMod: user.isMod,
|
||||||
|
isVip: user.isVip,
|
||||||
|
inDiscord: user.inDiscord,
|
||||||
|
profilePublic: user.profilePublic,
|
||||||
|
createdAt: user.createdAt,
|
||||||
|
stats: {
|
||||||
|
suggestionsCount: user.suggestions.length,
|
||||||
|
suggestionsAcceptedCount: user.suggestions.filter(
|
||||||
|
(suggestion) => suggestion.status === SuggestionStatus.ACCEPTED
|
||||||
|
).length,
|
||||||
|
likesCount: user.likes.length,
|
||||||
|
commentsCount: user.comments.length,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,4 +18,4 @@ describe("frontend-e2e", () => {
|
|||||||
// Function helper example, see `../support/app.po.ts` file
|
// Function helper example, see `../support/app.po.ts` file
|
||||||
getGreeting().contains(/Welcome/);
|
getGreeting().contains(/Welcome/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,4 +4,9 @@
|
|||||||
* @license Naomi's Public License
|
* @license Naomi's Public License
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export const getGreeting = (): Cypress.Chainable => cy.get("h1");
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
export const getGreeting = (): Cypress.Chainable => {
|
||||||
|
return cy.get("h1");
|
||||||
|
};
|
||||||
|
|||||||
@@ -13,14 +13,14 @@
|
|||||||
*
|
*
|
||||||
* For more comprehensive examples of custom
|
* For more comprehensive examples of custom
|
||||||
* commands please read more here:
|
* 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
|
// eslint-disable-next-line @typescript-eslint/no-namespace -- Required for Cypress type extensions
|
||||||
declare namespace Cypress {
|
declare namespace Cypress {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Subject is required for type definition
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars -- Subject is required for type definition
|
||||||
interface Chainable<Subject> {
|
interface Chainable<Subject> {
|
||||||
login: (email: string, password: string) => void;
|
login: (email: string, password: string)=> void;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,11 +30,17 @@ Cypress.Commands.add("login", (email, password) => {
|
|||||||
console.log("Custom command example: 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) => { ... })
|
||||||
|
*/
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
* 'supportFile' configuration option.
|
* 'supportFile' configuration option.
|
||||||
*
|
*
|
||||||
* You can read more here:
|
* You can read more here:
|
||||||
* https://on.cypress.io/configuration
|
* https://on.cypress.io/configuration.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Import commands.ts using ES2015 syntax:
|
// Import commands.ts using ES2015 syntax:
|
||||||
|
|||||||
@@ -41,6 +41,10 @@ export const appRoutes: Route[] = [
|
|||||||
path: 'admin/suggestions',
|
path: 'admin/suggestions',
|
||||||
loadComponent: () => import('./components/admin/admin-suggestions.component').then(m => m.AdminSuggestionsComponent)
|
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',
|
path: 'my-suggestions',
|
||||||
loadComponent: () => import('./components/my-suggestions/my-suggestions.component').then(m => m.MySuggestionsComponent)
|
loadComponent: () => import('./components/my-suggestions/my-suggestions.component').then(m => m.MySuggestionsComponent)
|
||||||
@@ -49,6 +53,14 @@ export const appRoutes: Route[] = [
|
|||||||
path: 'my-likes',
|
path: 'my-likes',
|
||||||
loadComponent: () => import('./components/my-likes/my-likes.component').then(m => m.MyLikesComponent)
|
loadComponent: () => import('./components/my-likes/my-likes.component').then(m => m.MyLikesComponent)
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'profile/:identifier',
|
||||||
|
loadComponent: () => import('./components/profile/profile.component').then(m => m.ProfileComponent)
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'settings',
|
||||||
|
loadComponent: () => import('./components/settings/settings.component').then(m => m.SettingsComponent)
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '**',
|
path: '**',
|
||||||
redirectTo: ''
|
redirectTo: ''
|
||||||
|
|||||||
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 { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-art-gallery',
|
selector: 'app-art-gallery',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -468,56 +469,11 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (commentsLoading()[art.id]) {
|
<app-comment-display
|
||||||
<div class="comments-loading">Loading comments...</div>
|
[comments]="getCommentsSignal(art.id)"
|
||||||
} @else {
|
(onEdit)="handleCommentEdit(art.id, $event)"
|
||||||
@for (comment of comments()[art.id] || []; track comment.id) {
|
(onDelete)="deleteComment(art.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -1615,4 +1571,21 @@ export class ArtGalleryComponent implements OnInit {
|
|||||||
toggleFilters() {
|
toggleFilters() {
|
||||||
this.showFilters.update(v => !v);
|
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 { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-books-list',
|
selector: 'app-books-list',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -655,52 +656,11 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
|
|||||||
@if (commentsLoading()[book.id]) {
|
@if (commentsLoading()[book.id]) {
|
||||||
<div class="comments-loading">Loading comments...</div>
|
<div class="comments-loading">Loading comments...</div>
|
||||||
} @else {
|
} @else {
|
||||||
@for (comment of comments()[book.id] || []; track comment.id) {
|
<app-comment-display
|
||||||
<div class="comment">
|
[comments]="getCommentsSignal(book.id)"
|
||||||
<div class="comment-header">
|
(onEdit)="handleCommentEdit(book.id, $event)"
|
||||||
@if (comment.user.avatar) {
|
(onDelete)="deleteComment(book.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -1982,4 +1942,21 @@ export class BooksListComponent implements OnInit {
|
|||||||
alert('Failed to submit suggestion. Please try again.');
|
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 { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-games-list',
|
selector: 'app-games-list',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -608,52 +609,11 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
|
|||||||
@if (commentsLoading()[game.id]) {
|
@if (commentsLoading()[game.id]) {
|
||||||
<div class="comments-loading">Loading comments...</div>
|
<div class="comments-loading">Loading comments...</div>
|
||||||
} @else {
|
} @else {
|
||||||
@for (comment of comments()[game.id] || []; track comment.id) {
|
<app-comment-display
|
||||||
<div class="comment">
|
[comments]="getCommentsSignal(game.id)"
|
||||||
<div class="comment-header">
|
(onEdit)="handleCommentEdit(game.id, $event)"
|
||||||
@if (comment.user.avatar) {
|
(onDelete)="deleteComment(game.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</div>
|
</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
|
// Suggestion methods
|
||||||
toggleSuggestForm() {
|
toggleSuggestForm() {
|
||||||
this.showSuggestForm.update(v => !v);
|
this.showSuggestForm.update(v => !v);
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ import { ApiService } from '../../services/api.service';
|
|||||||
}
|
}
|
||||||
@if (showDropdown()) {
|
@if (showDropdown()) {
|
||||||
<div class="dropdown-menu">
|
<div class="dropdown-menu">
|
||||||
|
<a [routerLink]="['/profile', user.slug || user.id]" class="dropdown-item" (click)="closeDropdown()">My Profile</a>
|
||||||
|
<a routerLink="/settings" class="dropdown-item" (click)="closeDropdown()">Settings</a>
|
||||||
@if (!user.isAdmin) {
|
@if (!user.isAdmin) {
|
||||||
<a routerLink="/my-suggestions" class="dropdown-item" (click)="closeDropdown()">My Suggestions</a>
|
<a routerLink="/my-suggestions" class="dropdown-item" (click)="closeDropdown()">My Suggestions</a>
|
||||||
}
|
}
|
||||||
@@ -58,6 +60,7 @@ import { ApiService } from '../../services/api.service';
|
|||||||
<a routerLink="/admin/users" class="dropdown-item" (click)="closeDropdown()">Users</a>
|
<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/audit" class="dropdown-item" (click)="closeDropdown()">Audit</a>
|
||||||
<a routerLink="/admin/suggestions" class="dropdown-item" (click)="closeDropdown()">Suggestions</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>
|
<button (click)="logout()" class="dropdown-item logout-btn">Logout</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
|
|||||||
import { SuggestionService } from '../../services/suggestion.service';
|
import { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-manga-list',
|
selector: 'app-manga-list',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -610,56 +611,11 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (commentsLoading()[manga.id]) {
|
<app-comment-display
|
||||||
<div class="comments-loading">Loading comments...</div>
|
[comments]="getCommentsSignal(manga.id)"
|
||||||
} @else {
|
(onEdit)="handleCommentEdit(manga.id, $event)"
|
||||||
@for (comment of comments()[manga.id] || []; track comment.id) {
|
(onDelete)="deleteComment(manga.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -1780,4 +1736,21 @@ export class MangaListComponent implements OnInit {
|
|||||||
alert('Failed to submit suggestion. Please try again.');
|
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 { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-music-list',
|
selector: 'app-music-list',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -686,56 +687,11 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (commentsLoading()[music.id]) {
|
<app-comment-display
|
||||||
<div class="comments-loading">Loading comments...</div>
|
[comments]="getCommentsSignal(music.id)"
|
||||||
} @else {
|
(onEdit)="handleCommentEdit(music.id, $event)"
|
||||||
@for (comment of comments()[music.id] || []; track comment.id) {
|
(onDelete)="deleteComment(music.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -2014,4 +1970,21 @@ export class MusicListComponent implements OnInit {
|
|||||||
alert('Failed to submit suggestion. Please try again.');
|
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] || []);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,498 @@
|
|||||||
|
/**
|
||||||
|
* @copyright 2026 NHCarrigan
|
||||||
|
* @license Naomi's Public License
|
||||||
|
* @author Naomi Carrigan
|
||||||
|
*/
|
||||||
|
|
||||||
|
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, 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, ReportModalComponent],
|
||||||
|
template: `
|
||||||
|
<div class="profile-container">
|
||||||
|
@if (loading()) {
|
||||||
|
<div class="loading">Loading profile...</div>
|
||||||
|
} @else if (error()) {
|
||||||
|
<div class="error">{{ error() }}</div>
|
||||||
|
} @else if (profile()) {
|
||||||
|
<div class="profile-card">
|
||||||
|
<div class="profile-header">
|
||||||
|
@if (profile()?.avatar) {
|
||||||
|
<img [src]="profile()!.avatar" [alt]="profile()!.username" class="profile-avatar" />
|
||||||
|
} @else {
|
||||||
|
<div class="profile-avatar-placeholder">
|
||||||
|
{{ profile()!.username[0]?.toUpperCase() }}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
<div class="profile-info">
|
||||||
|
<h1 class="profile-username">{{ profile()!.displayName || profile()!.username }}</h1>
|
||||||
|
@if (profile()!.displayName) {
|
||||||
|
<p class="profile-handle">\@{{ profile()!.username }}</p>
|
||||||
|
}
|
||||||
|
@if (profile()!.slug) {
|
||||||
|
<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">
|
||||||
|
@if (profile()!.badges.isStaff) {
|
||||||
|
<span class="badge badge-staff">Staff</span>
|
||||||
|
}
|
||||||
|
@if (profile()!.badges.isMod) {
|
||||||
|
<span class="badge badge-mod">Moderator</span>
|
||||||
|
}
|
||||||
|
@if (profile()!.badges.isVip) {
|
||||||
|
<span class="badge badge-vip">VIP</span>
|
||||||
|
}
|
||||||
|
@if (profile()!.badges.inDiscord) {
|
||||||
|
<span class="badge badge-member">Discord Member</span>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (profile()!.bio) {
|
||||||
|
<div class="bio-section">
|
||||||
|
<p class="bio-text">{{ profile()!.bio }}</p>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (profile()!.website || profile()!.github || profile()!.bluesky || profile()!.linkedin || profile()!.twitch || profile()!.youtube || profile()!.discordServer) {
|
||||||
|
<div class="social-links-section">
|
||||||
|
<h2>Social Links</h2>
|
||||||
|
<div class="social-links">
|
||||||
|
@if (profile()!.website) {
|
||||||
|
<a [href]="profile()!.website" target="_blank" rel="noopener noreferrer" class="social-link" title="Website">
|
||||||
|
<fa-icon [icon]="faGlobe" class="icon"></fa-icon>
|
||||||
|
<span class="label">Website</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.github) {
|
||||||
|
<a [href]="'https://github.com/' + profile()!.github" target="_blank" rel="noopener noreferrer" class="social-link" title="GitHub">
|
||||||
|
<fa-icon [icon]="faGithub" class="icon"></fa-icon>
|
||||||
|
<span class="label">GitHub</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.bluesky) {
|
||||||
|
<a [href]="'https://bsky.app/profile/' + profile()!.bluesky" target="_blank" rel="noopener noreferrer" class="social-link" title="Bluesky">
|
||||||
|
<fa-icon [icon]="faCloud" class="icon"></fa-icon>
|
||||||
|
<span class="label">Bluesky</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.linkedin) {
|
||||||
|
<a [href]="'https://linkedin.com/in/' + profile()!.linkedin" target="_blank" rel="noopener noreferrer" class="social-link" title="LinkedIn">
|
||||||
|
<fa-icon [icon]="faLinkedin" class="icon"></fa-icon>
|
||||||
|
<span class="label">LinkedIn</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.twitch) {
|
||||||
|
<a [href]="'https://twitch.tv/' + profile()!.twitch" target="_blank" rel="noopener noreferrer" class="social-link" title="Twitch">
|
||||||
|
<fa-icon [icon]="faTwitch" class="icon"></fa-icon>
|
||||||
|
<span class="label">Twitch</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.youtube) {
|
||||||
|
<a [href]="'https://youtube.com/' + profile()!.youtube" target="_blank" rel="noopener noreferrer" class="social-link" title="YouTube">
|
||||||
|
<fa-icon [icon]="faYoutube" class="icon"></fa-icon>
|
||||||
|
<span class="label">YouTube</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
@if (profile()!.discordServer) {
|
||||||
|
<a [href]="'https://discord.gg/' + profile()!.discordServer" target="_blank" rel="noopener noreferrer" class="social-link" title="Discord Server">
|
||||||
|
<fa-icon [icon]="faDiscord" class="icon"></fa-icon>
|
||||||
|
<span class="label">Discord</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="stats-section">
|
||||||
|
<h2>Activity Statistics</h2>
|
||||||
|
<div class="stats-grid">
|
||||||
|
<div class="stat-card">
|
||||||
|
<span class="stat-value">{{ profile()!.stats.suggestionsCount }}</span>
|
||||||
|
<span class="stat-label">Suggestions</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<span class="stat-value">{{ profile()!.stats.suggestionsAcceptedCount }}</span>
|
||||||
|
<span class="stat-label">Accepted</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<span class="stat-value">{{ profile()!.stats.likesCount }}</span>
|
||||||
|
<span class="stat-label">Likes</span>
|
||||||
|
</div>
|
||||||
|
<div class="stat-card">
|
||||||
|
<span class="stat-value">{{ profile()!.stats.commentsCount }}</span>
|
||||||
|
<span class="stat-label">Comments</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="footer-section">
|
||||||
|
<p class="member-since">Member since {{ formatDate(profile()!.createdAt) }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (reportModalOpen()) {
|
||||||
|
<app-report-modal
|
||||||
|
[reportType]="'profile'"
|
||||||
|
[targetId]="profile()!.id"
|
||||||
|
[reportedUsername]="profile()!.displayName || profile()!.username"
|
||||||
|
(closeModal)="closeReportModal()"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
styles: [`
|
||||||
|
.profile-container {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 2rem auto;
|
||||||
|
padding: 0 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading, .error {
|
||||||
|
text-align: center;
|
||||||
|
padding: 2rem;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
color: var(--error-colour, #c41e3a);
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-card {
|
||||||
|
background: var(--card-background, #1a1a2e);
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 2rem;
|
||||||
|
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 1.5rem;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-avatar {
|
||||||
|
width: 100px;
|
||||||
|
height: 100px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: 3px solid var(--accent-colour, #9b59b6);
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-avatar-placeholder {
|
||||||
|
width: 100px;
|
||||||
|
height: 100px;
|
||||||
|
border-radius: 50%;
|
||||||
|
background: var(--accent-colour, #9b59b6);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
font-size: 2.5rem;
|
||||||
|
font-weight: bold;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-info {
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-username {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 2rem;
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-handle {
|
||||||
|
margin: 0.25rem 0;
|
||||||
|
color: var(--text-muted, #a0a0a0);
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile-slug {
|
||||||
|
margin: 0.25rem 0;
|
||||||
|
color: var(--text-muted, #a0a0a0);
|
||||||
|
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;
|
||||||
|
gap: 0.5rem;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge {
|
||||||
|
padding: 0.4rem 0.8rem;
|
||||||
|
border-radius: 20px;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge-staff {
|
||||||
|
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge-mod {
|
||||||
|
background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge-vip {
|
||||||
|
background: linear-gradient(135deg, #ffd89b 0%, #19547b 100%);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.badge-member {
|
||||||
|
background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%);
|
||||||
|
color: #333;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bio-section {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
padding: 1rem;
|
||||||
|
background: rgba(155, 89, 182, 0.1);
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.bio-text {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
line-height: 1.6;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links-section {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links-section h2 {
|
||||||
|
margin: 0 0 1rem 0;
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-links {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-link {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
padding: 0.75rem 1rem;
|
||||||
|
background: rgba(155, 89, 182, 0.2);
|
||||||
|
border: 1px solid rgba(155, 89, 182, 0.3);
|
||||||
|
border-radius: 8px;
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
text-decoration: none;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-link:hover {
|
||||||
|
background: rgba(155, 89, 182, 0.3);
|
||||||
|
border-color: var(--accent-colour, #9b59b6);
|
||||||
|
transform: translateY(-2px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-link fa-icon {
|
||||||
|
font-size: 1.3rem;
|
||||||
|
width: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-link fa-icon ::ng-deep svg {
|
||||||
|
width: 1.3rem;
|
||||||
|
height: 1.3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.social-link .label {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-section {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-section h2 {
|
||||||
|
margin: 0 0 1rem 0;
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
font-size: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-card {
|
||||||
|
text-align: center;
|
||||||
|
padding: 1rem;
|
||||||
|
background: rgba(155, 89, 182, 0.2);
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid rgba(155, 89, 182, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-value {
|
||||||
|
display: block;
|
||||||
|
font-size: 2rem;
|
||||||
|
font-weight: bold;
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
}
|
||||||
|
|
||||||
|
.stat-label {
|
||||||
|
display: block;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--text-muted, #a0a0a0);
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer-section {
|
||||||
|
text-align: center;
|
||||||
|
padding-top: 1rem;
|
||||||
|
border-top: 1px solid rgba(155, 89, 182, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.member-since {
|
||||||
|
margin: 0;
|
||||||
|
color: var(--text-muted, #a0a0a0);
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
`]
|
||||||
|
})
|
||||||
|
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;
|
||||||
|
faGithub = faGithub;
|
||||||
|
faCloud = faCloud;
|
||||||
|
faLinkedin = faLinkedin;
|
||||||
|
faTwitch = faTwitch;
|
||||||
|
faYoutube = faYoutube;
|
||||||
|
faDiscord = faDiscord;
|
||||||
|
faFlag = faFlag;
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
const identifier = this.route.snapshot.paramMap.get('identifier');
|
||||||
|
if (!identifier) {
|
||||||
|
this.error.set('No user identifier provided');
|
||||||
|
this.loading.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.userService.getProfile(identifier).subscribe({
|
||||||
|
next: (profileData: UserProfileResponse) => {
|
||||||
|
this.profile.set(profileData);
|
||||||
|
this.loading.set(false);
|
||||||
|
},
|
||||||
|
error: (err: Error) => {
|
||||||
|
console.error('Error loading profile:', err);
|
||||||
|
this.error.set('Failed to load profile');
|
||||||
|
this.loading.set(false);
|
||||||
|
this.toastService.error('Failed to load profile');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
formatDate(date: Date | string): string {
|
||||||
|
return new Date(date).toLocaleDateString('en-US', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: 'long',
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,450 @@
|
|||||||
|
/**
|
||||||
|
* @copyright 2026 NHCarrigan
|
||||||
|
* @license Naomi's Public License
|
||||||
|
* @author Naomi Carrigan
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { Component, inject, signal, OnInit } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { UserService, UpdateUserSettingsRequest } from '../../services/user.service';
|
||||||
|
import { AuthService } from '../../services/auth.service';
|
||||||
|
import { ToastService } from '../../services/toast.service';
|
||||||
|
import { User } from '@library/shared-types';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-settings',
|
||||||
|
standalone: true,
|
||||||
|
imports: [CommonModule, FormsModule],
|
||||||
|
template: `
|
||||||
|
<div class="settings-container">
|
||||||
|
<h1>Profile Settings</h1>
|
||||||
|
|
||||||
|
@if (loading()) {
|
||||||
|
<div class="loading">Loading settings...</div>
|
||||||
|
} @else if (user()) {
|
||||||
|
<form class="settings-form" (ngSubmit)="saveSettings()">
|
||||||
|
<div class="form-section">
|
||||||
|
<h2>Profile Information</h2>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="displayName">Display Name</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="displayName"
|
||||||
|
name="displayName"
|
||||||
|
[(ngModel)]="formData.displayName"
|
||||||
|
placeholder="Your display name"
|
||||||
|
maxlength="50"
|
||||||
|
/>
|
||||||
|
<small class="form-help">This will be shown instead of your username</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="slug">Profile URL Slug</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="slug"
|
||||||
|
name="slug"
|
||||||
|
[(ngModel)]="formData.slug"
|
||||||
|
placeholder="your-custom-url"
|
||||||
|
maxlength="30"
|
||||||
|
pattern="[a-z0-9-]+"
|
||||||
|
/>
|
||||||
|
<small class="form-help">
|
||||||
|
Your profile will be at: library.nhcarrigan.com/profile/{{ formData.slug || 'your-slug' }}
|
||||||
|
</small>
|
||||||
|
<small class="form-help">Only lowercase letters, numbers, and hyphens allowed</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="bio">Bio</label>
|
||||||
|
<textarea
|
||||||
|
id="bio"
|
||||||
|
name="bio"
|
||||||
|
[(ngModel)]="formData.bio"
|
||||||
|
placeholder="Tell us about yourself..."
|
||||||
|
rows="4"
|
||||||
|
maxlength="500"
|
||||||
|
></textarea>
|
||||||
|
<small class="form-help">{{ (formData.bio?.length || 0) }} / 500 characters</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-section">
|
||||||
|
<h2>Social Links</h2>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="website">Website</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="website"
|
||||||
|
name="website"
|
||||||
|
[(ngModel)]="formData.website"
|
||||||
|
placeholder="https://yourwebsite.com"
|
||||||
|
pattern="https?://.+"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Your personal website or portfolio (must start with http:// or https://)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="github">GitHub</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="github"
|
||||||
|
name="github"
|
||||||
|
[(ngModel)]="formData.github"
|
||||||
|
placeholder="username"
|
||||||
|
pattern="[a-zA-Z0-9]([a-zA-Z0-9-]{0,37}[a-zA-Z0-9])?"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Just your GitHub username (alphanumeric and hyphens, 1-39 characters)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="bluesky">Bluesky</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="bluesky"
|
||||||
|
name="bluesky"
|
||||||
|
[(ngModel)]="formData.bluesky"
|
||||||
|
placeholder="username.bsky.social"
|
||||||
|
pattern="[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Your full Bluesky handle (e.g., username.bsky.social)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="linkedin">LinkedIn</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="linkedin"
|
||||||
|
name="linkedin"
|
||||||
|
[(ngModel)]="formData.linkedin"
|
||||||
|
placeholder="username"
|
||||||
|
pattern="[a-zA-Z0-9-]{3,100}"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Just your LinkedIn username (alphanumeric and hyphens, 3-100 characters)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="twitch">Twitch</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="twitch"
|
||||||
|
name="twitch"
|
||||||
|
[(ngModel)]="formData.twitch"
|
||||||
|
placeholder="username"
|
||||||
|
pattern="[a-zA-Z0-9_]{4,25}"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Just your Twitch username (alphanumeric and underscores, 4-25 characters)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="youtube">YouTube</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="youtube"
|
||||||
|
name="youtube"
|
||||||
|
[(ngModel)]="formData.youtube"
|
||||||
|
placeholder="@username or channel-id"
|
||||||
|
pattern="(@[a-zA-Z0-9_.-]{3,30}|UC[a-zA-Z0-9_-]{22})"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Your YouTube handle (@username) or channel ID (UC...)</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="discordServer">Discord Server</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
id="discordServer"
|
||||||
|
name="discordServer"
|
||||||
|
[(ngModel)]="formData.discordServer"
|
||||||
|
placeholder="invite-code"
|
||||||
|
pattern="[a-zA-Z0-9]{2,32}"
|
||||||
|
/>
|
||||||
|
<small class="form-help">Just your Discord server invite code (alphanumeric, 2-32 characters)</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-section">
|
||||||
|
<h2>Privacy</h2>
|
||||||
|
|
||||||
|
<div class="form-group checkbox-group">
|
||||||
|
<label>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
name="profilePublic"
|
||||||
|
[(ngModel)]="formData.profilePublic"
|
||||||
|
/>
|
||||||
|
<span>Make my profile public</span>
|
||||||
|
</label>
|
||||||
|
<small class="form-help">
|
||||||
|
When disabled, only you can view your profile
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-section">
|
||||||
|
<h2>Account Information</h2>
|
||||||
|
<div class="info-item">
|
||||||
|
<strong>Username:</strong> {{ user()!.username }}
|
||||||
|
</div>
|
||||||
|
<div class="info-item">
|
||||||
|
<strong>Email:</strong> {{ user()!.email }}
|
||||||
|
</div>
|
||||||
|
@if (user()!.avatar) {
|
||||||
|
<div class="info-item">
|
||||||
|
<strong>Avatar:</strong>
|
||||||
|
<img [src]="user()!.avatar" alt="Avatar" class="avatar-preview" />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
<small class="form-help">
|
||||||
|
Username, email, and avatar are managed through Discord and cannot be changed here
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-actions">
|
||||||
|
<button type="submit" class="btn btn-primary" [disabled]="saving()">
|
||||||
|
{{ saving() ? 'Saving...' : 'Save Changes' }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
`,
|
||||||
|
styles: [`
|
||||||
|
.settings-container {
|
||||||
|
max-width: 700px;
|
||||||
|
margin: 2rem auto;
|
||||||
|
padding: 0 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading {
|
||||||
|
text-align: center;
|
||||||
|
padding: 2rem;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-form {
|
||||||
|
background: var(--card-background, #1a1a2e);
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-section {
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
padding-bottom: 2rem;
|
||||||
|
border-bottom: 1px solid rgba(155, 89, 182, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-section:last-of-type {
|
||||||
|
border-bottom: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-section h2 {
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
font-size: 1.3rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group label {
|
||||||
|
display: block;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
font-weight: 600;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input[type="text"],
|
||||||
|
.form-group textarea {
|
||||||
|
width: 100%;
|
||||||
|
padding: 0.75rem;
|
||||||
|
border: 1px solid rgba(155, 89, 182, 0.5);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: rgba(0, 0, 0, 0.2);
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
font-size: 1rem;
|
||||||
|
font-family: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input[type="text"]:focus,
|
||||||
|
.form-group textarea:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--accent-colour, #9b59b6);
|
||||||
|
box-shadow: 0 0 0 2px rgba(155, 89, 182, 0.3);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input[type="text"]:invalid:not(:focus):not(:placeholder-shown),
|
||||||
|
.form-group textarea:invalid:not(:focus):not(:placeholder-shown) {
|
||||||
|
border-color: var(--error-colour, #c41e3a);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group input[type="text"]:valid:not(:placeholder-shown),
|
||||||
|
.form-group textarea:valid:not(:placeholder-shown) {
|
||||||
|
border-color: rgba(46, 204, 113, 0.5);
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group textarea {
|
||||||
|
resize: vertical;
|
||||||
|
min-height: 100px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-help {
|
||||||
|
display: block;
|
||||||
|
margin-top: 0.25rem;
|
||||||
|
color: var(--text-muted, #a0a0a0);
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-group label {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-group input[type="checkbox"] {
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-item {
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
color: var(--text-colour, #e0e0e0);
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-item strong {
|
||||||
|
color: var(--accent-colour, #9b59b6);
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-preview {
|
||||||
|
width: 50px;
|
||||||
|
height: 50px;
|
||||||
|
border-radius: 50%;
|
||||||
|
margin-left: 0.5rem;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-actions {
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
padding-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
padding: 0.75rem 2rem;
|
||||||
|
border: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
font-size: 1rem;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary:hover:not(:disabled) {
|
||||||
|
transform: translateY(-2px);
|
||||||
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:disabled {
|
||||||
|
opacity: 0.5;
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
`]
|
||||||
|
})
|
||||||
|
export class SettingsComponent implements OnInit {
|
||||||
|
private userService = inject(UserService);
|
||||||
|
private authService = inject(AuthService);
|
||||||
|
private toastService = inject(ToastService);
|
||||||
|
|
||||||
|
user = signal<User | null>(null);
|
||||||
|
loading = signal(true);
|
||||||
|
saving = signal(false);
|
||||||
|
|
||||||
|
formData: UpdateUserSettingsRequest & { bio?: string } = {
|
||||||
|
displayName: '',
|
||||||
|
slug: '',
|
||||||
|
bio: '',
|
||||||
|
profilePublic: true,
|
||||||
|
website: '',
|
||||||
|
discordServer: '',
|
||||||
|
bluesky: '',
|
||||||
|
github: '',
|
||||||
|
linkedin: '',
|
||||||
|
twitch: '',
|
||||||
|
youtube: ''
|
||||||
|
};
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.userService.getMe().subscribe({
|
||||||
|
next: (userData: User) => {
|
||||||
|
this.user.set(userData);
|
||||||
|
this.formData = {
|
||||||
|
displayName: userData.displayName || '',
|
||||||
|
slug: userData.slug || '',
|
||||||
|
bio: userData.bio || '',
|
||||||
|
profilePublic: userData.profilePublic ?? true,
|
||||||
|
website: userData.website || '',
|
||||||
|
discordServer: userData.discordServer || '',
|
||||||
|
bluesky: userData.bluesky || '',
|
||||||
|
github: userData.github || '',
|
||||||
|
linkedin: userData.linkedin || '',
|
||||||
|
twitch: userData.twitch || '',
|
||||||
|
youtube: userData.youtube || ''
|
||||||
|
};
|
||||||
|
this.loading.set(false);
|
||||||
|
},
|
||||||
|
error: (err: Error) => {
|
||||||
|
console.error('Error loading user profile:', err);
|
||||||
|
this.toastService.error('Failed to load profile');
|
||||||
|
this.loading.set(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
saveSettings(): void {
|
||||||
|
this.saving.set(true);
|
||||||
|
|
||||||
|
const updates: UpdateUserSettingsRequest = {
|
||||||
|
displayName: this.formData.displayName || undefined,
|
||||||
|
slug: this.formData.slug || undefined,
|
||||||
|
bio: this.formData.bio || undefined,
|
||||||
|
profilePublic: this.formData.profilePublic,
|
||||||
|
website: this.formData.website || undefined,
|
||||||
|
discordServer: this.formData.discordServer || undefined,
|
||||||
|
bluesky: this.formData.bluesky || undefined,
|
||||||
|
github: this.formData.github || undefined,
|
||||||
|
linkedin: this.formData.linkedin || undefined,
|
||||||
|
twitch: this.formData.twitch || undefined,
|
||||||
|
youtube: this.formData.youtube || undefined
|
||||||
|
};
|
||||||
|
|
||||||
|
this.userService.updateSettings(updates).subscribe({
|
||||||
|
next: (updatedUser: User) => {
|
||||||
|
this.user.set(updatedUser);
|
||||||
|
this.authService.updateUser(updatedUser);
|
||||||
|
this.saving.set(false);
|
||||||
|
this.toastService.success('Settings saved successfully!');
|
||||||
|
},
|
||||||
|
error: (err: Error) => {
|
||||||
|
console.error('Error saving settings:', err);
|
||||||
|
this.toastService.error('Failed to save settings');
|
||||||
|
this.saving.set(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
|
|||||||
import { SuggestionService } from '../../services/suggestion.service';
|
import { SuggestionService } from '../../services/suggestion.service';
|
||||||
import { PaginationComponent } from '../shared/pagination.component';
|
import { PaginationComponent } from '../shared/pagination.component';
|
||||||
import { LikeButtonComponent } from '../shared/like-button.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';
|
import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-shows-list',
|
selector: 'app-shows-list',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
|
imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
|
||||||
template: `
|
template: `
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="header-section">
|
<div class="header-section">
|
||||||
@@ -604,56 +605,11 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (commentsLoading()[show.id]) {
|
<app-comment-display
|
||||||
<div class="comments-loading">Loading comments...</div>
|
[comments]="getCommentsSignal(show.id)"
|
||||||
} @else {
|
(onEdit)="handleCommentEdit(show.id, $event)"
|
||||||
@for (comment of comments()[show.id] || []; track comment.id) {
|
(onDelete)="deleteComment(show.id, $event)"
|
||||||
<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>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
@@ -1783,4 +1739,21 @@ export class ShowsListComponent implements OnInit {
|
|||||||
alert('Failed to submit suggestion. Please try again.');
|
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] || []);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,6 +123,10 @@ export class AuthService {
|
|||||||
return this.user() !== null;
|
return this.user() !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
updateUser(user: User): void {
|
||||||
|
this.currentUser.set(user);
|
||||||
|
}
|
||||||
|
|
||||||
isAdmin(): boolean {
|
isAdmin(): boolean {
|
||||||
return this.user()?.isAdmin === true;
|
return this.user()?.isAdmin === true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,4 +8,5 @@ export { ApiService } from './api.service';
|
|||||||
export { AuthService } from './auth.service';
|
export { AuthService } from './auth.service';
|
||||||
export { BooksService } from './books.service';
|
export { BooksService } from './books.service';
|
||||||
export { GamesService } from './games.service';
|
export { GamesService } from './games.service';
|
||||||
export { MusicService } from './music.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
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,49 @@ import { Observable } from 'rxjs';
|
|||||||
import { ApiService } from './api.service';
|
import { ApiService } from './api.service';
|
||||||
import { User } from '@library/shared-types';
|
import { User } from '@library/shared-types';
|
||||||
|
|
||||||
|
export interface UserProfileResponse {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
displayName?: string;
|
||||||
|
avatar?: string;
|
||||||
|
bio?: string;
|
||||||
|
slug?: string;
|
||||||
|
website?: string;
|
||||||
|
discordServer?: string;
|
||||||
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
badges: {
|
||||||
|
isStaff: boolean;
|
||||||
|
isMod: boolean;
|
||||||
|
isVip: boolean;
|
||||||
|
inDiscord: boolean;
|
||||||
|
};
|
||||||
|
stats: {
|
||||||
|
suggestionsCount: number;
|
||||||
|
suggestionsAcceptedCount: number;
|
||||||
|
likesCount: number;
|
||||||
|
commentsCount: number;
|
||||||
|
};
|
||||||
|
createdAt: Date;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpdateUserSettingsRequest {
|
||||||
|
slug?: string;
|
||||||
|
displayName?: string;
|
||||||
|
bio?: string;
|
||||||
|
profilePublic?: boolean;
|
||||||
|
website?: string;
|
||||||
|
discordServer?: string;
|
||||||
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
})
|
})
|
||||||
@@ -26,4 +69,16 @@ export class UserService {
|
|||||||
unbanUser(userId: string): Observable<User> {
|
unbanUser(userId: string): Observable<User> {
|
||||||
return this.api.post<User>(`/users/${userId}/unban`, {});
|
return this.api.post<User>(`/users/${userId}/unban`, {});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getMe(): Observable<User> {
|
||||||
|
return this.api.get<User>('/users/me');
|
||||||
|
}
|
||||||
|
|
||||||
|
updateSettings(settings: UpdateUserSettingsRequest): Observable<User> {
|
||||||
|
return this.api.put<User>('/users/me', settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
getProfile(identifier: string): Observable<UserProfileResponse> {
|
||||||
|
return this.api.get<UserProfileResponse>(`/users/profile/${identifier}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,10 @@
|
|||||||
"@fastify/rate-limit": "10.3.0",
|
"@fastify/rate-limit": "10.3.0",
|
||||||
"@fastify/sensible": "6.0.4",
|
"@fastify/sensible": "6.0.4",
|
||||||
"@fastify/static": "9.0.0",
|
"@fastify/static": "9.0.0",
|
||||||
|
"@fortawesome/angular-fontawesome": "4.0.0",
|
||||||
|
"@fortawesome/fontawesome-svg-core": "7.2.0",
|
||||||
|
"@fortawesome/free-brands-svg-icons": "7.2.0",
|
||||||
|
"@fortawesome/free-solid-svg-icons": "7.2.0",
|
||||||
"@nhcarrigan/logger": "1.1.1",
|
"@nhcarrigan/logger": "1.1.1",
|
||||||
"@prisma/client": "6.19.2",
|
"@prisma/client": "6.19.2",
|
||||||
"dompurify": "3.3.1",
|
"dompurify": "3.3.1",
|
||||||
|
|||||||
Generated
+53
@@ -56,6 +56,18 @@ importers:
|
|||||||
'@fastify/static':
|
'@fastify/static':
|
||||||
specifier: 9.0.0
|
specifier: 9.0.0
|
||||||
version: 9.0.0
|
version: 9.0.0
|
||||||
|
'@fortawesome/angular-fontawesome':
|
||||||
|
specifier: 4.0.0
|
||||||
|
version: 4.0.0(@angular/core@21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2))
|
||||||
|
'@fortawesome/fontawesome-svg-core':
|
||||||
|
specifier: 7.2.0
|
||||||
|
version: 7.2.0
|
||||||
|
'@fortawesome/free-brands-svg-icons':
|
||||||
|
specifier: 7.2.0
|
||||||
|
version: 7.2.0
|
||||||
|
'@fortawesome/free-solid-svg-icons':
|
||||||
|
specifier: 7.2.0
|
||||||
|
version: 7.2.0
|
||||||
'@nhcarrigan/logger':
|
'@nhcarrigan/logger':
|
||||||
specifier: 1.1.1
|
specifier: 1.1.1
|
||||||
version: 1.1.1
|
version: 1.1.1
|
||||||
@@ -1659,6 +1671,27 @@ packages:
|
|||||||
'@fastify/static@9.0.0':
|
'@fastify/static@9.0.0':
|
||||||
resolution: {integrity: sha512-r64H8Woe/vfilg5RTy7lwWlE8ZZcTrc3kebYFMEUBrMqlydhQyoiExQXdYAy2REVpST/G35+stAM8WYp1WGmMA==}
|
resolution: {integrity: sha512-r64H8Woe/vfilg5RTy7lwWlE8ZZcTrc3kebYFMEUBrMqlydhQyoiExQXdYAy2REVpST/G35+stAM8WYp1WGmMA==}
|
||||||
|
|
||||||
|
'@fortawesome/angular-fontawesome@4.0.0':
|
||||||
|
resolution: {integrity: sha512-TCqHqT5ovFY1A4RgMpoBUgS+RX3OVs39+CzHFgzDhbCPAopOa26J748TZJcuZwJAvGAk9tbWeVEmWuLByINAeg==}
|
||||||
|
peerDependencies:
|
||||||
|
'@angular/core': ^21.0.0
|
||||||
|
|
||||||
|
'@fortawesome/fontawesome-common-types@7.2.0':
|
||||||
|
resolution: {integrity: sha512-IpR0bER9FY25p+e7BmFH25MZKEwFHTfRAfhOyJubgiDnoJNsSvJ7nigLraHtp4VOG/cy8D7uiV0dLkHOne5Fhw==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
|
'@fortawesome/fontawesome-svg-core@7.2.0':
|
||||||
|
resolution: {integrity: sha512-6639htZMjEkwskf3J+e6/iar+4cTNM9qhoWuRfj9F3eJD6r7iCzV1SWnQr2Mdv0QT0suuqU8BoJCZUyCtP9R4Q==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
|
'@fortawesome/free-brands-svg-icons@7.2.0':
|
||||||
|
resolution: {integrity: sha512-VNG8xqOip1JuJcC3zsVsKRQ60oXG9+oYNDCosjoU/H9pgYmLTEwWw8pE0jhPz/JWdHeUuK6+NQ3qsM4gIbdbYQ==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
|
'@fortawesome/free-solid-svg-icons@7.2.0':
|
||||||
|
resolution: {integrity: sha512-YTVITFGN0/24PxzXrwqCgnyd7njDuzp5ZvaCx5nq/jg55kUYd94Nj8UTchBdBofi/L0nwRfjGOg0E41d2u9T1w==}
|
||||||
|
engines: {node: '>=6'}
|
||||||
|
|
||||||
'@hapi/boom@10.0.1':
|
'@hapi/boom@10.0.1':
|
||||||
resolution: {integrity: sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==}
|
resolution: {integrity: sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==}
|
||||||
|
|
||||||
@@ -11651,6 +11684,26 @@ snapshots:
|
|||||||
fastq: 1.20.1
|
fastq: 1.20.1
|
||||||
glob: 13.0.1
|
glob: 13.0.1
|
||||||
|
|
||||||
|
'@fortawesome/angular-fontawesome@4.0.0(@angular/core@21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2))':
|
||||||
|
dependencies:
|
||||||
|
'@angular/core': 21.1.2(@angular/compiler@21.1.2)(rxjs@7.8.2)
|
||||||
|
'@fortawesome/fontawesome-svg-core': 7.2.0
|
||||||
|
tslib: 2.8.1
|
||||||
|
|
||||||
|
'@fortawesome/fontawesome-common-types@7.2.0': {}
|
||||||
|
|
||||||
|
'@fortawesome/fontawesome-svg-core@7.2.0':
|
||||||
|
dependencies:
|
||||||
|
'@fortawesome/fontawesome-common-types': 7.2.0
|
||||||
|
|
||||||
|
'@fortawesome/free-brands-svg-icons@7.2.0':
|
||||||
|
dependencies:
|
||||||
|
'@fortawesome/fontawesome-common-types': 7.2.0
|
||||||
|
|
||||||
|
'@fortawesome/free-solid-svg-icons@7.2.0':
|
||||||
|
dependencies:
|
||||||
|
'@fortawesome/fontawesome-common-types': 7.2.0
|
||||||
|
|
||||||
'@hapi/boom@10.0.1':
|
'@hapi/boom@10.0.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@hapi/hoek': 11.0.7
|
'@hapi/hoek': 11.0.7
|
||||||
|
|||||||
@@ -13,5 +13,6 @@ export * from "./lib/game.types";
|
|||||||
export type * from "./lib/like.types";
|
export type * from "./lib/like.types";
|
||||||
export * from "./lib/manga.types";
|
export * from "./lib/manga.types";
|
||||||
export * from "./lib/music.types";
|
export * from "./lib/music.types";
|
||||||
|
export * from "./lib/report.types";
|
||||||
export * from "./lib/show.types";
|
export * from "./lib/show.types";
|
||||||
export * from "./lib/suggestion.types";
|
export * from "./lib/suggestion.types";
|
||||||
|
|||||||
@@ -5,17 +5,28 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
interface User {
|
interface User {
|
||||||
id: string;
|
id: string;
|
||||||
email: string;
|
email: string;
|
||||||
username: string;
|
username: string;
|
||||||
avatar?: string;
|
avatar?: string;
|
||||||
discordId: string;
|
slug?: string;
|
||||||
isAdmin: boolean;
|
displayName?: string;
|
||||||
isBanned: boolean;
|
bio?: string;
|
||||||
inDiscord: boolean;
|
profilePublic: boolean;
|
||||||
isVip: boolean;
|
website?: string;
|
||||||
isMod: boolean;
|
discordServer?: string;
|
||||||
isStaff: boolean;
|
bluesky?: string;
|
||||||
|
github?: string;
|
||||||
|
linkedin?: string;
|
||||||
|
twitch?: string;
|
||||||
|
youtube?: string;
|
||||||
|
discordId: string;
|
||||||
|
isAdmin: boolean;
|
||||||
|
isBanned: boolean;
|
||||||
|
inDiscord: boolean;
|
||||||
|
isVip: boolean;
|
||||||
|
isMod: boolean;
|
||||||
|
isStaff: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface JwtPayload {
|
interface JwtPayload {
|
||||||
|
|||||||
@@ -15,19 +15,20 @@ interface CommentUser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface Comment {
|
interface Comment {
|
||||||
id: string;
|
id: string;
|
||||||
content: string;
|
content: string;
|
||||||
rawContent?: string;
|
rawContent?: string;
|
||||||
userId: string;
|
userId: string;
|
||||||
user: CommentUser;
|
user: CommentUser;
|
||||||
gameId?: string;
|
gameId?: string;
|
||||||
bookId?: string;
|
bookId?: string;
|
||||||
musicId?: string;
|
musicId?: string;
|
||||||
artId?: string;
|
artId?: string;
|
||||||
showId?: string;
|
showId?: string;
|
||||||
mangaId?: string;
|
mangaId?: string;
|
||||||
createdAt: Date;
|
hasPendingReports?: boolean;
|
||||||
updatedAt: Date;
|
createdAt: Date;
|
||||||
|
updatedAt: Date;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface CreateCommentDto {
|
interface CreateCommentDto {
|
||||||
|
|||||||
@@ -32,16 +32,16 @@ interface Game {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface CreateGameDto {
|
interface CreateGameDto {
|
||||||
title: string;
|
title: string;
|
||||||
platform?: string;
|
platform?: string;
|
||||||
status: GameStatus;
|
status: GameStatus;
|
||||||
dateStarted?: Date;
|
dateStarted?: Date;
|
||||||
dateFinished?: Date;
|
dateFinished?: Date;
|
||||||
rating?: number;
|
rating?: number;
|
||||||
notes?: string;
|
notes?: string;
|
||||||
coverImage?: string;
|
coverImage?: string;
|
||||||
tags?: Array<string>;
|
tags?: Array<string>;
|
||||||
links?: Array<Link>;
|
links?: Array<Link>;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface UpdateGameDto extends Partial<CreateGameDto> {
|
interface UpdateGameDto extends Partial<CreateGameDto> {
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user