27 Commits

Author SHA1 Message Date
Mathis HERRIOT
1be8571f26 chore: bump version to 1.7.5
Some checks failed
CI/CD Pipeline / Valider backend (push) Failing after 1m8s
CI/CD Pipeline / Valider frontend (push) Successful in 1m42s
CI/CD Pipeline / Valider documentation (push) Successful in 1m45s
CI/CD Pipeline / Déploiement en Production (push) Has been skipped
2026-01-29 14:58:09 +01:00
Mathis HERRIOT
29b1db4aed feat: add ViewCounter enhancements and file upload progress tracking
- Improved `ViewCounter` with visibility-based view increment using `IntersectionObserver` and 50% video progress tracking.
- Added real-time file upload progress updates via Socket.io, including status and percentage feedback.
- Integrated `ViewCounter` dynamically into `ContentCard` and removed redundant instances from static pages.
- Updated backend upload logic to emit progress updates at different stages via the `EventsGateway`.
2026-01-29 14:57:44 +01:00
Mathis HERRIOT
9db3067721 refactor: improve import order and code formatting
- Reordered and grouped imports consistently in backend and frontend files for better readability.
- Applied indentation and formatting fixes across frontend components, services, and backend modules.
- Adjusted multiline method calls and type definitions for improved clarity.
2026-01-29 14:44:34 +01:00
Mathis HERRIOT
27f8c7148a feat: enhance user service with role assignment and frontend scroll-area ref support
- Updated `users.service.ts` to assign user roles dynamically based on RBAC.
- Enhanced JWT generation to include the user's role in `auth.service.ts`.
- Added `viewportRef` prop support to `ScrollArea` component in the frontend for improved flexibility.
2026-01-29 14:43:01 +01:00
Mathis HERRIOT
209711195b feat: include user role in JWT payload
- Updated `request.interface.ts` to add `role` to the user object.
- Modified `auth.service.ts` to include `role` in the JWT payload.
2026-01-29 14:37:45 +01:00
Mathis HERRIOT
fafdaee668 feat: implement messaging functionality with real-time updates
- Introduced a messaging module on the backend using NestJS, including repository, service, controller, DTOs, and WebSocket Gateway.
- Developed a frontend messaging page with conversation management, real-time message handling, and chat UI.
- Implemented `MessageService` for API integrations and `SocketProvider` for real-time WebSocket updates.
- Enhanced database schema to support conversations, participants, and messages with Drizzle ORM.
2026-01-29 14:34:22 +01:00
Mathis HERRIOT
01117aad6d feat: add comments functionality and integrate Socket.io for real-time updates
- Implemented a full comments module in the backend with repository, service, controller, and DTOs using NestJS.
- Added frontend support for comments with a `CommentSection` component and integration into content pages.
- Introduced `SocketProvider` on the frontend and integrated Socket.io for real-time communication.
- Updated dependencies and configurations for Socket.io and WebSockets support.
2026-01-29 14:33:34 +01:00
Mathis HERRIOT
e73ae80fc5 chore: bump version to 1.7.4
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m35s
CI/CD Pipeline / Valider frontend (push) Successful in 1m41s
CI/CD Pipeline / Valider documentation (push) Successful in 1m46s
CI/CD Pipeline / Déploiement en Production (push) Successful in 5m26s
2026-01-29 14:11:38 +01:00
Mathis HERRIOT
9ccbd2ceb1 refactor: improve formatting, type safety, and component organization
- Adjusted inconsistent formatting for better readability across components and services.
- Enhanced type safety by adding placeholders for ignored error parameters and improving types across services.
- Improved component organization by reordering imports consistently and applying formatting updates in UI components.
2026-01-29 14:11:28 +01:00
Mathis HERRIOT
3edf5cc070 Merge remote-tracking branch 'origin/main' 2026-01-29 14:05:09 +01:00
Mathis HERRIOT
2d670ad9cf chore: bump version to 1.7.3
Some checks failed
CI/CD Pipeline / Valider frontend (push) Failing after 59s
CI/CD Pipeline / Valider backend (push) Successful in 1m33s
CI/CD Pipeline / Valider documentation (push) Successful in 1m38s
CI/CD Pipeline / Déploiement en Production (push) Has been skipped
2026-01-29 14:03:10 +01:00
Mathis HERRIOT
fc2f5214b1 feat: implement IP banning in crawler-detection middleware using cache manager
- Added Redis-based temporary IP banning for suspicious activity detected by the middleware.
- Injected `CACHE_MANAGER` into the middleware to manage banned IPs.
- Enhanced logging to track banned IP attempts.
- Adjusted middleware logic to handle asynchronous IP checks and updates.
2026-01-29 14:02:49 +01:00
Mathis HERRIOT
aa17c57e26 feat: add data export functionality to settings page and update admin reports table
- Introduced "Export Data" card in settings for exporting user data as a JSON file.
- Added `exportData` method to `UserService` for handling data export requests.
- Updated admin reports table with a new "Cible" column to display target information.
2026-01-29 13:57:07 +01:00
Mathis HERRIOT
004021ff84 feat: display reporter and content details in admin reports table
- Added "Signalé par" column to show reporter ID.
- Displayed content links or "Tag" for reported items.
2026-01-29 13:55:34 +01:00
Mathis HERRIOT
586d827552 feat: add admin reports page for managing user reports
- Introduced a new admin reports page at `/admin/reports`.
- Added functionality to fetch, display, and update the status of user reports.
- Integrated status management with options to review, resolve, and dismiss reports.
2026-01-29 13:52:55 +01:00
Mathis HERRIOT
17fc8d4b68 feat: add REAC_CDA_V04_24052023.pdf file 2026-01-29 13:52:29 +01:00
Mathis HERRIOT
4a66676fcb feat: add reports section to admin dashboard
- Introduced a new "Signalements" card with navigation to `/admin/reports`.
- Added `Flag` icon for the reports section.
2026-01-29 13:52:16 +01:00
Mathis HERRIOT
48db40b3d4 feat: integrate TwoFactorSetup component into settings page
- Added `TwoFactorSetup` to settings for 2FA configuration.
- Enhanced security options in user settings.
2026-01-29 13:51:46 +01:00
Mathis HERRIOT
c32d4e7203 feat: add 2FA verification to auth provider
- Introduced `verify2fa` method for handling two-factor authentication.
- Updated `login` to support 2FA response handling.
- Enhanced `AuthContext` with new `verify2fa` method and types.
2026-01-29 13:51:32 +01:00
Mathis HERRIOT
9b7c2c8e5b feat: add 2FA verification to auth provider
- Introduced `verify2fa` method for handling two-factor authentication.
- Updated `login` to support 2FA response handling.
- Enhanced `AuthContext` with new `verify2fa` method and types.
2026-01-29 13:51:20 +01:00
Mathis HERRIOT
0584c46190 feat: add 2FA prompt and OTP input to login flow
- Integrated 2FA verification into the login process.
- Added conditional rendering for OTP input.
- Updated UI to support dynamic switching between login and 2FA views.
- Introduced new state variables for managing 2FA logic.
2026-01-29 13:49:54 +01:00
Mathis HERRIOT
13ccdbc2ab feat: introduce reporting system and two-factor authentication (2FA)
- Added `ReportDialog` component for user-generated content reporting.
- Integrated `ReportService` with create, update, and fetch report functionalities.
- Enhanced `AuthService` with 2FA setup, enable, disable, and verification methods.
- Updated types to include 2FA responses and reporting-related data.
- Enhanced `ContentCard` UI to support reporting functionality.
- Improved admin services to manage user reports and statuses.
2026-01-29 13:48:59 +01:00
a4d0c6aa8c feat(auth): enhance validation rules for username and password
- Updated username validation to allow only lowercase letters, numbers, and underscores.
- Strengthened password requirements to include at least 8 characters, one uppercase letter, one lowercase letter, one number, and one special character.
- Adjusted frontend forms and backend DTOs to reflect new validation rules.
2026-01-28 21:48:23 +01:00
Mathis HERRIOT
ba0234fd13 chore: bump version to 1.7.2
All checks were successful
CI/CD Pipeline / Valider backend (push) Successful in 1m38s
CI/CD Pipeline / Valider frontend (push) Successful in 1m44s
CI/CD Pipeline / Valider documentation (push) Successful in 1m46s
CI/CD Pipeline / Déploiement en Production (push) Successful in 5m30s
2026-01-28 20:56:56 +01:00
Mathis HERRIOT
81461d04e9 chore: update pnpm-lock.yaml to reflect dependency changes
- Upgraded lockfile version to 9.0.
- Updated dependencies and devDependencies to align with recent changes.
2026-01-28 20:56:44 +01:00
c4e6be4452 chore: bump version to 1.7.1
Some checks failed
CI/CD Pipeline / Valider backend (push) Successful in 1m38s
CI/CD Pipeline / Valider frontend (push) Successful in 1m44s
CI/CD Pipeline / Valider documentation (push) Successful in 1m48s
CI/CD Pipeline / Déploiement en Production (push) Failing after 5s
2026-01-28 20:49:22 +01:00
18288cf8f3 chore(docker): enforce --force flag for pnpm install across all Dockerfiles 2026-01-28 20:49:16 +01:00
59 changed files with 13974 additions and 9662 deletions

BIN
REAC_CDA_V04_24052023.pdf Normal file

Binary file not shown.

View File

@@ -59,12 +59,28 @@ Pour approfondir vos connaissances techniques sur le projet :
## Comment l'utiliser ? ## Comment l'utiliser ?
### Installation locale ### Déploiement en Production
1. Clonez le dépôt. Le projet est prêt pour la production via Docker Compose.
2. Installez les dépendances avec `pnpm install`.
3. Configurez les variables d'environnement (voir `.env.example`). 1. **Prérequis** : Docker et Docker Compose installés.
4. Lancez les services via Docker ou manuellement. 2. **Variables d'environnement** : Copiez `.env.example` en `.env.prod` et ajustez les valeurs (clés secrètes, hosts, Sentry DSN, etc.).
3. **Lancement** :
```bash
docker-compose -f docker-compose.prod.yml up -d
```
4. **Services inclus** :
- **Frontend** : Next.js en mode standalone optimisé.
- **Backend** : NestJS avec clustering et monitoring Sentry.
- **Caddy** : Gestion automatique du SSL/TLS.
- **ClamAV** : Scan antivirus en temps réel des médias.
- **Redis** : Cache, sessions et limitation de débit (Throttling/Bot detection).
- **MinIO** : Stockage compatible S3.
### Sécurité et Performance
- **Transcodage Auto** : Toutes les images sont converties en WebP et les vidéos en WebM pour minimiser la bande passante.
- **Bot Detection** : Système intégré de détection et de bannissement automatique des crawlers malveillants via Redis.
- **Monitoring** : Tracking d'erreurs et profilage de performance via Sentry (Node.js et Next.js).
### Clés API ### Clés API

View File

@@ -15,13 +15,13 @@ COPY documentation/package.json ./documentation/
# Utilisation du cache pour pnpm et installation figée # Utilisation du cache pour pnpm et installation figée
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
COPY . . COPY . .
# Deuxième passe avec cache pour les scripts/liens # Deuxième passe avec cache pour les scripts/liens
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
RUN pnpm run --filter @memegoat/backend build RUN pnpm run --filter @memegoat/backend build
RUN pnpm deploy --filter=@memegoat/backend --prod --legacy /app RUN pnpm deploy --filter=@memegoat/backend --prod --legacy /app

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/backend", "name": "@memegoat/backend",
"version": "1.7.0", "version": "1.7.5",
"description": "", "description": "",
"author": "", "author": "",
"private": true, "private": true,
@@ -36,8 +36,10 @@
"@nestjs/core": "^11.0.1", "@nestjs/core": "^11.0.1",
"@nestjs/mapped-types": "^2.1.0", "@nestjs/mapped-types": "^2.1.0",
"@nestjs/platform-express": "^11.0.1", "@nestjs/platform-express": "^11.0.1",
"@nestjs/platform-socket.io": "^11.1.12",
"@nestjs/schedule": "^6.1.0", "@nestjs/schedule": "^6.1.0",
"@nestjs/throttler": "^6.5.0", "@nestjs/throttler": "^6.5.0",
"@nestjs/websockets": "^11.1.12",
"@noble/post-quantum": "^0.5.4", "@noble/post-quantum": "^0.5.4",
"@node-rs/argon2": "^2.0.2", "@node-rs/argon2": "^2.0.2",
"@sentry/nestjs": "^10.32.1", "@sentry/nestjs": "^10.32.1",
@@ -48,6 +50,7 @@
"class-transformer": "^0.5.1", "class-transformer": "^0.5.1",
"class-validator": "^0.14.3", "class-validator": "^0.14.3",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"drizzle-kit": "^0.31.8",
"drizzle-orm": "^0.45.1", "drizzle-orm": "^0.45.1",
"fluent-ffmpeg": "^2.1.3", "fluent-ffmpeg": "^2.1.3",
"helmet": "^8.1.0", "helmet": "^8.1.0",
@@ -61,23 +64,12 @@
"reflect-metadata": "^0.2.2", "reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1", "rxjs": "^7.8.1",
"sharp": "^0.34.5", "sharp": "^0.34.5",
"socket.io": "^4.8.3",
"uuid": "^13.0.0", "uuid": "^13.0.0",
"zod": "^4.3.5", "zod": "^4.3.5"
"drizzle-kit": "^0.31.8"
}, },
"devDependencies": { "devDependencies": {
"@nestjs/cli": "^11.0.0", "@nestjs/cli": "^11.0.0",
"globals": "^16.0.0",
"jest": "^30.0.0",
"source-map-support": "^0.5.21",
"supertest": "^7.0.0",
"ts-jest": "^29.2.5",
"ts-loader": "^9.5.2",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsx": "^4.21.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.20.0",
"@nestjs/schematics": "^11.0.0", "@nestjs/schematics": "^11.0.0",
"@nestjs/testing": "^11.0.1", "@nestjs/testing": "^11.0.1",
"@types/express": "^5.0.0", "@types/express": "^5.0.0",
@@ -89,9 +81,21 @@
"@types/pg": "^8.16.0", "@types/pg": "^8.16.0",
"@types/qrcode": "^1.5.6", "@types/qrcode": "^1.5.6",
"@types/sharp": "^0.32.0", "@types/sharp": "^0.32.0",
"@types/socket.io": "^3.0.2",
"@types/supertest": "^6.0.2", "@types/supertest": "^6.0.2",
"@types/uuid": "^11.0.0", "@types/uuid": "^11.0.0",
"drizzle-kit": "^0.31.8" "drizzle-kit": "^0.31.8",
"globals": "^16.0.0",
"jest": "^30.0.0",
"source-map-support": "^0.5.21",
"supertest": "^7.0.0",
"ts-jest": "^29.2.5",
"ts-loader": "^9.5.2",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsx": "^4.21.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.20.0"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [

View File

@@ -10,6 +10,7 @@ import { AppController } from "./app.controller";
import { AppService } from "./app.service"; import { AppService } from "./app.service";
import { AuthModule } from "./auth/auth.module"; import { AuthModule } from "./auth/auth.module";
import { CategoriesModule } from "./categories/categories.module"; import { CategoriesModule } from "./categories/categories.module";
import { CommentsModule } from "./comments/comments.module";
import { CommonModule } from "./common/common.module"; import { CommonModule } from "./common/common.module";
import { CrawlerDetectionMiddleware } from "./common/middlewares/crawler-detection.middleware"; import { CrawlerDetectionMiddleware } from "./common/middlewares/crawler-detection.middleware";
import { HTTPLoggerMiddleware } from "./common/middlewares/http-logger.middleware"; import { HTTPLoggerMiddleware } from "./common/middlewares/http-logger.middleware";
@@ -21,6 +22,8 @@ import { FavoritesModule } from "./favorites/favorites.module";
import { HealthController } from "./health.controller"; import { HealthController } from "./health.controller";
import { MailModule } from "./mail/mail.module"; import { MailModule } from "./mail/mail.module";
import { MediaModule } from "./media/media.module"; import { MediaModule } from "./media/media.module";
import { MessagesModule } from "./messages/messages.module";
import { RealtimeModule } from "./realtime/realtime.module";
import { ReportsModule } from "./reports/reports.module"; import { ReportsModule } from "./reports/reports.module";
import { S3Module } from "./s3/s3.module"; import { S3Module } from "./s3/s3.module";
import { SessionsModule } from "./sessions/sessions.module"; import { SessionsModule } from "./sessions/sessions.module";
@@ -37,12 +40,15 @@ import { UsersModule } from "./users/users.module";
UsersModule, UsersModule,
AuthModule, AuthModule,
CategoriesModule, CategoriesModule,
CommentsModule,
ContentsModule, ContentsModule,
FavoritesModule, FavoritesModule,
TagsModule, TagsModule,
MediaModule, MediaModule,
MessagesModule,
SessionsModule, SessionsModule,
ReportsModule, ReportsModule,
RealtimeModule,
ApiKeysModule, ApiKeysModule,
AdminModule, AdminModule,
ScheduleModule.forRoot(), ScheduleModule.forRoot(),

View File

@@ -148,7 +148,7 @@ describe("AuthService", () => {
const dto = { const dto = {
username: "test", username: "test",
email: "test@example.com", email: "test@example.com",
password: "password", password: "Password1!",
}; };
mockHashingService.hashPassword.mockResolvedValue("hashed-password"); mockHashingService.hashPassword.mockResolvedValue("hashed-password");
mockHashingService.hashEmail.mockResolvedValue("hashed-email"); mockHashingService.hashEmail.mockResolvedValue("hashed-email");
@@ -165,7 +165,7 @@ describe("AuthService", () => {
describe("login", () => { describe("login", () => {
it("should login a user", async () => { it("should login a user", async () => {
const dto = { email: "test@example.com", password: "password" }; const dto = { email: "test@example.com", password: "Password1!" };
const user = { const user = {
uuid: "user-id", uuid: "user-id",
username: "test", username: "test",

View File

@@ -136,6 +136,7 @@ export class AuthService {
const accessToken = await this.jwtService.generateJwt({ const accessToken = await this.jwtService.generateJwt({
sub: user.uuid, sub: user.uuid,
username: user.username, username: user.username,
role: user.role,
}); });
const session = await this.sessionsService.createSession( const session = await this.sessionsService.createSession(
@@ -178,6 +179,7 @@ export class AuthService {
const accessToken = await this.jwtService.generateJwt({ const accessToken = await this.jwtService.generateJwt({
sub: user.uuid, sub: user.uuid,
username: user.username, username: user.username,
role: user.role,
}); });
const session = await this.sessionsService.createSession( const session = await this.sessionsService.createSession(
@@ -205,6 +207,7 @@ export class AuthService {
const accessToken = await this.jwtService.generateJwt({ const accessToken = await this.jwtService.generateJwt({
sub: user.uuid, sub: user.uuid,
username: user.username, username: user.username,
role: user.role,
}); });
return { return {

View File

@@ -2,6 +2,7 @@ import {
IsEmail, IsEmail,
IsNotEmpty, IsNotEmpty,
IsString, IsString,
Matches,
MaxLength, MaxLength,
MinLength, MinLength,
} from "class-validator"; } from "class-validator";
@@ -10,6 +11,10 @@ export class RegisterDto {
@IsString() @IsString()
@IsNotEmpty() @IsNotEmpty()
@MaxLength(32) @MaxLength(32)
@Matches(/^[a-z0-9_]+$/, {
message:
"username must contain only lowercase letters, numbers, and underscores",
})
username!: string; username!: string;
@IsString() @IsString()
@@ -21,5 +26,15 @@ export class RegisterDto {
@IsString() @IsString()
@MinLength(8) @MinLength(8)
@Matches(/[A-Z]/, {
message: "password must contain at least one uppercase letter",
})
@Matches(/[a-z]/, {
message: "password must contain at least one lowercase letter",
})
@Matches(/[0-9]/, { message: "password must contain at least one number" })
@Matches(/[^A-Za-z0-9]/, {
message: "password must contain at least one special character",
})
password!: string; password!: string;
} }

View File

@@ -0,0 +1,41 @@
import {
Body,
Controller,
Delete,
Get,
Param,
Post,
Req,
UseGuards,
} from "@nestjs/common";
import { AuthGuard } from "../auth/guards/auth.guard";
import type { AuthenticatedRequest } from "../common/interfaces/request.interface";
import { CommentsService } from "./comments.service";
import { CreateCommentDto } from "./dto/create-comment.dto";
@Controller()
export class CommentsController {
constructor(private readonly commentsService: CommentsService) {}
@Get("contents/:contentId/comments")
findAllByContentId(@Param("contentId") contentId: string) {
return this.commentsService.findAllByContentId(contentId);
}
@Post("contents/:contentId/comments")
@UseGuards(AuthGuard)
create(
@Req() req: AuthenticatedRequest,
@Param("contentId") contentId: string,
@Body() dto: CreateCommentDto,
) {
return this.commentsService.create(req.user.sub, contentId, dto);
}
@Delete("comments/:id")
@UseGuards(AuthGuard)
remove(@Req() req: AuthenticatedRequest, @Param("id") id: string) {
const isAdmin = req.user.role === "admin" || req.user.role === "moderator";
return this.commentsService.remove(req.user.sub, id, isAdmin);
}
}

View File

@@ -0,0 +1,13 @@
import { Module } from "@nestjs/common";
import { AuthModule } from "../auth/auth.module";
import { CommentsController } from "./comments.controller";
import { CommentsService } from "./comments.service";
import { CommentsRepository } from "./repositories/comments.repository";
@Module({
imports: [AuthModule],
controllers: [CommentsController],
providers: [CommentsService, CommentsRepository],
exports: [CommentsService],
})
export class CommentsModule {}

View File

@@ -0,0 +1,37 @@
import {
ForbiddenException,
Injectable,
NotFoundException,
} from "@nestjs/common";
import type { CreateCommentDto } from "./dto/create-comment.dto";
import { CommentsRepository } from "./repositories/comments.repository";
@Injectable()
export class CommentsService {
constructor(private readonly commentsRepository: CommentsRepository) {}
async create(userId: string, contentId: string, dto: CreateCommentDto) {
return this.commentsRepository.create({
userId,
contentId,
text: dto.text,
});
}
async findAllByContentId(contentId: string) {
return this.commentsRepository.findAllByContentId(contentId);
}
async remove(userId: string, commentId: string, isAdmin = false) {
const comment = await this.commentsRepository.findOne(commentId);
if (!comment) {
throw new NotFoundException("Comment not found");
}
if (!isAdmin && comment.userId !== userId) {
throw new ForbiddenException("You cannot delete this comment");
}
await this.commentsRepository.delete(commentId);
}
}

View File

@@ -0,0 +1,8 @@
import { IsNotEmpty, IsString, MaxLength } from "class-validator";
export class CreateCommentDto {
@IsString()
@IsNotEmpty()
@MaxLength(1000)
text!: string;
}

View File

@@ -0,0 +1,53 @@
import { Injectable } from "@nestjs/common";
import { and, desc, eq, isNull } from "drizzle-orm";
import { DatabaseService } from "../../database/database.service";
import { comments, users } from "../../database/schemas";
import type { NewCommentInDb } from "../../database/schemas/comments";
@Injectable()
export class CommentsRepository {
constructor(private readonly databaseService: DatabaseService) {}
async create(data: NewCommentInDb) {
const [comment] = await this.databaseService.db
.insert(comments)
.values(data)
.returning();
return comment;
}
async findAllByContentId(contentId: string) {
return this.databaseService.db
.select({
id: comments.id,
text: comments.text,
createdAt: comments.createdAt,
updatedAt: comments.updatedAt,
user: {
uuid: users.uuid,
username: users.username,
displayName: users.displayName,
avatarUrl: users.avatarUrl,
},
})
.from(comments)
.innerJoin(users, eq(comments.userId, users.uuid))
.where(and(eq(comments.contentId, contentId), isNull(comments.deletedAt)))
.orderBy(desc(comments.createdAt));
}
async findOne(id: string) {
const [comment] = await this.databaseService.db
.select()
.from(comments)
.where(and(eq(comments.id, id), isNull(comments.deletedAt)));
return comment;
}
async delete(id: string) {
await this.databaseService.db
.update(comments)
.set({ deletedAt: new Date() })
.where(eq(comments.id, id));
}
}

View File

@@ -4,5 +4,6 @@ export interface AuthenticatedRequest extends Request {
user: { user: {
sub: string; sub: string;
username: string; username: string;
role: string;
}; };
} }

View File

@@ -1,10 +1,14 @@
import { Injectable, Logger, NestMiddleware } from "@nestjs/common"; import { CACHE_MANAGER } from "@nestjs/cache-manager";
import { Inject, Injectable, Logger, NestMiddleware } from "@nestjs/common";
import type { Cache } from "cache-manager";
import type { NextFunction, Request, Response } from "express"; import type { NextFunction, Request, Response } from "express";
@Injectable() @Injectable()
export class CrawlerDetectionMiddleware implements NestMiddleware { export class CrawlerDetectionMiddleware implements NestMiddleware {
private readonly logger = new Logger("CrawlerDetection"); private readonly logger = new Logger("CrawlerDetection");
constructor(@Inject(CACHE_MANAGER) private cacheManager: Cache) {}
private readonly SUSPICIOUS_PATTERNS = [ private readonly SUSPICIOUS_PATTERNS = [
/\.env/, /\.env/,
/wp-admin/, /wp-admin/,
@@ -24,7 +28,7 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
/db\./, /db\./,
/backup\./, /backup\./,
/cgi-bin/, /cgi-bin/,
/\.well-known\/security\.txt/, // Bien que légitime, souvent scanné /\.well-known\/security\.txt/,
]; ];
private readonly BOT_USER_AGENTS = [ private readonly BOT_USER_AGENTS = [
@@ -40,11 +44,21 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
/masscan/i, /masscan/i,
]; ];
use(req: Request, res: Response, next: NextFunction) { async use(req: Request, res: Response, next: NextFunction) {
const { method, url, ip } = req; const { method, url, ip } = req;
const userAgent = req.get("user-agent") || "unknown"; const userAgent = req.get("user-agent") || "unknown";
res.on("finish", () => { // Vérifier si l'IP est bannie
const isBanned = await this.cacheManager.get(`banned_ip:${ip}`);
if (isBanned) {
this.logger.warn(`Banned IP attempt: ${ip} -> ${method} ${url}`);
res.status(403).json({
message: "Access denied: Your IP has been temporarily banned.",
});
return;
}
res.on("finish", async () => {
if (res.statusCode === 404) { if (res.statusCode === 404) {
const isSuspiciousPath = this.SUSPICIOUS_PATTERNS.some((pattern) => const isSuspiciousPath = this.SUSPICIOUS_PATTERNS.some((pattern) =>
pattern.test(url), pattern.test(url),
@@ -57,7 +71,9 @@ export class CrawlerDetectionMiddleware implements NestMiddleware {
this.logger.warn( this.logger.warn(
`Potential crawler detected: [${ip}] ${method} ${url} - User-Agent: ${userAgent}`, `Potential crawler detected: [${ip}] ${method} ${url} - User-Agent: ${userAgent}`,
); );
// Ici, on pourrait ajouter une logique pour bannir l'IP temporairement via Redis
// Bannir l'IP pour 24h via Redis
await this.cacheManager.set(`banned_ip:${ip}`, true, 86400000);
} }
} }
}); });

View File

@@ -1,13 +1,14 @@
import { Module } from "@nestjs/common"; import { Module } from "@nestjs/common";
import { AuthModule } from "../auth/auth.module"; import { AuthModule } from "../auth/auth.module";
import { MediaModule } from "../media/media.module"; import { MediaModule } from "../media/media.module";
import { RealtimeModule } from "../realtime/realtime.module";
import { S3Module } from "../s3/s3.module"; import { S3Module } from "../s3/s3.module";
import { ContentsController } from "./contents.controller"; import { ContentsController } from "./contents.controller";
import { ContentsService } from "./contents.service"; import { ContentsService } from "./contents.service";
import { ContentsRepository } from "./repositories/contents.repository"; import { ContentsRepository } from "./repositories/contents.repository";
@Module({ @Module({
imports: [S3Module, AuthModule, MediaModule], imports: [S3Module, AuthModule, MediaModule, RealtimeModule],
controllers: [ContentsController], controllers: [ContentsController],
providers: [ContentsService, ContentsRepository], providers: [ContentsService, ContentsRepository],
exports: [ContentsRepository], exports: [ContentsRepository],

View File

@@ -14,6 +14,7 @@ import type {
} from "../common/interfaces/media.interface"; } from "../common/interfaces/media.interface";
import type { IStorageService } from "../common/interfaces/storage.interface"; import type { IStorageService } from "../common/interfaces/storage.interface";
import { MediaService } from "../media/media.service"; import { MediaService } from "../media/media.service";
import { EventsGateway } from "../realtime/events.gateway";
import { S3Service } from "../s3/s3.service"; import { S3Service } from "../s3/s3.service";
import { CreateContentDto } from "./dto/create-content.dto"; import { CreateContentDto } from "./dto/create-content.dto";
import { UploadContentDto } from "./dto/upload-content.dto"; import { UploadContentDto } from "./dto/upload-content.dto";
@@ -29,6 +30,7 @@ export class ContentsService {
@Inject(MediaService) private readonly mediaService: IMediaService, @Inject(MediaService) private readonly mediaService: IMediaService,
private readonly configService: ConfigService, private readonly configService: ConfigService,
@Inject(CACHE_MANAGER) private cacheManager: Cache, @Inject(CACHE_MANAGER) private cacheManager: Cache,
private readonly eventsGateway: EventsGateway,
) {} ) {}
private async clearContentsCache() { private async clearContentsCache() {
@@ -48,6 +50,11 @@ export class ContentsService {
data: UploadContentDto, data: UploadContentDto,
) { ) {
this.logger.log(`Uploading and processing file for user ${userId}`); this.logger.log(`Uploading and processing file for user ${userId}`);
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "starting",
progress: 0,
});
// 0. Validation du format et de la taille // 0. Validation du format et de la taille
const allowedMimeTypes = [ const allowedMimeTypes = [
"image/png", "image/png",
@@ -60,13 +67,25 @@ export class ContentsService {
]; ];
if (!allowedMimeTypes.includes(file.mimetype)) { if (!allowedMimeTypes.includes(file.mimetype)) {
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "error",
message: "Format de fichier non supporté",
});
throw new BadRequestException( throw new BadRequestException(
"Format de fichier non supporté. Formats acceptés: png, jpeg, jpg, webp, webm, mp4, mov, gif.", "Format de fichier non supporté. Formats acceptés: png, jpeg, jpg, webp, webm, mp4, mov, gif.",
); );
} }
const isGif = file.mimetype === "image/gif"; // Autodétermination du type si non fourni ou pour valider
const isVideo = file.mimetype.startsWith("video/"); let contentType: "meme" | "gif" | "video" = "meme";
if (file.mimetype === "image/gif") {
contentType = "gif";
} else if (file.mimetype.startsWith("video/")) {
contentType = "video";
}
const isGif = contentType === "gif";
const isVideo = contentType === "video";
let maxSizeKb: number; let maxSizeKb: number;
if (isGif) { if (isGif) {
@@ -78,23 +97,39 @@ export class ContentsService {
} }
if (file.size > maxSizeKb * 1024) { if (file.size > maxSizeKb * 1024) {
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "error",
message: "Fichier trop volumineux",
});
throw new BadRequestException( throw new BadRequestException(
`Fichier trop volumineux. Limite pour ${isGif ? "GIF" : isVideo ? "vidéo" : "image"}: ${maxSizeKb} Ko.`, `Fichier trop volumineux. Limite pour ${isGif ? "GIF" : isVideo ? "vidéo" : "image"}: ${maxSizeKb} Ko.`,
); );
} }
// 1. Scan Antivirus // 1. Scan Antivirus
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "scanning",
progress: 20,
});
const scanResult = await this.mediaService.scanFile( const scanResult = await this.mediaService.scanFile(
file.buffer, file.buffer,
file.originalname, file.originalname,
); );
if (scanResult.isInfected) { if (scanResult.isInfected) {
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "error",
message: "Fichier infecté",
});
throw new BadRequestException( throw new BadRequestException(
`Le fichier est infecté par ${scanResult.virusName}`, `Le fichier est infecté par ${scanResult.virusName}`,
); );
} }
// 2. Transcodage // 2. Transcodage
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "processing",
progress: 40,
});
let processed: MediaProcessingResult; let processed: MediaProcessingResult;
if (file.mimetype.startsWith("image/") && file.mimetype !== "image/gif") { if (file.mimetype.startsWith("image/") && file.mimetype !== "image/gif") {
// Image -> WebP (format moderne, bien supporté) // Image -> WebP (format moderne, bien supporté)
@@ -110,17 +145,34 @@ export class ContentsService {
} }
// 3. Upload vers S3 // 3. Upload vers S3
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "uploading_s3",
progress: 70,
});
const key = `contents/${userId}/${Date.now()}-${uuidv4()}.${processed.extension}`; const key = `contents/${userId}/${Date.now()}-${uuidv4()}.${processed.extension}`;
await this.s3Service.uploadFile(key, processed.buffer, processed.mimeType); await this.s3Service.uploadFile(key, processed.buffer, processed.mimeType);
this.logger.log(`File uploaded successfully to S3: ${key}`); this.logger.log(`File uploaded successfully to S3: ${key}`);
// 4. Création en base de données // 4. Création en base de données
return await this.create(userId, { this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "saving",
progress: 90,
});
const content = await this.create(userId, {
...data, ...data,
type: contentType, // Utiliser le type autodéterminé
storageKey: key, storageKey: key,
mimeType: processed.mimeType, mimeType: processed.mimeType,
fileSize: processed.size, fileSize: processed.size,
}); });
this.eventsGateway.sendToUser(userId, "upload_progress", {
status: "completed",
progress: 100,
contentId: content.id,
});
return content;
} }
async findAll(options: { async findAll(options: {

View File

@@ -0,0 +1,31 @@
import { index, pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
import { contents } from "./content";
import { users } from "./users";
export const comments = pgTable(
"comments",
{
id: uuid("id").primaryKey().defaultRandom(),
contentId: uuid("content_id")
.notNull()
.references(() => contents.id, { onDelete: "cascade" }),
userId: uuid("user_id")
.notNull()
.references(() => users.uuid, { onDelete: "cascade" }),
text: text("text").notNull(),
createdAt: timestamp("created_at", { withTimezone: true })
.notNull()
.defaultNow(),
updatedAt: timestamp("updated_at", { withTimezone: true })
.notNull()
.defaultNow(),
deletedAt: timestamp("deleted_at", { withTimezone: true }),
},
(table) => ({
contentIdIdx: index("comments_content_id_idx").on(table.contentId),
userIdIdx: index("comments_user_id_idx").on(table.userId),
}),
);
export type CommentInDb = typeof comments.$inferSelect;
export type NewCommentInDb = typeof comments.$inferInsert;

View File

@@ -1,8 +1,10 @@
export * from "./api_keys"; export * from "./api_keys";
export * from "./audit_logs"; export * from "./audit_logs";
export * from "./categories"; export * from "./categories";
export * from "./comments";
export * from "./content"; export * from "./content";
export * from "./favorites"; export * from "./favorites";
export * from "./messages";
export * from "./pgp"; export * from "./pgp";
export * from "./rbac"; export * from "./rbac";
export * from "./reports"; export * from "./reports";

View File

@@ -0,0 +1,66 @@
import {
index,
pgTable,
primaryKey,
text,
timestamp,
uuid,
} from "drizzle-orm/pg-core";
import { users } from "./users";
export const conversations = pgTable("conversations", {
id: uuid("id").primaryKey().defaultRandom(),
createdAt: timestamp("created_at", { withTimezone: true })
.notNull()
.defaultNow(),
updatedAt: timestamp("updated_at", { withTimezone: true })
.notNull()
.defaultNow(),
});
export const conversationParticipants = pgTable(
"conversation_participants",
{
conversationId: uuid("conversation_id")
.notNull()
.references(() => conversations.id, { onDelete: "cascade" }),
userId: uuid("user_id")
.notNull()
.references(() => users.uuid, { onDelete: "cascade" }),
joinedAt: timestamp("joined_at", { withTimezone: true })
.notNull()
.defaultNow(),
},
(t) => ({
pk: primaryKey({ columns: [t.conversationId, t.userId] }),
}),
);
export const messages = pgTable(
"messages",
{
id: uuid("id").primaryKey().defaultRandom(),
conversationId: uuid("conversation_id")
.notNull()
.references(() => conversations.id, { onDelete: "cascade" }),
senderId: uuid("sender_id")
.notNull()
.references(() => users.uuid, { onDelete: "cascade" }),
text: text("text").notNull(),
createdAt: timestamp("created_at", { withTimezone: true })
.notNull()
.defaultNow(),
readAt: timestamp("read_at", { withTimezone: true }),
},
(table) => ({
conversationIdIdx: index("messages_conversation_id_idx").on(
table.conversationId,
),
senderIdIdx: index("messages_sender_id_idx").on(table.senderId),
}),
);
export type ConversationInDb = typeof conversations.$inferSelect;
export type NewConversationInDb = typeof conversations.$inferInsert;
export type MessageInDb = typeof messages.$inferSelect;
export type NewMessageInDb = typeof messages.$inferInsert;

View File

@@ -0,0 +1,11 @@
import { IsNotEmpty, IsString, IsUUID, MaxLength } from "class-validator";
export class CreateMessageDto {
@IsUUID()
recipientId!: string;
@IsString()
@IsNotEmpty()
@MaxLength(2000)
text!: string;
}

View File

@@ -0,0 +1,37 @@
import {
Body,
Controller,
Get,
Param,
Post,
Req,
UseGuards,
} from "@nestjs/common";
import { AuthGuard } from "../auth/guards/auth.guard";
import type { AuthenticatedRequest } from "../common/interfaces/request.interface";
import { CreateMessageDto } from "./dto/create-message.dto";
import { MessagesService } from "./messages.service";
@Controller("messages")
@UseGuards(AuthGuard)
export class MessagesController {
constructor(private readonly messagesService: MessagesService) {}
@Get("conversations")
getConversations(@Req() req: AuthenticatedRequest) {
return this.messagesService.getConversations(req.user.sub);
}
@Get("conversations/:id")
getMessages(
@Req() req: AuthenticatedRequest,
@Param("id") conversationId: string,
) {
return this.messagesService.getMessages(req.user.sub, conversationId);
}
@Post()
sendMessage(@Req() req: AuthenticatedRequest, @Body() dto: CreateMessageDto) {
return this.messagesService.sendMessage(req.user.sub, dto);
}
}

View File

@@ -0,0 +1,14 @@
import { Module } from "@nestjs/common";
import { AuthModule } from "../auth/auth.module";
import { RealtimeModule } from "../realtime/realtime.module";
import { MessagesController } from "./messages.controller";
import { MessagesService } from "./messages.service";
import { MessagesRepository } from "./repositories/messages.repository";
@Module({
imports: [AuthModule, RealtimeModule],
controllers: [MessagesController],
providers: [MessagesService, MessagesRepository],
exports: [MessagesService],
})
export class MessagesModule {}

View File

@@ -0,0 +1,56 @@
import { ForbiddenException, Injectable } from "@nestjs/common";
import { EventsGateway } from "../realtime/events.gateway";
import type { CreateMessageDto } from "./dto/create-message.dto";
import { MessagesRepository } from "./repositories/messages.repository";
@Injectable()
export class MessagesService {
constructor(
private readonly messagesRepository: MessagesRepository,
private readonly eventsGateway: EventsGateway,
) {}
async sendMessage(senderId: string, dto: CreateMessageDto) {
let conversation = await this.messagesRepository.findConversationBetweenUsers(
senderId,
dto.recipientId,
);
if (!conversation) {
const newConv = await this.messagesRepository.createConversation();
await this.messagesRepository.addParticipant(newConv.id, senderId);
await this.messagesRepository.addParticipant(newConv.id, dto.recipientId);
conversation = newConv;
}
const message = await this.messagesRepository.createMessage({
conversationId: conversation.id,
senderId,
text: dto.text,
});
// Notify recipient via WebSocket
this.eventsGateway.sendToUser(dto.recipientId, "new_message", {
conversationId: conversation.id,
message,
});
return message;
}
async getConversations(userId: string) {
return this.messagesRepository.findAllConversations(userId);
}
async getMessages(userId: string, conversationId: string) {
const isParticipant = await this.messagesRepository.isParticipant(
conversationId,
userId,
);
if (!isParticipant) {
throw new ForbiddenException("You are not part of this conversation");
}
return this.messagesRepository.findMessagesByConversationId(conversationId);
}
}

View File

@@ -0,0 +1,136 @@
import { Injectable } from "@nestjs/common";
import { and, desc, eq, inArray, sql } from "drizzle-orm";
import { DatabaseService } from "../../database/database.service";
import {
conversationParticipants,
conversations,
messages,
users,
} from "../../database/schemas";
@Injectable()
export class MessagesRepository {
constructor(private readonly databaseService: DatabaseService) {}
async findConversationBetweenUsers(userId1: string, userId2: string) {
const results = await this.databaseService.db
.select({ id: conversations.id })
.from(conversations)
.innerJoin(
conversationParticipants,
eq(conversations.id, conversationParticipants.conversationId),
)
.where(inArray(conversationParticipants.userId, [userId1, userId2]))
.groupBy(conversations.id)
.having(sql`count(${conversations.id}) = 2`);
return results[0];
}
async createConversation() {
const [conv] = await this.databaseService.db
.insert(conversations)
.values({})
.returning();
return conv;
}
async addParticipant(conversationId: string, userId: string) {
await this.databaseService.db
.insert(conversationParticipants)
.values({ conversationId, userId });
}
async createMessage(data: {
conversationId: string;
senderId: string;
text: string;
}) {
const [msg] = await this.databaseService.db
.insert(messages)
.values(data)
.returning();
// Update conversation updatedAt
await this.databaseService.db
.update(conversations)
.set({ updatedAt: new Date() })
.where(eq(conversations.id, data.conversationId));
return msg;
}
async findAllConversations(userId: string) {
// Sous-requête pour trouver les IDs des conversations de l'utilisateur
const userConvs = this.databaseService.db
.select({ id: conversationParticipants.conversationId })
.from(conversationParticipants)
.where(eq(conversationParticipants.userId, userId));
return this.databaseService.db
.select({
id: conversations.id,
updatedAt: conversations.updatedAt,
lastMessage: {
text: messages.text,
createdAt: messages.createdAt,
},
recipient: {
uuid: users.uuid,
username: users.username,
displayName: users.displayName,
avatarUrl: users.avatarUrl,
},
})
.from(conversations)
.innerJoin(
conversationParticipants,
eq(conversations.id, conversationParticipants.conversationId),
)
.innerJoin(users, eq(conversationParticipants.userId, users.uuid))
.leftJoin(messages, eq(conversations.id, messages.conversationId))
.where(
and(
inArray(conversations.id, userConvs),
eq(conversationParticipants.userId, users.uuid),
sql`${users.uuid} != ${userId}`,
),
)
.orderBy(desc(conversations.updatedAt));
}
async findMessagesByConversationId(conversationId: string, limit = 50) {
return this.databaseService.db
.select({
id: messages.id,
text: messages.text,
createdAt: messages.createdAt,
senderId: messages.senderId,
readAt: messages.readAt,
})
.from(messages)
.where(eq(messages.conversationId, conversationId))
.orderBy(desc(messages.createdAt))
.limit(limit);
}
async isParticipant(conversationId: string, userId: string) {
const [participant] = await this.databaseService.db
.select()
.from(conversationParticipants)
.where(
and(
eq(conversationParticipants.conversationId, conversationId),
eq(conversationParticipants.userId, userId),
),
);
return !!participant;
}
async getParticipants(conversationId: string) {
return this.databaseService.db
.select({ userId: conversationParticipants.userId })
.from(conversationParticipants)
.where(eq(conversationParticipants.conversationId, conversationId));
}
}

View File

@@ -0,0 +1,82 @@
import { Logger } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import {
OnGatewayConnection,
OnGatewayDisconnect,
OnGatewayInit,
WebSocketGateway,
WebSocketServer,
} from "@nestjs/websockets";
import { getIronSession } from "iron-session";
import { Server, Socket } from "socket.io";
import { getSessionOptions, SessionData } from "../auth/session.config";
import { JwtService } from "../crypto/services/jwt.service";
@WebSocketGateway({
cors: {
origin: "*",
credentials: true,
},
})
export class EventsGateway
implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect
{
@WebSocketServer()
server!: Server;
private readonly logger = new Logger(EventsGateway.name);
constructor(
private readonly jwtService: JwtService,
private readonly configService: ConfigService,
) {}
afterInit(_server: Server) {
this.logger.log("WebSocket Gateway initialized");
}
async handleConnection(client: Socket) {
try {
// Simuler un objet Request/Response pour iron-session
const req: any = {
headers: client.handshake.headers,
};
const res: any = {
setHeader: () => {},
getHeader: () => {},
};
const session = await getIronSession<SessionData>(
req,
res,
getSessionOptions(this.configService.get("SESSION_PASSWORD") as string),
);
if (!session.accessToken) {
this.logger.warn(`Client ${client.id} unauthorized connection`);
client.disconnect();
return;
}
const payload = await this.jwtService.verifyJwt(session.accessToken);
client.data.user = payload;
// Rejoindre une room personnelle pour les notifications
client.join(`user:${payload.sub}`);
this.logger.log(`Client connected: ${client.id} (User: ${payload.sub})`);
} catch (error) {
this.logger.error(`Connection error for client ${client.id}: ${error}`);
client.disconnect();
}
}
handleDisconnect(client: Socket) {
this.logger.log(`Client disconnected: ${client.id}`);
}
// Méthode utilitaire pour envoyer des messages à un utilisateur spécifique
sendToUser(userId: string, event: string, data: any) {
this.server.to(`user:${userId}`).emit(event, data);
}
}

View File

@@ -0,0 +1,10 @@
import { Module } from "@nestjs/common";
import { CryptoModule } from "../crypto/crypto.module";
import { EventsGateway } from "./events.gateway";
@Module({
imports: [CryptoModule],
providers: [EventsGateway],
exports: [EventsGateway],
})
export class RealtimeModule {}

View File

@@ -45,7 +45,19 @@ export class UsersService {
} }
async findByEmailHash(emailHash: string) { async findByEmailHash(emailHash: string) {
return await this.usersRepository.findByEmailHash(emailHash); const user = await this.usersRepository.findByEmailHash(emailHash);
if (!user) return null;
const roles = await this.rbacService.getUserRoles(user.uuid);
return {
...user,
role: roles.includes("admin")
? "admin"
: roles.includes("moderator")
? "moderator"
: "user",
roles,
};
} }
async findOneWithPrivateData(uuid: string) { async findOneWithPrivateData(uuid: string) {
@@ -95,7 +107,19 @@ export class UsersService {
} }
async findOne(uuid: string) { async findOne(uuid: string) {
return await this.usersRepository.findOne(uuid); const user = await this.usersRepository.findOne(uuid);
if (!user) return null;
const roles = await this.rbacService.getUserRoles(user.uuid);
return {
...user,
role: roles.includes("admin")
? "admin"
: roles.includes("moderator")
? "moderator"
: "user",
roles,
};
} }
async update(uuid: string, data: UpdateUserDto) { async update(uuid: string, data: UpdateUserDto) {

View File

@@ -14,13 +14,13 @@ COPY documentation/package.json ./documentation/
# Montage du cache pnpm # Montage du cache pnpm
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
COPY . . COPY . .
# Deuxième passe avec cache pour les scripts/liens # Deuxième passe avec cache pour les scripts/liens
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
# Build avec cache Next.js # Build avec cache Next.js
RUN --mount=type=cache,id=next-docs-cache,target=/usr/src/app/documentation/.next/cache \ RUN --mount=type=cache,id=next-docs-cache,target=/usr/src/app/documentation/.next/cache \

View File

@@ -14,13 +14,13 @@ COPY documentation/package.json ./documentation/
# Montage du cache pnpm # Montage du cache pnpm
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
COPY . . COPY . .
# Deuxième passe avec cache pour les scripts/liens # Deuxième passe avec cache pour les scripts/liens
RUN --mount=type=cache,id=pnpm,target=/pnpm/store \ RUN --mount=type=cache,id=pnpm,target=/pnpm/store \
pnpm install --frozen-lockfile pnpm install --frozen-lockfile --force
# Build avec cache Next.js # Build avec cache Next.js
RUN --mount=type=cache,id=next-cache,target=/usr/src/app/frontend/.next/cache \ RUN --mount=type=cache,id=next-cache,target=/usr/src/app/frontend/.next/cache \

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/frontend", "name": "@memegoat/frontend",
"version": "1.7.0", "version": "1.7.5",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",
@@ -54,6 +54,7 @@
"react-hook-form": "^7.71.1", "react-hook-form": "^7.71.1",
"react-resizable-panels": "^4.4.1", "react-resizable-panels": "^4.4.1",
"recharts": "2.15.4", "recharts": "2.15.4",
"socket.io-client": "^4.8.3",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"tailwind-merge": "^3.4.0", "tailwind-merge": "^3.4.0",
"vaul": "^1.1.2", "vaul": "^1.1.2",

View File

@@ -24,20 +24,29 @@ import {
FormMessage, FormMessage,
} from "@/components/ui/form"; } from "@/components/ui/form";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
import {
InputOTP,
InputOTPGroup,
InputOTPSeparator,
InputOTPSlot,
} from "@/components/ui/input-otp";
import { useAuth } from "@/providers/auth-provider"; import { useAuth } from "@/providers/auth-provider";
const loginSchema = z.object({ const loginSchema = z.object({
email: z.string().email({ message: "Email invalide" }), email: z.string().email({ message: "Email invalide" }),
password: z password: z
.string() .string()
.min(6, { message: "Le mot de passe doit faire au moins 6 caractères" }), .min(8, { message: "Le mot de passe doit faire au moins 8 caractères" }),
}); });
type LoginFormValues = z.infer<typeof loginSchema>; type LoginFormValues = z.infer<typeof loginSchema>;
export default function LoginPage() { export default function LoginPage() {
const { login } = useAuth(); const { login, verify2fa } = useAuth();
const [loading, setLoading] = React.useState(false); const [loading, setLoading] = React.useState(false);
const [show2fa, setShow2fa] = React.useState(false);
const [userId, setUserId] = React.useState<string | null>(null);
const [otpValue, setOtpValue] = React.useState("");
const form = useForm<LoginFormValues>({ const form = useForm<LoginFormValues>({
resolver: zodResolver(loginSchema), resolver: zodResolver(loginSchema),
@@ -50,7 +59,11 @@ export default function LoginPage() {
async function onSubmit(values: LoginFormValues) { async function onSubmit(values: LoginFormValues) {
setLoading(true); setLoading(true);
try { try {
await login(values.email, values.password); const res = await login(values.email, values.password);
if (res.userId && res.message === "Please provide 2FA token") {
setUserId(res.userId);
setShow2fa(true);
}
} catch (_error) { } catch (_error) {
// Error is handled in useAuth via toast // Error is handled in useAuth via toast
} finally { } finally {
@@ -58,6 +71,20 @@ export default function LoginPage() {
} }
} }
async function onOtpSubmit(e: React.FormEvent) {
e.preventDefault();
if (!userId || otpValue.length !== 6) return;
setLoading(true);
try {
await verify2fa(userId, otpValue);
} catch (_error) {
// Error handled in useAuth
} finally {
setLoading(false);
}
}
return ( return (
<div className="min-h-screen flex items-center justify-center bg-zinc-50 dark:bg-zinc-950 p-4"> <div className="min-h-screen flex items-center justify-center bg-zinc-50 dark:bg-zinc-950 p-4">
<div className="w-full max-w-md space-y-4"> <div className="w-full max-w-md space-y-4">
@@ -70,45 +97,89 @@ export default function LoginPage() {
</Link> </Link>
<Card> <Card>
<CardHeader> <CardHeader>
<CardTitle className="text-2xl">Connexion</CardTitle> <CardTitle className="text-2xl">
{show2fa ? "Double Authentification" : "Connexion"}
</CardTitle>
<CardDescription> <CardDescription>
Entrez vos identifiants pour accéder à votre compte MemeGoat. {show2fa
? "Entrez le code à 6 chiffres de votre application d'authentification."
: "Entrez vos identifiants pour accéder à votre compte MemeGoat."}
</CardDescription> </CardDescription>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<Form {...form}> {show2fa ? (
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4"> <form
<FormField onSubmit={onOtpSubmit}
control={form.control} className="space-y-6 flex flex-col items-center"
name="email" >
render={({ field }) => ( <InputOTP
<FormItem> maxLength={6}
<FormLabel>Email</FormLabel> value={otpValue}
<FormControl> onChange={(value) => setOtpValue(value)}
<Input placeholder="goat@example.com" {...field} /> >
</FormControl> <InputOTPGroup>
<FormMessage /> <InputOTPSlot index={0} />
</FormItem> <InputOTPSlot index={1} />
)} <InputOTPSlot index={2} />
/> </InputOTPGroup>
<FormField <InputOTPSeparator />
control={form.control} <InputOTPGroup>
name="password" <InputOTPSlot index={3} />
render={({ field }) => ( <InputOTPSlot index={4} />
<FormItem> <InputOTPSlot index={5} />
<FormLabel>Mot de passe</FormLabel> </InputOTPGroup>
<FormControl> </InputOTP>
<Input type="password" placeholder="••••••••" {...field} /> <Button
</FormControl> type="submit"
<FormMessage /> className="w-full"
</FormItem> disabled={loading || otpValue.length !== 6}
)} >
/> {loading ? "Vérification..." : "Vérifier le code"}
<Button type="submit" className="w-full" disabled={loading}> </Button>
{loading ? "Connexion en cours..." : "Se connecter"} <Button
variant="ghost"
className="w-full"
onClick={() => setShow2fa(false)}
disabled={loading}
>
Retour
</Button> </Button>
</form> </form>
</Form> ) : (
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
<FormField
control={form.control}
name="email"
render={({ field }) => (
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input placeholder="goat@example.com" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="password"
render={({ field }) => (
<FormItem>
<FormLabel>Mot de passe</FormLabel>
<FormControl>
<Input type="password" placeholder="" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<Button type="submit" className="w-full" disabled={loading}>
{loading ? "Connexion en cours..." : "Se connecter"}
</Button>
</form>
</Form>
)}
</CardContent> </CardContent>
<CardFooter className="flex flex-col space-y-2"> <CardFooter className="flex flex-col space-y-2">
<p className="text-sm text-center text-muted-foreground"> <p className="text-sm text-center text-muted-foreground">

View File

@@ -29,11 +29,27 @@ import { useAuth } from "@/providers/auth-provider";
const registerSchema = z.object({ const registerSchema = z.object({
username: z username: z
.string() .string()
.min(3, { message: "Le pseudo doit faire au moins 3 caractères" }), .min(3, { message: "Le pseudo doit faire au moins 3 caractères" })
.regex(/^[a-z0-9_]+$/, {
message:
"Le pseudo ne doit contenir que des minuscules, chiffres et underscores",
}),
email: z.string().email({ message: "Email invalide" }), email: z.string().email({ message: "Email invalide" }),
password: z password: z
.string() .string()
.min(6, { message: "Le mot de passe doit faire au moins 6 caractères" }), .min(8, { message: "Le mot de passe doit faire au moins 8 caractères" })
.regex(/[A-Z]/, {
message: "Le mot de passe doit contenir au moins une majuscule",
})
.regex(/[a-z]/, {
message: "Le mot de passe doit contenir au moins une minuscule",
})
.regex(/[0-9]/, {
message: "Le mot de passe doit contenir au moins un chiffre",
})
.regex(/[^A-Za-z0-9]/, {
message: "Le mot de passe doit contenir au moins un caractère spécial",
}),
displayName: z.string().optional(), displayName: z.string().optional(),
}); });
@@ -84,12 +100,25 @@ export default function RegisterPage() {
<CardContent> <CardContent>
<Form {...form}> <Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4"> <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
<FormField
control={form.control}
name="displayName"
render={({ field }) => (
<FormItem>
<FormLabel>Nom d'affichage (Optionnel)</FormLabel>
<FormControl>
<Input placeholder="Le Roi des Chèvres" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField <FormField
control={form.control} control={form.control}
name="username" name="username"
render={({ field }) => ( render={({ field }) => (
<FormItem> <FormItem>
<FormLabel>Pseudo</FormLabel> <FormLabel>Pseudo (minuscule)</FormLabel>
<FormControl> <FormControl>
<Input placeholder="supergoat" {...field} /> <Input placeholder="supergoat" {...field} />
</FormControl> </FormControl>
@@ -110,19 +139,6 @@ export default function RegisterPage() {
</FormItem> </FormItem>
)} )}
/> />
<FormField
control={form.control}
name="displayName"
render={({ field }) => (
<FormItem>
<FormLabel>Nom d'affichage (Optionnel)</FormLabel>
<FormControl>
<Input placeholder="Le Roi des Chèvres" {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField <FormField
control={form.control} control={form.control}
name="password" name="password"

View File

@@ -10,7 +10,6 @@ import {
DialogTitle, DialogTitle,
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { Spinner } from "@/components/ui/spinner"; import { Spinner } from "@/components/ui/spinner";
import { ViewCounter } from "@/components/view-counter";
import { ContentService } from "@/services/content.service"; import { ContentService } from "@/services/content.service";
import type { Content } from "@/types/content"; import type { Content } from "@/types/content";
@@ -46,7 +45,6 @@ export default function MemeModal({
</div> </div>
) : content ? ( ) : content ? (
<div className="bg-white dark:bg-zinc-900 rounded-lg overflow-hidden"> <div className="bg-white dark:bg-zinc-900 rounded-lg overflow-hidden">
<ViewCounter contentId={content.id} />
<ContentCard content={content} /> <ContentCard content={content} />
</div> </div>
) : ( ) : (

View File

@@ -1,6 +1,6 @@
"use client"; "use client";
import { AlertCircle, FileText, LayoutGrid, Users } from "lucide-react"; import { AlertCircle, FileText, Flag, LayoutGrid, Users } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
@@ -54,6 +54,13 @@ export default function AdminDashboardPage() {
href: "/admin/categories", href: "/admin/categories",
color: "text-purple-500", color: "text-purple-500",
}, },
{
title: "Signalements",
value: "Voir",
icon: Flag,
href: "/admin/reports",
color: "text-red-500",
},
]; ];
return ( return (

View File

@@ -0,0 +1,204 @@
"use client";
import {
AlertCircle,
ArrowLeft,
CheckCircle,
MoreHorizontal,
XCircle,
} from "lucide-react";
import Link from "next/link";
import { useCallback, useEffect, useState } from "react";
import { toast } from "sonner";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import {
Card,
CardContent,
CardDescription,
CardHeader,
CardTitle,
} from "@/components/ui/card";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { adminService } from "@/services/admin.service";
import { type Report, ReportStatus } from "@/services/report.service";
export default function AdminReportsPage() {
const [reports, setReports] = useState<Report[]>([]);
const [loading, setLoading] = useState(true);
const fetchReports = useCallback(async () => {
setLoading(true);
try {
const data = await adminService.getReports();
setReports(data);
} catch (_error) {
toast.error("Erreur lors du chargement des signalements.");
} finally {
setLoading(false);
}
}, []);
useEffect(() => {
fetchReports();
}, [fetchReports]);
const handleUpdateStatus = async (reportId: string, status: ReportStatus) => {
try {
await adminService.updateReportStatus(reportId, status);
toast.success("Statut mis à jour.");
fetchReports();
} catch (_error) {
toast.error("Erreur lors de la mise à jour du statut.");
}
};
const getStatusBadge = (status: ReportStatus) => {
switch (status) {
case ReportStatus.PENDING:
return <Badge variant="outline">En attente</Badge>;
case ReportStatus.REVIEWED:
return <Badge variant="secondary">Examiné</Badge>;
case ReportStatus.RESOLVED:
return <Badge variant="success">Résolu</Badge>;
case ReportStatus.DISMISSED:
return <Badge variant="destructive">Rejeté</Badge>;
default:
return <Badge variant="default">{status}</Badge>;
}
};
return (
<div className="flex-1 space-y-8 p-4 pt-6 md:p-8">
<div className="flex items-center gap-4">
<Button variant="ghost" size="icon" asChild>
<Link href="/admin">
<ArrowLeft className="h-4 w-4" />
</Link>
</Button>
<h2 className="text-3xl font-bold tracking-tight">Signalements</h2>
</div>
<Card>
<CardHeader>
<CardTitle>Liste des signalements</CardTitle>
<CardDescription>
Gérez les signalements de contenu inapproprié.
</CardDescription>
</CardHeader>
<CardContent>
<Table>
<TableHeader>
<TableRow>
<TableHead>Signalé par</TableHead>
<TableHead>Cible</TableHead>
<TableHead>Raison</TableHead>
<TableHead>Description</TableHead>
<TableHead>Statut</TableHead>
<TableHead>Date</TableHead>
<TableHead className="text-right">Actions</TableHead>
</TableRow>
</TableHeader>
<TableBody>
{loading ? (
<TableRow>
<TableCell colSpan={7} className="text-center py-8">
Chargement...
</TableCell>
</TableRow>
) : reports.length === 0 ? (
<TableRow>
<TableCell colSpan={7} className="text-center py-8">
Aucun signalement trouvé.
</TableCell>
</TableRow>
) : (
reports.map((report) => (
<TableRow key={report.uuid}>
<TableCell>{report.reporterId.substring(0, 8)}...</TableCell>
<TableCell>
{report.contentId ? (
<Link
href={`/meme/${report.contentId}`}
className="text-primary hover:underline"
>
Contenu
</Link>
) : (
"Tag"
)}
</TableCell>
<TableCell className="font-medium capitalize">
{report.reason}
</TableCell>
<TableCell className="max-w-xs truncate">
{report.description || "-"}
</TableCell>
<TableCell>{getStatusBadge(report.status)}</TableCell>
<TableCell>
{new Date(report.createdAt).toLocaleDateString()}
</TableCell>
<TableCell className="text-right">
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="icon">
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem
onClick={() =>
handleUpdateStatus(report.uuid, ReportStatus.REVIEWED)
}
>
<AlertCircle className="h-4 w-4 mr-2" />
Marquer comme examiné
</DropdownMenuItem>
<DropdownMenuItem
onClick={() =>
handleUpdateStatus(report.uuid, ReportStatus.RESOLVED)
}
>
<CheckCircle className="h-4 w-4 mr-2" />
Marquer comme résolu
</DropdownMenuItem>
<DropdownMenuItem
onClick={() =>
handleUpdateStatus(report.uuid, ReportStatus.DISMISSED)
}
className="text-destructive"
>
<XCircle className="h-4 w-4 mr-2" />
Rejeter
</DropdownMenuItem>
{report.contentId && (
<DropdownMenuItem asChild>
<Link href={`/meme/${report.contentId}`}>Voir le contenu</Link>
</DropdownMenuItem>
)}
</DropdownMenuContent>
</DropdownMenu>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</CardContent>
</Card>
</div>
);
}

View File

@@ -2,9 +2,9 @@ import { ChevronLeft } from "lucide-react";
import type { Metadata } from "next"; import type { Metadata } from "next";
import Link from "next/link"; import Link from "next/link";
import { notFound } from "next/navigation"; import { notFound } from "next/navigation";
import { CommentSection } from "@/components/comment-section";
import { ContentCard } from "@/components/content-card"; import { ContentCard } from "@/components/content-card";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { ViewCounter } from "@/components/view-counter";
import { ContentService } from "@/services/content.service"; import { ContentService } from "@/services/content.service";
export const revalidate = 3600; // ISR: Revalider toutes les heures export const revalidate = 3600; // ISR: Revalider toutes les heures
@@ -41,7 +41,6 @@ export default async function MemePage({
return ( return (
<div className="max-w-4xl mx-auto py-8 px-4"> <div className="max-w-4xl mx-auto py-8 px-4">
<ViewCounter contentId={content.id} />
<Link <Link
href="/" href="/"
className="inline-flex items-center text-sm mb-6 hover:text-primary transition-colors" className="inline-flex items-center text-sm mb-6 hover:text-primary transition-colors"
@@ -53,6 +52,7 @@ export default async function MemePage({
<div className="grid grid-cols-1 lg:grid-cols-3 gap-8 items-start"> <div className="grid grid-cols-1 lg:grid-cols-3 gap-8 items-start">
<div className="lg:col-span-2"> <div className="lg:col-span-2">
<ContentCard content={content} /> <ContentCard content={content} />
<CommentSection contentId={content.id} />
</div> </div>
<div className="space-y-6"> <div className="space-y-6">

View File

@@ -0,0 +1,283 @@
"use client";
import { formatDistanceToNow } from "date-fns";
import { fr } from "date-fns/locale";
import { Search, Send } from "lucide-react";
import * as React from "react";
import { toast } from "sonner";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { ScrollArea } from "@/components/ui/scroll-area";
import { useAuth } from "@/providers/auth-provider";
import { useSocket } from "@/providers/socket-provider";
import {
type Conversation,
type Message,
MessageService,
} from "@/services/message.service";
export default function MessagesPage() {
const { user } = useAuth();
const { socket } = useSocket();
const [conversations, setConversations] = React.useState<Conversation[]>([]);
const [activeConv, setActiveConv] = React.useState<Conversation | null>(null);
const [messages, setMessages] = React.useState<Message[]>([]);
const [newMessage, setNewMessage] = React.useState("");
const [isLoadingConvs, setIsLoadingConvs] = React.useState(true);
const [isLoadingMsgs, setIsLoadingMsgs] = React.useState(false);
const scrollRef = React.useRef<HTMLDivElement>(null);
React.useEffect(() => {
const fetchConvs = async () => {
try {
const data = await MessageService.getConversations();
setConversations(data);
} catch (_error) {
toast.error("Erreur lors du chargement des conversations");
} finally {
setIsLoadingConvs(false);
}
};
fetchConvs();
}, []);
React.useEffect(() => {
if (activeConv) {
const fetchMsgs = async () => {
setIsLoadingMsgs(true);
try {
const data = await MessageService.getMessages(activeConv.id);
setMessages(data.reverse()); // Plus ancien au plus récent
} catch (_error) {
toast.error("Erreur lors du chargement des messages");
} finally {
setIsLoadingMsgs(false);
}
};
fetchMsgs();
}
}, [activeConv]);
React.useEffect(() => {
if (socket) {
socket.on(
"new_message",
(data: { conversationId: string; message: Message }) => {
if (activeConv?.id === data.conversationId) {
setMessages((prev) => [...prev, data.message]);
}
// Mettre à jour la liste des conversations
setConversations((prev) => {
const index = prev.findIndex((c) => c.id === data.conversationId);
if (index !== -1) {
const updated = [...prev];
updated[index] = {
...updated[index],
lastMessage: {
text: data.message.text,
createdAt: data.message.createdAt,
},
updatedAt: data.message.createdAt,
};
return updated.sort(
(a, b) =>
new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
);
}
return prev;
});
},
);
return () => {
socket.off("new_message");
};
}
}, [socket, activeConv]);
React.useEffect(() => {
if (scrollRef.current) {
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
}
}, []);
const handleSendMessage = async (e: React.FormEvent) => {
e.preventDefault();
if (!newMessage.trim() || !activeConv) return;
const text = newMessage.trim();
setNewMessage("");
try {
const msg = await MessageService.sendMessage(
activeConv.recipient.uuid,
text,
);
setMessages((prev) => [...prev, msg]);
} catch (_error) {
toast.error("Erreur lors de l'envoi");
}
};
return (
<div className="h-[calc(100vh-4rem)] flex overflow-hidden bg-white dark:bg-zinc-950">
{/* Sidebar - Liste des conversations */}
<div className="w-80 border-r flex flex-col">
<div className="p-4 border-b">
<h2 className="text-xl font-bold mb-4">Messages</h2>
<div className="relative">
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
<Input placeholder="Rechercher..." className="pl-9" />
</div>
</div>
<ScrollArea className="flex-1">
<div className="p-2 space-y-1">
{isLoadingConvs ? (
<div className="p-4 text-center text-sm text-muted-foreground">
Chargement...
</div>
) : conversations.length === 0 ? (
<div className="p-4 text-center text-sm text-muted-foreground">
Aucune conversation.
</div>
) : (
conversations.map((conv) => (
<button
key={conv.id}
type="button"
onClick={() => setActiveConv(conv)}
className={`w-full flex items-center gap-3 p-3 rounded-xl transition-colors ${
activeConv?.id === conv.id
? "bg-primary/10 text-primary"
: "hover:bg-zinc-100 dark:hover:bg-zinc-900"
}`}
>
<Avatar>
<AvatarImage src={conv.recipient.avatarUrl} />
<AvatarFallback>
{conv.recipient.username[0].toUpperCase()}
</AvatarFallback>
</Avatar>
<div className="flex-1 text-left overflow-hidden">
<div className="flex justify-between items-baseline">
<span className="font-bold truncate">
{conv.recipient.displayName || conv.recipient.username}
</span>
{conv.lastMessage && (
<span className="text-[10px] text-muted-foreground whitespace-nowrap">
{formatDistanceToNow(new Date(conv.lastMessage.createdAt), {
locale: fr,
})}
</span>
)}
</div>
<p className="text-xs text-muted-foreground truncate">
{conv.lastMessage?.text || "Démarrer une conversation"}
</p>
</div>
</button>
))
)}
</div>
</ScrollArea>
</div>
{/* Zone de chat */}
<div className="flex-1 flex flex-col">
{activeConv ? (
<>
{/* Header */}
<div className="p-4 border-b flex items-center gap-3">
<Avatar className="h-8 w-8">
<AvatarImage src={activeConv.recipient.avatarUrl} />
<AvatarFallback>
{activeConv.recipient.username[0].toUpperCase()}
</AvatarFallback>
</Avatar>
<div>
<h3 className="font-bold leading-none">
{activeConv.recipient.displayName || activeConv.recipient.username}
</h3>
<span className="text-xs text-green-500 font-medium">En ligne</span>
</div>
</div>
{/* Messages */}
<ScrollArea className="flex-1 p-4" viewportRef={scrollRef}>
<div className="space-y-4">
{isLoadingMsgs ? (
<div className="text-center py-4 text-sm text-muted-foreground">
Chargement...
</div>
) : (
messages.map((msg) => (
<div
key={msg.id}
className={`flex ${
msg.senderId === user?.uuid ? "justify-end" : "justify-start"
}`}
>
<div
className={`max-w-[70%] p-3 rounded-2xl text-sm ${
msg.senderId === user?.uuid
? "bg-primary text-primary-foreground rounded-br-none"
: "bg-zinc-100 dark:bg-zinc-800 rounded-bl-none"
}`}
>
<p className="whitespace-pre-wrap">{msg.text}</p>
<p
className={`text-[10px] mt-1 ${
msg.senderId === user?.uuid
? "text-primary-foreground/70"
: "text-muted-foreground"
}`}
>
{new Date(msg.createdAt).toLocaleTimeString([], {
hour: "2-digit",
minute: "2-digit",
})}
</p>
</div>
</div>
))
)}
</div>
</ScrollArea>
{/* Input */}
<div className="p-4 border-t">
<form onSubmit={handleSendMessage} className="flex gap-2">
<Input
placeholder="Écrivez un message..."
value={newMessage}
onChange={(e) => setNewMessage(e.target.value)}
className="rounded-full px-4"
/>
<Button
type="submit"
size="icon"
className="rounded-full shrink-0"
disabled={!newMessage.trim()}
>
<Send className="h-4 w-4" />
</Button>
</form>
</div>
</>
) : (
<div className="flex-1 flex flex-col items-center justify-center text-center p-8">
<div className="bg-primary/10 p-6 rounded-full mb-4">
<Send className="h-12 w-12 text-primary" />
</div>
<h2 className="text-2xl font-bold mb-2">Vos messages</h2>
<p className="text-muted-foreground max-w-sm">
Sélectionnez une conversation ou démarrez-en une nouvelle pour commencer
à discuter.
</p>
</div>
)}
</div>
</div>
);
}

View File

@@ -3,6 +3,7 @@
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { import {
AlertTriangle, AlertTriangle,
Download,
Laptop, Laptop,
Loader2, Loader2,
Moon, Moon,
@@ -19,6 +20,7 @@ import * as React from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { toast } from "sonner"; import { toast } from "sonner";
import * as z from "zod"; import * as z from "zod";
import { TwoFactorSetup } from "@/components/two-factor-setup";
import { import {
AlertDialog, AlertDialog,
AlertDialogAction, AlertDialogAction,
@@ -68,6 +70,7 @@ export default function SettingsPage() {
const router = useRouter(); const router = useRouter();
const [isSaving, setIsSaving] = React.useState(false); const [isSaving, setIsSaving] = React.useState(false);
const [isDeleting, setIsDeleting] = React.useState(false); const [isDeleting, setIsDeleting] = React.useState(false);
const [isExporting, setIsExporting] = React.useState(false);
const [mounted, setMounted] = React.useState(false); const [mounted, setMounted] = React.useState(false);
React.useEffect(() => { React.useEffect(() => {
@@ -143,6 +146,29 @@ export default function SettingsPage() {
} }
}; };
const handleExportData = async () => {
setIsExporting(true);
try {
const data = await UserService.exportData();
const blob = new Blob([JSON.stringify(data, null, 2)], {
type: "application/json",
});
const url = window.URL.createObjectURL(blob);
const link = document.createElement("a");
link.href = url;
link.setAttribute("download", `memegoat-data-${user?.username}.json`);
document.body.appendChild(link);
link.click();
link.remove();
toast.success("Vos données ont été exportées avec succès.");
} catch (error) {
console.error(error);
toast.error("Erreur lors de l'exportation des données.");
} finally {
setIsExporting(false);
}
};
return ( return (
<div className="max-w-2xl mx-auto py-12 px-4"> <div className="max-w-2xl mx-auto py-12 px-4">
<div className="flex items-center gap-3 mb-8"> <div className="flex items-center gap-3 mb-8">
@@ -239,6 +265,8 @@ export default function SettingsPage() {
</CardContent> </CardContent>
</Card> </Card>
<TwoFactorSetup />
<Card className="border-none shadow-sm"> <Card className="border-none shadow-sm">
<CardHeader className="pb-4"> <CardHeader className="pb-4">
<div className="flex items-center gap-2 mb-1"> <div className="flex items-center gap-2 mb-1">
@@ -291,6 +319,49 @@ export default function SettingsPage() {
</CardContent> </CardContent>
</Card> </Card>
<Card className="border-none shadow-sm">
<CardHeader className="pb-4">
<div className="flex items-center gap-2 mb-1">
<Download className="h-5 w-5 text-primary" />
<CardTitle>Portabilité des données</CardTitle>
</div>
<CardDescription>
Conformément au RGPD, vous pouvez exporter l'intégralité de vos données
rattachées à votre compte.
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4 p-4 rounded-lg bg-white dark:bg-zinc-900 border">
<div className="space-y-1">
<p className="font-bold">Exporter mes données</p>
<p className="text-sm text-muted-foreground">
Téléchargez un fichier JSON contenant votre profil, vos mèmes et vos
favoris.
</p>
</div>
<Button
variant="outline"
size="sm"
onClick={handleExportData}
disabled={isExporting}
className="font-semibold"
>
{isExporting ? (
<>
<Loader2 className="mr-2 h-4 w-4 animate-spin" />
Exportation...
</>
) : (
<>
<Download className="h-4 w-4 mr-2" />
Exporter mes données
</>
)}
</Button>
</div>
</CardContent>
</Card>
<Card className="border-destructive/20 shadow-sm bg-destructive/5"> <Card className="border-destructive/20 shadow-sm bg-destructive/5">
<CardHeader className="pb-4"> <CardHeader className="pb-4">
<div className="flex items-center gap-2 mb-1"> <div className="flex items-center gap-2 mb-1">

View File

@@ -36,6 +36,7 @@ import {
} from "@/components/ui/select"; } from "@/components/ui/select";
import { Spinner } from "@/components/ui/spinner"; import { Spinner } from "@/components/ui/spinner";
import { useAuth } from "@/providers/auth-provider"; import { useAuth } from "@/providers/auth-provider";
import { useSocket } from "@/providers/socket-provider";
import { CategoryService } from "@/services/category.service"; import { CategoryService } from "@/services/category.service";
import { ContentService } from "@/services/content.service"; import { ContentService } from "@/services/content.service";
import type { Category } from "@/types/content"; import type { Category } from "@/types/content";
@@ -52,10 +53,32 @@ type UploadFormValues = z.infer<typeof uploadSchema>;
export default function UploadPage() { export default function UploadPage() {
const router = useRouter(); const router = useRouter();
const { isAuthenticated, isLoading } = useAuth(); const { isAuthenticated, isLoading } = useAuth();
const { socket } = useSocket();
const [categories, setCategories] = React.useState<Category[]>([]); const [categories, setCategories] = React.useState<Category[]>([]);
const [file, setFile] = React.useState<File | null>(null); const [file, setFile] = React.useState<File | null>(null);
const [preview, setPreview] = React.useState<string | null>(null); const [preview, setPreview] = React.useState<string | null>(null);
const [isUploading, setIsUploading] = React.useState(false); const [isUploading, setIsUploading] = React.useState(false);
const [uploadStatus, setUploadStatus] = React.useState<string>("");
const [uploadProgress, setUploadProgress] = React.useState<number>(0);
React.useEffect(() => {
if (socket) {
socket.on(
"upload_progress",
(data: { status: string; progress: number; message?: string }) => {
setUploadStatus(data.status);
setUploadProgress(data.progress);
if (data.status === "error" && data.message) {
toast.error(data.message);
}
},
);
return () => {
socket.off("upload_progress");
};
}
}, [socket]);
const form = useForm<UploadFormValues>({ const form = useForm<UploadFormValues>({
resolver: zodResolver(uploadSchema), resolver: zodResolver(uploadSchema),
@@ -327,10 +350,20 @@ export default function UploadPage() {
<Button type="submit" className="w-full" disabled={isUploading}> <Button type="submit" className="w-full" disabled={isUploading}>
{isUploading ? ( {isUploading ? (
<> <div className="flex flex-col items-center gap-1">
<Loader2 className="mr-2 h-4 w-4 animate-spin" /> <div className="flex items-center gap-2">
Upload en cours... <Loader2 className="h-4 w-4 animate-spin" />
</> <span>{uploadProgress}%</span>
</div>
<span className="text-[10px] uppercase tracking-wider opacity-70">
{uploadStatus === "starting" && "Initialisation..."}
{uploadStatus === "scanning" && "Scan Antivirus..."}
{uploadStatus === "processing" && "Optimisation..."}
{uploadStatus === "uploading_s3" && "Envoi au cloud..."}
{uploadStatus === "saving" && "Finalisation..."}
{uploadStatus === "completed" && "Terminé !"}
</span>
</div>
) : ( ) : (
"Publier le mème" "Publier le mème"
)} )}

View File

@@ -3,6 +3,7 @@ import { Ubuntu_Mono, Ubuntu_Sans } from "next/font/google";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import { AudioProvider } from "@/providers/audio-provider"; import { AudioProvider } from "@/providers/audio-provider";
import { AuthProvider } from "@/providers/auth-provider"; import { AuthProvider } from "@/providers/auth-provider";
import { SocketProvider } from "@/providers/socket-provider";
import { ThemeProvider } from "@/providers/theme-provider"; import { ThemeProvider } from "@/providers/theme-provider";
import "./globals.css"; import "./globals.css";
@@ -72,10 +73,12 @@ export default function RootLayout({
disableTransitionOnChange disableTransitionOnChange
> >
<AuthProvider> <AuthProvider>
<AudioProvider> <SocketProvider>
{children} <AudioProvider>
<Toaster /> {children}
</AudioProvider> <Toaster />
</AudioProvider>
</SocketProvider>
</AuthProvider> </AuthProvider>
</ThemeProvider> </ThemeProvider>
</body> </body>

View File

@@ -10,6 +10,7 @@ import {
LayoutGrid, LayoutGrid,
LogIn, LogIn,
LogOut, LogOut,
MessageCircle,
PlusCircle, PlusCircle,
Settings, Settings,
ShieldCheck, ShieldCheck,
@@ -180,6 +181,20 @@ export function AppSidebar() {
</Link> </Link>
</SidebarMenuButton> </SidebarMenuButton>
</SidebarMenuItem> </SidebarMenuItem>
{isAuthenticated && (
<SidebarMenuItem>
<SidebarMenuButton
asChild
isActive={pathname === "/messages"}
tooltip="Messages"
>
<Link href="/messages">
<MessageCircle />
<span>Messages</span>
</Link>
</SidebarMenuButton>
</SidebarMenuItem>
)}
</SidebarMenu> </SidebarMenu>
</SidebarGroup> </SidebarGroup>

View File

@@ -0,0 +1,168 @@
"use client";
import { formatDistanceToNow } from "date-fns";
import { fr } from "date-fns/locale";
import { MoreHorizontal, Send, Trash2 } from "lucide-react";
import * as React from "react";
import { toast } from "sonner";
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { Textarea } from "@/components/ui/textarea";
import { useAuth } from "@/providers/auth-provider";
import { type Comment, CommentService } from "@/services/comment.service";
interface CommentSectionProps {
contentId: string;
}
export function CommentSection({ contentId }: CommentSectionProps) {
const { user, isAuthenticated } = useAuth();
const [comments, setComments] = React.useState<Comment[]>([]);
const [newComment, setNewComment] = React.useState("");
const [isSubmitting, setIsSubmitting] = React.useState(false);
const [isLoading, setIsLoading] = React.useState(true);
const fetchComments = React.useCallback(async () => {
try {
const data = await CommentService.getByContentId(contentId);
setComments(data);
} catch (_error) {
toast.error("Impossible de charger les commentaires");
} finally {
setIsLoading(false);
}
}, [contentId]);
React.useEffect(() => {
fetchComments();
}, [fetchComments]);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
if (!newComment.trim() || isSubmitting) return;
setIsSubmitting(true);
try {
const comment = await CommentService.create(contentId, newComment.trim());
setComments((prev) => [comment, ...prev]);
setNewComment("");
toast.success("Commentaire publié !");
} catch (_error) {
toast.error("Erreur lors de la publication du commentaire");
} finally {
setIsSubmitting(false);
}
};
const handleDelete = async (commentId: string) => {
try {
await CommentService.remove(commentId);
setComments((prev) => prev.filter((c) => c.id !== commentId));
toast.success("Commentaire supprimé");
} catch (_error) {
toast.error("Erreur lors de la suppression");
}
};
return (
<div className="space-y-6 mt-8">
<h3 className="font-bold text-lg">Commentaires ({comments.length})</h3>
{isAuthenticated ? (
<form onSubmit={handleSubmit} className="flex gap-3">
<Avatar className="h-8 w-8">
<AvatarImage src={user?.avatarUrl} />
<AvatarFallback>{user?.username[0].toUpperCase()}</AvatarFallback>
</Avatar>
<div className="flex-1 space-y-2">
<Textarea
placeholder="Ajouter un commentaire..."
value={newComment}
onChange={(e) => setNewComment(e.target.value)}
className="min-h-[80px] resize-none"
/>
<div className="flex justify-end">
<Button
type="submit"
size="sm"
disabled={!newComment.trim() || isSubmitting}
>
{isSubmitting ? "Envoi..." : "Publier"}
<Send className="ml-2 h-4 w-4" />
</Button>
</div>
</div>
</form>
) : (
<div className="bg-zinc-100 dark:bg-zinc-800 p-4 rounded-xl text-center text-sm">
Connectez-vous pour laisser un commentaire.
</div>
)}
<div className="space-y-4">
{isLoading ? (
<div className="text-center text-muted-foreground py-4">Chargement...</div>
) : comments.length === 0 ? (
<div className="text-center text-muted-foreground py-4">
Aucun commentaire pour le moment. Soyez le premier !
</div>
) : (
comments.map((comment) => (
<div key={comment.id} className="flex gap-3">
<Avatar className="h-8 w-8">
<AvatarImage src={comment.user.avatarUrl} />
<AvatarFallback>
{comment.user.username[0].toUpperCase()}
</AvatarFallback>
</Avatar>
<div className="flex-1 space-y-1">
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<span className="text-sm font-bold">
{comment.user.displayName || comment.user.username}
</span>
<span className="text-xs text-muted-foreground">
{formatDistanceToNow(new Date(comment.createdAt), {
addSuffix: true,
locale: fr,
})}
</span>
</div>
{(user?.uuid === comment.user.uuid ||
user?.role === "admin" ||
user?.role === "moderator") && (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="icon" className="h-8 w-8">
<MoreHorizontal className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuItem
onClick={() => handleDelete(comment.id)}
className="text-destructive"
>
<Trash2 className="h-4 w-4 mr-2" />
Supprimer
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
)}
</div>
<p className="text-sm leading-relaxed whitespace-pre-wrap">
{comment.text}
</p>
</div>
</div>
))
)}
</div>
</div>
);
}

View File

@@ -3,6 +3,7 @@
import { import {
Edit, Edit,
Eye, Eye,
Flag,
Heart, Heart,
MoreHorizontal, MoreHorizontal,
Share2, Share2,
@@ -35,6 +36,7 @@ import { ContentService } from "@/services/content.service";
import { FavoriteService } from "@/services/favorite.service"; import { FavoriteService } from "@/services/favorite.service";
import type { Content } from "@/types/content"; import type { Content } from "@/types/content";
import { UserContentEditDialog } from "./user-content-edit-dialog"; import { UserContentEditDialog } from "./user-content-edit-dialog";
import { ViewCounter } from "./view-counter";
interface ContentCardProps { interface ContentCardProps {
content: Content; content: Content;
@@ -49,6 +51,7 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
const [isLiked, setIsLiked] = React.useState(content.isLiked || false); const [isLiked, setIsLiked] = React.useState(content.isLiked || false);
const [likesCount, setLikesCount] = React.useState(content.favoritesCount); const [likesCount, setLikesCount] = React.useState(content.favoritesCount);
const [editDialogOpen, setEditDialogOpen] = React.useState(false); const [editDialogOpen, setEditDialogOpen] = React.useState(false);
const [_reportDialogOpen, setReportDialogOpen] = React.useState(false);
const isAuthor = user?.uuid === content.authorId; const isAuthor = user?.uuid === content.authorId;
const isVideo = !content.mimeType.startsWith("image/"); const isVideo = !content.mimeType.startsWith("image/");
@@ -96,6 +99,8 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
await FavoriteService.add(content.id); await FavoriteService.add(content.id);
setIsLiked(true); setIsLiked(true);
setLikesCount((prev) => prev + 1); setLikesCount((prev) => prev + 1);
// Considérer un like comme une vue
ContentService.incrementViews(content.id).catch(() => {});
} }
} catch (_error) { } catch (_error) {
toast.error("Une erreur est survenue"); toast.error("Une erreur est survenue");
@@ -144,6 +149,7 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
return ( return (
<> <>
<ViewCounter contentId={content.id} videoRef={videoRef} />
<Card className="overflow-hidden border-none gap-0 shadow-none bg-transparent"> <Card className="overflow-hidden border-none gap-0 shadow-none bg-transparent">
<CardHeader className="p-3 flex flex-row items-center space-y-0 gap-3"> <CardHeader className="p-3 flex flex-row items-center space-y-0 gap-3">
<Avatar className="h-8 w-8 border"> <Avatar className="h-8 w-8 border">
@@ -188,6 +194,12 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
<Share2 className="h-4 w-4 mr-2" /> <Share2 className="h-4 w-4 mr-2" />
Partager Partager
</DropdownMenuItem> </DropdownMenuItem>
{!isAuthor && (
<DropdownMenuItem onClick={() => setReportDialogOpen(true)}>
<Flag className="h-4 w-4 mr-2" />
Signaler
</DropdownMenuItem>
)}
</DropdownMenuContent> </DropdownMenuContent>
</DropdownMenu> </DropdownMenu>
</div> </div>

View File

@@ -0,0 +1,119 @@
"use client";
import { useState } from "react";
import { toast } from "sonner";
import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
import { Label } from "@/components/ui/label";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { Textarea } from "@/components/ui/textarea";
import { ReportReason, ReportService } from "@/services/report.service";
interface ReportDialogProps {
contentId?: string;
tagId?: string;
open: boolean;
onOpenChange: (open: boolean) => void;
}
export function ReportDialog({
contentId,
tagId,
open,
onOpenChange,
}: ReportDialogProps) {
const [reason, setReason] = useState<ReportReason>(ReportReason.INAPPROPRIATE);
const [description, setDescription] = useState("");
const [isSubmitting, setIsSubmitting] = useState(false);
const handleSubmit = async () => {
setIsSubmitting(true);
try {
await ReportService.create({
contentId,
tagId,
reason,
description,
});
toast.success(
"Signalement envoyé avec succès. Merci de nous aider à maintenir la communauté sûre.",
);
onOpenChange(false);
setDescription("");
} catch (_error) {
toast.error("Erreur lors de l'envoi du signalement.");
} finally {
setIsSubmitting(false);
}
};
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>Signaler le contenu</DialogTitle>
<DialogDescription>
Pourquoi signalez-vous ce contenu ? Un modérateur examinera votre demande.
</DialogDescription>
</DialogHeader>
<div className="grid gap-4 py-4">
<div className="grid gap-2">
<Label htmlFor="reason">Raison</Label>
<Select
value={reason}
onValueChange={(value) => setReason(value as ReportReason)}
>
<SelectTrigger id="reason">
<SelectValue placeholder="Sélectionnez une raison" />
</SelectTrigger>
<SelectContent>
<SelectItem value={ReportReason.INAPPROPRIATE}>Inapproprié</SelectItem>
<SelectItem value={ReportReason.SPAM}>Spam</SelectItem>
<SelectItem value={ReportReason.COPYRIGHT}>Droit d'auteur</SelectItem>
<SelectItem value={ReportReason.OTHER}>Autre</SelectItem>
</SelectContent>
</Select>
</div>
<div className="grid gap-2">
<Label htmlFor="description">Description (optionnelle)</Label>
<Textarea
id="description"
placeholder="Détaillez votre signalement..."
value={description}
onChange={(e) => setDescription(e.target.value)}
/>
</div>
</div>
<DialogFooter>
<Button
variant="outline"
onClick={() => onOpenChange(false)}
disabled={isSubmitting}
>
Annuler
</Button>
<Button
variant="destructive"
onClick={handleSubmit}
disabled={isSubmitting}
>
{isSubmitting ? "Envoi..." : "Signaler"}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}

View File

@@ -0,0 +1,252 @@
"use client";
import { Loader2, Shield, ShieldAlert, ShieldCheck } from "lucide-react";
import { useState } from "react";
import { toast } from "sonner";
import { Button } from "@/components/ui/button";
import {
Card,
CardContent,
CardDescription,
CardFooter,
CardHeader,
CardTitle,
} from "@/components/ui/card";
import {
InputOTP,
InputOTPGroup,
InputOTPSeparator,
InputOTPSlot,
} from "@/components/ui/input-otp";
import { useAuth } from "@/providers/auth-provider";
import { AuthService } from "@/services/auth.service";
export function TwoFactorSetup() {
const { user, refreshUser } = useAuth();
const [step, setStep] = useState<"idle" | "setup" | "verify">("idle");
const [qrCode, setQrCode] = useState<string | null>(null);
const [secret, setSecret] = useState<string | null>(null);
const [otpValue, setOtpValue] = useState("");
const [isLoading, setIsLoading] = useState(false);
const handleSetup = async () => {
setIsLoading(true);
try {
const data = await AuthService.setup2fa();
setQrCode(data.qrCodeUrl);
setSecret(data.secret);
setStep("setup");
} catch (_error) {
toast.error("Erreur lors de la configuration de la 2FA.");
} finally {
setIsLoading(false);
}
};
const handleEnable = async () => {
if (otpValue.length !== 6) return;
setIsLoading(true);
try {
await AuthService.enable2fa(otpValue);
toast.success("Double authentification activée !");
await refreshUser();
setStep("idle");
setOtpValue("");
} catch (_error) {
toast.error("Code invalide. Veuillez réessayer.");
} finally {
setIsLoading(false);
}
};
const handleDisable = async () => {
if (otpValue.length !== 6) return;
setIsLoading(true);
try {
await AuthService.disable2fa(otpValue);
toast.success("Double authentification désactivée.");
await refreshUser();
setStep("idle");
setOtpValue("");
} catch (_error) {
toast.error("Code invalide. Veuillez réessayer.");
} finally {
setIsLoading(false);
}
};
// Note: We need a way to know if 2FA is enabled.
// Assuming user object might have twoFactorEnabled property or similar.
// For now, let's assume it's on the user object (we might need to add it to the type).
const isEnabled = (user as any)?.twoFactorEnabled;
if (step === "idle") {
return (
<Card className="border-none shadow-sm">
<CardHeader className="pb-4">
<div className="flex items-center gap-2 mb-1">
<Shield className="h-5 w-5 text-primary" />
<CardTitle>Double Authentification (2FA)</CardTitle>
</div>
<CardDescription>
Ajoutez une couche de sécurité supplémentaire à votre compte en utilisant
une application d'authentification.
</CardDescription>
</CardHeader>
<CardContent>
<div className="flex items-center gap-4 p-4 rounded-lg bg-zinc-50 dark:bg-zinc-900 border">
{isEnabled ? (
<>
<div className="bg-green-100 dark:bg-green-900/30 p-2 rounded-full">
<ShieldCheck className="h-6 w-6 text-green-600 dark:text-green-400" />
</div>
<div className="flex-1">
<p className="font-bold">La 2FA est activée</p>
<p className="text-sm text-muted-foreground">
Votre compte est protégé par un code temporaire.
</p>
</div>
<Button variant="outline" size="sm" onClick={() => setStep("verify")}>
Désactiver
</Button>
</>
) : (
<>
<div className="bg-zinc-200 dark:bg-zinc-800 p-2 rounded-full">
<ShieldAlert className="h-6 w-6 text-zinc-500" />
</div>
<div className="flex-1">
<p className="font-bold">La 2FA n'est pas activée</p>
<p className="text-sm text-muted-foreground">
Activez la 2FA pour mieux protéger votre compte.
</p>
</div>
<Button
variant="default"
size="sm"
onClick={handleSetup}
disabled={isLoading}
>
{isLoading ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
"Configurer"
)}
</Button>
</>
)}
</div>
</CardContent>
</Card>
);
}
if (step === "setup") {
return (
<Card className="border-none shadow-sm">
<CardHeader>
<CardTitle>Configurer la 2FA</CardTitle>
<CardDescription>
Scannez le QR Code ci-dessous avec votre application d'authentification
(Google Authenticator, Authy, etc.).
</CardDescription>
</CardHeader>
<CardContent className="flex flex-col items-center gap-6">
{qrCode && (
<div className="bg-white p-4 rounded-xl border-4 border-zinc-100">
<img src={qrCode} alt="QR Code 2FA" className="w-48 h-48" />
</div>
)}
<div className="w-full space-y-2">
<p className="text-sm font-medium text-center">
Ou entrez ce code manuellement :
</p>
<code className="block p-2 bg-muted text-center rounded text-xs font-mono break-all">
{secret}
</code>
</div>
<div className="flex flex-col items-center gap-4 w-full border-t pt-6">
<p className="text-sm font-medium">
Entrez le code à 6 chiffres pour confirmer :
</p>
<InputOTP maxLength={6} value={otpValue} onChange={setOtpValue}>
<InputOTPGroup>
<InputOTPSlot index={0} />
<InputOTPSlot index={1} />
<InputOTPSlot index={2} />
</InputOTPGroup>
<InputOTPSeparator />
<InputOTPGroup>
<InputOTPSlot index={3} />
<InputOTPSlot index={4} />
<InputOTPSlot index={5} />
</InputOTPGroup>
</InputOTP>
</div>
</CardContent>
<CardFooter className="flex justify-between">
<Button variant="ghost" onClick={() => setStep("idle")}>
Annuler
</Button>
<Button
onClick={handleEnable}
disabled={otpValue.length !== 6 || isLoading}
>
{isLoading ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
"Activer la 2FA"
)}
</Button>
</CardFooter>
</Card>
);
}
if (step === "verify") {
return (
<Card className="border-none shadow-sm">
<CardHeader>
<CardTitle>Désactiver la 2FA</CardTitle>
<CardDescription>
Veuillez entrer le code de votre application pour désactiver la double
authentification.
</CardDescription>
</CardHeader>
<CardContent className="flex flex-col items-center gap-6">
<InputOTP maxLength={6} value={otpValue} onChange={setOtpValue}>
<InputOTPGroup>
<InputOTPSlot index={0} />
<InputOTPSlot index={1} />
<InputOTPSlot index={2} />
</InputOTPGroup>
<InputOTPSeparator />
<InputOTPGroup>
<InputOTPSlot index={3} />
<InputOTPSlot index={4} />
<InputOTPSlot index={5} />
</InputOTPGroup>
</InputOTP>
</CardContent>
<CardFooter className="flex justify-between">
<Button variant="ghost" onClick={() => setStep("idle")}>
Annuler
</Button>
<Button
variant="destructive"
onClick={handleDisable}
disabled={otpValue.length !== 6 || isLoading}
>
{isLoading ? (
<Loader2 className="h-4 w-4 animate-spin" />
) : (
"Confirmer la désactivation"
)}
</Button>
</CardFooter>
</Card>
);
}
return null;
}

View File

@@ -8,8 +8,11 @@ import { cn } from "@/lib/utils";
function ScrollArea({ function ScrollArea({
className, className,
children, children,
viewportRef,
...props ...props
}: React.ComponentProps<typeof ScrollAreaPrimitive.Root>) { }: React.ComponentProps<typeof ScrollAreaPrimitive.Root> & {
viewportRef?: React.Ref<HTMLDivElement>;
}) {
return ( return (
<ScrollAreaPrimitive.Root <ScrollAreaPrimitive.Root
data-slot="scroll-area" data-slot="scroll-area"
@@ -18,6 +21,7 @@ function ScrollArea({
> >
<ScrollAreaPrimitive.Viewport <ScrollAreaPrimitive.Viewport
data-slot="scroll-area-viewport" data-slot="scroll-area-viewport"
ref={viewportRef}
className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1" className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1"
> >
{children} {children}

View File

@@ -1,23 +1,74 @@
"use client"; "use client";
import { useEffect, useRef } from "react"; import { type RefObject, useEffect, useRef } from "react";
import { ContentService } from "@/services/content.service"; import { ContentService } from "@/services/content.service";
interface ViewCounterProps { interface ViewCounterProps {
contentId: string; contentId: string;
videoRef?: RefObject<HTMLVideoElement | null>;
} }
export function ViewCounter({ contentId }: ViewCounterProps) { export function ViewCounter({ contentId, videoRef }: ViewCounterProps) {
const hasIncremented = useRef(false); const hasIncremented = useRef(false);
const containerRef = useRef<HTMLDivElement>(null);
useEffect(() => { useEffect(() => {
if (!hasIncremented.current) { const increment = () => {
ContentService.incrementViews(contentId).catch((err) => { if (!hasIncremented.current) {
console.error("Failed to increment views:", err); ContentService.incrementViews(contentId).catch((err) => {
}); console.error("Failed to increment views:", err);
hasIncremented.current = true; });
} hasIncremented.current = true;
}, [contentId]); }
};
return null; // 1. Observer pour la visibilité (IntersectionObserver)
const observer = new IntersectionObserver(
(entries) => {
const entry = entries[0];
if (entry.isIntersecting) {
// Si c'est une image (pas de videoRef), on attend 3 secondes
if (!videoRef) {
const timer = setTimeout(() => {
increment();
}, 3000);
return () => clearTimeout(timer);
}
}
},
{ threshold: 0.5 },
);
if (containerRef.current) {
observer.observe(containerRef.current);
}
// 2. Logique pour la vidéo (> 50%)
let videoElement: HTMLVideoElement | null = null;
const handleTimeUpdate = () => {
if (videoElement && videoElement.duration > 0) {
const progress = videoElement.currentTime / videoElement.duration;
if (progress >= 0.5) {
increment();
videoElement.removeEventListener("timeupdate", handleTimeUpdate);
}
}
};
if (videoRef?.current) {
videoElement = videoRef.current;
videoElement.addEventListener("timeupdate", handleTimeUpdate);
}
return () => {
observer.disconnect();
if (videoElement) {
videoElement.removeEventListener("timeupdate", handleTimeUpdate);
}
};
}, [contentId, videoRef]);
return (
<div ref={containerRef} className="absolute inset-0 pointer-events-none" />
);
} }

View File

@@ -5,14 +5,15 @@ import * as React from "react";
import { toast } from "sonner"; import { toast } from "sonner";
import { AuthService } from "@/services/auth.service"; import { AuthService } from "@/services/auth.service";
import { UserService } from "@/services/user.service"; import { UserService } from "@/services/user.service";
import type { RegisterPayload } from "@/types/auth"; import type { LoginResponse, RegisterPayload } from "@/types/auth";
import type { User } from "@/types/user"; import type { User } from "@/types/user";
interface AuthContextType { interface AuthContextType {
user: User | null; user: User | null;
isLoading: boolean; isLoading: boolean;
isAuthenticated: boolean; isAuthenticated: boolean;
login: (email: string, password: string) => Promise<void>; login: (email: string, password: string) => Promise<LoginResponse>;
verify2fa: (userId: string, token: string) => Promise<void>;
register: (payload: RegisterPayload) => Promise<void>; register: (payload: RegisterPayload) => Promise<void>;
logout: () => Promise<void>; logout: () => Promise<void>;
refreshUser: () => Promise<void>; refreshUser: () => Promise<void>;
@@ -59,12 +60,43 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
const login = async (email: string, password: string) => { const login = async (email: string, password: string) => {
try { try {
await AuthService.login(email, password); const response = await AuthService.login(email, password);
if (response.userId && response.message === "Please provide 2FA token") {
return response;
}
await refreshUser();
toast.success("Connexion réussie !");
router.push("/");
return response;
} catch (error: unknown) {
let errorMessage = "Erreur de connexion";
if (
error &&
typeof error === "object" &&
"response" in error &&
error.response &&
typeof error.response === "object" &&
"data" in error.response &&
error.response.data &&
typeof error.response.data === "object" &&
"message" in error.response.data &&
typeof error.response.data.message === "string"
) {
errorMessage = error.response.data.message;
}
toast.error(errorMessage);
throw error;
}
};
const verify2fa = async (userId: string, token: string) => {
try {
await AuthService.verify2fa(userId, token);
await refreshUser(); await refreshUser();
toast.success("Connexion réussie !"); toast.success("Connexion réussie !");
router.push("/"); router.push("/");
} catch (error: unknown) { } catch (error: unknown) {
let errorMessage = "Erreur de connexion"; let errorMessage = "Code 2FA invalide";
if ( if (
error && error &&
typeof error === "object" && typeof error === "object" &&
@@ -130,6 +162,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
isLoading, isLoading,
isAuthenticated: !!user, isAuthenticated: !!user,
login, login,
verify2fa,
register, register,
logout, logout,
refreshUser, refreshUser,

View File

@@ -0,0 +1,56 @@
"use client";
import * as React from "react";
import { io, type Socket } from "socket.io-client";
import { useAuth } from "./auth-provider";
interface SocketContextType {
socket: Socket | null;
isConnected: boolean;
}
const SocketContext = React.createContext<SocketContextType>({
socket: null,
isConnected: false,
});
export const useSocket = () => React.useContext(SocketContext);
export function SocketProvider({ children }: { children: React.ReactNode }) {
const { isAuthenticated } = useAuth();
const [socket, setSocket] = React.useState<Socket | null>(null);
const [isConnected, setIsConnected] = React.useState(false);
React.useEffect(() => {
if (isAuthenticated) {
const apiUrl = process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000";
const socketInstance = io(apiUrl, {
withCredentials: true,
transports: ["websocket"],
});
socketInstance.on("connect", () => {
setIsConnected(true);
});
socketInstance.on("disconnect", () => {
setIsConnected(false);
});
setSocket(socketInstance);
return () => {
socketInstance.disconnect();
};
} else {
setSocket(null);
setIsConnected(false);
}
}, [isAuthenticated]);
return (
<SocketContext.Provider value={{ socket, isConnected }}>
{children}
</SocketContext.Provider>
);
}

View File

@@ -1,4 +1,5 @@
import api from "@/lib/api"; import api from "@/lib/api";
import type { Report, ReportStatus } from "./report.service";
export interface AdminStats { export interface AdminStats {
users: number; users: number;
@@ -11,4 +12,24 @@ export const adminService = {
const response = await api.get("/admin/stats"); const response = await api.get("/admin/stats");
return response.data; return response.data;
}, },
getReports: async (limit = 10, offset = 0): Promise<Report[]> => {
const response = await api.get("/reports", { params: { limit, offset } });
return response.data;
},
updateReportStatus: async (
reportId: string,
status: ReportStatus,
): Promise<void> => {
await api.patch(`/reports/${reportId}/status`, { status });
},
deleteUser: async (userId: string): Promise<void> => {
await api.delete(`/users/${userId}`);
},
updateUser: async (userId: string, data: any): Promise<void> => {
await api.patch(`/users/admin/${userId}`, data);
},
}; };

View File

@@ -1,5 +1,9 @@
import api from "@/lib/api"; import api from "@/lib/api";
import type { LoginResponse, RegisterPayload } from "@/types/auth"; import type {
LoginResponse,
RegisterPayload,
TwoFactorSetupResponse,
} from "@/types/auth";
export const AuthService = { export const AuthService = {
async login(email: string, password: string): Promise<LoginResponse> { async login(email: string, password: string): Promise<LoginResponse> {
@@ -10,6 +14,14 @@ export const AuthService = {
return data; return data;
}, },
async verify2fa(userId: string, token: string): Promise<LoginResponse> {
const { data } = await api.post<LoginResponse>("/auth/verify-2fa", {
userId,
token,
});
return data;
},
async register(payload: RegisterPayload): Promise<void> { async register(payload: RegisterPayload): Promise<void> {
await api.post("/auth/register", payload); await api.post("/auth/register", payload);
}, },
@@ -21,4 +33,19 @@ export const AuthService = {
async refresh(): Promise<void> { async refresh(): Promise<void> {
await api.post("/auth/refresh"); await api.post("/auth/refresh");
}, },
async setup2fa(): Promise<TwoFactorSetupResponse> {
const { data } = await api.post<TwoFactorSetupResponse>(
"/users/me/2fa/setup",
);
return data;
},
async enable2fa(token: string): Promise<void> {
await api.post("/users/me/2fa/enable", { token });
},
async disable2fa(token: string): Promise<void> {
await api.post("/users/me/2fa/disable", { token });
},
}; };

View File

@@ -0,0 +1,32 @@
import api from "@/lib/api";
export interface Comment {
id: string;
text: string;
createdAt: string;
updatedAt: string;
user: {
uuid: string;
username: string;
displayName?: string;
avatarUrl?: string;
};
}
export const CommentService = {
async getByContentId(contentId: string): Promise<Comment[]> {
const { data } = await api.get<Comment[]>(`/contents/${contentId}/comments`);
return data;
},
async create(contentId: string, text: string): Promise<Comment> {
const { data } = await api.post<Comment>(`/contents/${contentId}/comments`, {
text,
});
return data;
},
async remove(commentId: string): Promise<void> {
await api.delete(`/comments/${commentId}`);
},
};

View File

@@ -0,0 +1,46 @@
import api from "@/lib/api";
export interface Conversation {
id: string;
updatedAt: string;
lastMessage?: {
text: string;
createdAt: string;
};
recipient: {
uuid: string;
username: string;
displayName?: string;
avatarUrl?: string;
};
}
export interface Message {
id: string;
text: string;
createdAt: string;
senderId: string;
readAt?: string;
}
export const MessageService = {
async getConversations(): Promise<Conversation[]> {
const { data } = await api.get<Conversation[]>("/messages/conversations");
return data;
},
async getMessages(conversationId: string): Promise<Message[]> {
const { data } = await api.get<Message[]>(
`/messages/conversations/${conversationId}`,
);
return data;
},
async sendMessage(recipientId: string, text: string): Promise<Message> {
const { data } = await api.post<Message>("/messages", {
recipientId,
text,
});
return data;
},
};

View File

@@ -0,0 +1,40 @@
import api from "@/lib/api";
export enum ReportReason {
INAPPROPRIATE = "inappropriate",
SPAM = "spam",
COPYRIGHT = "copyright",
OTHER = "other",
}
export enum ReportStatus {
PENDING = "pending",
REVIEWED = "reviewed",
RESOLVED = "resolved",
DISMISSED = "dismissed",
}
export interface CreateReportPayload {
contentId?: string;
tagId?: string;
reason: ReportReason;
description?: string;
}
export interface Report {
uuid: string;
reporterId: string;
contentId?: string;
tagId?: string;
reason: ReportReason;
description?: string;
status: ReportStatus;
createdAt: string;
updatedAt: string;
}
export const ReportService = {
async create(payload: CreateReportPayload): Promise<void> {
await api.post("/reports", payload);
},
};

View File

@@ -53,4 +53,9 @@ export const UserService = {
}); });
return data; return data;
}, },
async exportData(): Promise<any> {
const { data } = await api.get("/users/me/export");
return data;
},
}; };

View File

@@ -1,6 +1,8 @@
export interface LoginResponse { export interface LoginResponse {
message: string; message: string;
userId: string; userId?: string;
access_token?: string;
refresh_token?: string;
} }
export interface RegisterPayload { export interface RegisterPayload {
@@ -17,6 +19,12 @@ export interface AuthStatus {
username: string; username: string;
displayName?: string; displayName?: string;
avatarUrl?: string; avatarUrl?: string;
role?: string;
}; };
isLoading: boolean; isLoading: boolean;
} }
export interface TwoFactorSetupResponse {
qrCodeUrl: string;
secret: string;
}

View File

@@ -1,6 +1,6 @@
{ {
"name": "@memegoat/source", "name": "@memegoat/source",
"version": "1.7.0", "version": "1.7.5",
"description": "", "description": "",
"scripts": { "scripts": {
"version:get": "cmake -P version.cmake GET", "version:get": "cmake -P version.cmake GET",

21079
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff