chore: bump version to 1.8.3

- Refined `exportData` method to use `Record<string, unknown>` for more precise type safety.

backend/.migrations/0008_bitter_darwin.sql

@@ -0,0 +1,54 @@
+CREATE TABLE "comment_likes" (
+	"comment_id" uuid NOT NULL,
+	"user_id" uuid NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "comment_likes_comment_id_user_id_pk" PRIMARY KEY("comment_id","user_id")
+);
+--> statement-breakpoint
+CREATE TABLE "comments" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"content_id" uuid NOT NULL,
+	"user_id" uuid NOT NULL,
+	"parent_id" uuid,
+	"text" text NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"deleted_at" timestamp with time zone
+);
+--> statement-breakpoint
+CREATE TABLE "conversation_participants" (
+	"conversation_id" uuid NOT NULL,
+	"user_id" uuid NOT NULL,
+	"joined_at" timestamp with time zone DEFAULT now() NOT NULL,
+	CONSTRAINT "conversation_participants_conversation_id_user_id_pk" PRIMARY KEY("conversation_id","user_id")
+);
+--> statement-breakpoint
+CREATE TABLE "conversations" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE "messages" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"conversation_id" uuid NOT NULL,
+	"sender_id" uuid NOT NULL,
+	"text" text NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"read_at" timestamp with time zone
+);
+--> statement-breakpoint
+ALTER TABLE "comment_likes" ADD CONSTRAINT "comment_likes_comment_id_comments_id_fk" FOREIGN KEY ("comment_id") REFERENCES "public"."comments"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "comment_likes" ADD CONSTRAINT "comment_likes_user_id_users_uuid_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("uuid") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "comments" ADD CONSTRAINT "comments_content_id_contents_id_fk" FOREIGN KEY ("content_id") REFERENCES "public"."contents"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "comments" ADD CONSTRAINT "comments_user_id_users_uuid_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("uuid") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "comments" ADD CONSTRAINT "comments_parent_id_comments_id_fk" FOREIGN KEY ("parent_id") REFERENCES "public"."comments"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "conversation_participants" ADD CONSTRAINT "conversation_participants_conversation_id_conversations_id_fk" FOREIGN KEY ("conversation_id") REFERENCES "public"."conversations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "conversation_participants" ADD CONSTRAINT "conversation_participants_user_id_users_uuid_fk" FOREIGN KEY ("user_id") REFERENCES "public"."users"("uuid") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "messages" ADD CONSTRAINT "messages_conversation_id_conversations_id_fk" FOREIGN KEY ("conversation_id") REFERENCES "public"."conversations"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "messages" ADD CONSTRAINT "messages_sender_id_users_uuid_fk" FOREIGN KEY ("sender_id") REFERENCES "public"."users"("uuid") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "comments_content_id_idx" ON "comments" USING btree ("content_id");--> statement-breakpoint
+CREATE INDEX "comments_user_id_idx" ON "comments" USING btree ("user_id");--> statement-breakpoint
+CREATE INDEX "comments_parent_id_idx" ON "comments" USING btree ("parent_id");--> statement-breakpoint
+CREATE INDEX "messages_conversation_id_idx" ON "messages" USING btree ("conversation_id");--> statement-breakpoint
+CREATE INDEX "messages_sender_id_idx" ON "messages" USING btree ("sender_id");

backend/.migrations/meta/_journal.json

@@ -57,6 +57,13 @@
       "when": 1769605995410,
       "tag": "0007_melodic_synch",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "7",
+      "when": 1769696731978,
+      "tag": "0008_bitter_darwin",
+      "breakpoints": true
     }
   ]
 }

backend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@memegoat/backend",
-	"version": "1.8.0",
+	"version": "1.8.3",
 	"description": "",
 	"author": "",
 	"private": true,

backend/src/comments/comments.controller.ts

@@ -8,18 +8,45 @@ import {
 	Req,
 	UseGuards,
 } from "@nestjs/common";
+import { ConfigService } from "@nestjs/config";
+import { getIronSession } from "iron-session";
 import { AuthGuard } from "../auth/guards/auth.guard";
+import { getSessionOptions } from "../auth/session.config";
 import type { AuthenticatedRequest } from "../common/interfaces/request.interface";
+import { JwtService } from "../crypto/services/jwt.service";
 import { CommentsService } from "./comments.service";
 import { CreateCommentDto } from "./dto/create-comment.dto";
 
 @Controller()
 export class CommentsController {
-	constructor(private readonly commentsService: CommentsService) {}
+	constructor(
+		private readonly commentsService: CommentsService,
+		private readonly jwtService: JwtService,
+		private readonly configService: ConfigService,
+	) {}
 
 	@Get("contents/:contentId/comments")
-	findAllByContentId(@Param("contentId") contentId: string) {
-		return this.commentsService.findAllByContentId(contentId);
+	async findAllByContentId(
+		@Param("contentId") contentId: string,
+		@Req() req: any,
+	) {
+		// Tentative de récupération de l'utilisateur pour isLiked (optionnel)
+		let userId: string | undefined;
+		try {
+			const session = await getIronSession<any>(
+				req,
+				req.res,
+				getSessionOptions(this.configService.get("SESSION_PASSWORD") as string),
+			);
+			if (session.accessToken) {
+				const payload = await this.jwtService.verifyJwt(session.accessToken);
+				userId = payload.sub;
+			}
+		} catch (_e) {
+			// Ignorer les erreurs de session
+		}
+
+		return this.commentsService.findAllByContentId(contentId, userId);
 	}
 
 	@Post("contents/:contentId/comments")
@@ -38,4 +65,16 @@ export class CommentsController {
 		const isAdmin = req.user.role === "admin" || req.user.role === "moderator";
 		return this.commentsService.remove(req.user.sub, id, isAdmin);
 	}
+
+	@Post("comments/:id/like")
+	@UseGuards(AuthGuard)
+	like(@Req() req: AuthenticatedRequest, @Param("id") id: string) {
+		return this.commentsService.like(req.user.sub, id);
+	}
+
+	@Delete("comments/:id/like")
+	@UseGuards(AuthGuard)
+	unlike(@Req() req: AuthenticatedRequest, @Param("id") id: string) {
+		return this.commentsService.unlike(req.user.sub, id);
+	}
 }

backend/src/comments/comments.module.ts

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

backend/src/comments/comments.service.spec.ts

@@ -1,6 +1,9 @@
 import { ForbiddenException, NotFoundException } from "@nestjs/common";
 import { Test, TestingModule } from "@nestjs/testing";
+import { EventsGateway } from "../realtime/events.gateway";
+import { S3Service } from "../s3/s3.service";
 import { CommentsService } from "./comments.service";
+import { CommentLikesRepository } from "./repositories/comment-likes.repository";
 import { CommentsRepository } from "./repositories/comments.repository";
 
 describe("CommentsService", () => {
@@ -11,14 +14,34 @@ describe("CommentsService", () => {
 		create: jest.fn(),
 		findAllByContentId: jest.fn(),
 		findOne: jest.fn(),
+		findOneEnriched: jest.fn(),
 		delete: jest.fn(),
 	};
 
+	const mockCommentLikesRepository = {
+		addLike: jest.fn(),
+		removeLike: jest.fn(),
+		countByCommentId: jest.fn(),
+		isLikedByUser: jest.fn(),
+	};
+
+	const mockS3Service = {
+		getPublicUrl: jest.fn(),
+	};
+
+	const mockEventsGateway = {
+		sendToContent: jest.fn(),
+	};
+
 	beforeEach(async () => {
+		jest.clearAllMocks();
 		const module: TestingModule = await Test.createTestingModule({
 			providers: [
 				CommentsService,
 				{ provide: CommentsRepository, useValue: mockCommentsRepository },
+				{ provide: CommentLikesRepository, useValue: mockCommentLikesRepository },
+				{ provide: S3Service, useValue: mockS3Service },
+				{ provide: EventsGateway, useValue: mockEventsGateway },
 			],
 		}).compile();
 
@@ -34,8 +57,12 @@ describe("CommentsService", () => {
 		it("should create a comment", async () => {
 			const userId = "user1";
 			const contentId = "content1";
-			const dto = { text: "Nice meme" };
-			mockCommentsRepository.create.mockResolvedValue({ id: "c1", ...dto });
+			const dto = { text: "Nice meme", parentId: undefined };
+			const createdComment = { id: "c1", ...dto, user: { username: "u1" } };
+			mockCommentsRepository.create.mockResolvedValue(createdComment);
+			mockCommentsRepository.findOneEnriched.mockResolvedValue(createdComment);
+			mockCommentLikesRepository.countByCommentId.mockResolvedValue(0);
+			mockCommentLikesRepository.isLikedByUser.mockResolvedValue(false);
 
 			const result = await service.create(userId, contentId, dto);
 			expect(result.id).toBe("c1");
@@ -43,16 +70,30 @@ describe("CommentsService", () => {
 				userId,
 				contentId,
 				text: dto.text,
+				parentId: undefined,
 			});
+			expect(mockEventsGateway.sendToContent).toHaveBeenCalledWith(
+				contentId,
+				"new_comment",
+				expect.any(Object),
+			);
 		});
 	});
 
 	describe("findAllByContentId", () => {
 		it("should return comments for a content", async () => {
-			mockCommentsRepository.findAllByContentId.mockResolvedValue([{ id: "c1" }]);
-			const result = await service.findAllByContentId("content1");
+			mockCommentsRepository.findAllByContentId.mockResolvedValue([
+				{ id: "c1", user: { avatarUrl: "path" } },
+			]);
+			mockCommentLikesRepository.countByCommentId.mockResolvedValue(5);
+			mockCommentLikesRepository.isLikedByUser.mockResolvedValue(true);
+			mockS3Service.getPublicUrl.mockReturnValue("url");
+
+			const result = await service.findAllByContentId("content1", "u1");
 			expect(result).toHaveLength(1);
-			expect(repository.findAllByContentId).toHaveBeenCalledWith("content1");
+			expect(result[0].likesCount).toBe(5);
+			expect(result[0].isLiked).toBe(true);
+			expect(result[0].user.avatarUrl).toBe("url");
 		});
 	});
 
@@ -76,7 +117,28 @@ describe("CommentsService", () => {
 
 		it("should throw ForbiddenException if not owner and not admin", async () => {
 			mockCommentsRepository.findOne.mockResolvedValue({ userId: "u1" });
-			await expect(service.remove("other", "c1")).rejects.toThrow(ForbiddenException);
+			await expect(service.remove("other", "c1")).rejects.toThrow(
+				ForbiddenException,
+			);
+		});
+	});
+
+	describe("like", () => {
+		it("should add like", async () => {
+			mockCommentsRepository.findOne.mockResolvedValue({ id: "c1" });
+			await service.like("u1", "c1");
+			expect(mockCommentLikesRepository.addLike).toHaveBeenCalledWith("c1", "u1");
+		});
+	});
+
+	describe("unlike", () => {
+		it("should remove like", async () => {
+			mockCommentsRepository.findOne.mockResolvedValue({ id: "c1" });
+			await service.unlike("u1", "c1");
+			expect(mockCommentLikesRepository.removeLike).toHaveBeenCalledWith(
+				"c1",
+				"u1",
+			);
 		});
 	});
 });

backend/src/comments/comments.service.ts

@@ -3,23 +3,87 @@ import {
 	Injectable,
 	NotFoundException,
 } from "@nestjs/common";
+import { EventsGateway } from "../realtime/events.gateway";
+import { S3Service } from "../s3/s3.service";
 import type { CreateCommentDto } from "./dto/create-comment.dto";
+import { CommentLikesRepository } from "./repositories/comment-likes.repository";
 import { CommentsRepository } from "./repositories/comments.repository";
 
 @Injectable()
 export class CommentsService {
-	constructor(private readonly commentsRepository: CommentsRepository) {}
+	constructor(
+		private readonly commentsRepository: CommentsRepository,
+		private readonly commentLikesRepository: CommentLikesRepository,
+		private readonly s3Service: S3Service,
+		private readonly eventsGateway: EventsGateway,
+	) {}
 
 	async create(userId: string, contentId: string, dto: CreateCommentDto) {
-		return this.commentsRepository.create({
+		const comment = await this.commentsRepository.create({
 			userId,
 			contentId,
 			text: dto.text,
+			parentId: dto.parentId,
 		});
+
+		// Récupérer le commentaire avec les infos utilisateur pour le WebSocket
+		const enrichedComment = await this.findOneEnriched(comment.id, userId);
+
+		// Notifier les autres utilisateurs sur ce contenu
+		this.eventsGateway.sendToContent(contentId, "new_comment", enrichedComment);
+
+		return enrichedComment;
 	}
 
-	async findAllByContentId(contentId: string) {
-		return this.commentsRepository.findAllByContentId(contentId);
+	async findOneEnriched(commentId: string, currentUserId?: string) {
+		const comment = await this.commentsRepository.findOneEnriched(commentId);
+		if (!comment) return null;
+
+		const [likesCount, isLiked] = await Promise.all([
+			this.commentLikesRepository.countByCommentId(comment.id),
+			currentUserId
+				? this.commentLikesRepository.isLikedByUser(comment.id, currentUserId)
+				: Promise.resolve(false),
+		]);
+
+		return {
+			...comment,
+			likesCount,
+			isLiked,
+			user: {
+				...comment.user,
+				avatarUrl: comment.user.avatarUrl
+					? this.s3Service.getPublicUrl(comment.user.avatarUrl)
+					: null,
+			},
+		};
+	}
+
+	async findAllByContentId(contentId: string, userId?: string) {
+		const comments = await this.commentsRepository.findAllByContentId(contentId);
+
+		return Promise.all(
+			comments.map(async (comment) => {
+				const [likesCount, isLiked] = await Promise.all([
+					this.commentLikesRepository.countByCommentId(comment.id),
+					userId
+						? this.commentLikesRepository.isLikedByUser(comment.id, userId)
+						: Promise.resolve(false),
+				]);
+
+				return {
+					...comment,
+					likesCount,
+					isLiked,
+					user: {
+						...comment.user,
+						avatarUrl: comment.user.avatarUrl
+							? this.s3Service.getPublicUrl(comment.user.avatarUrl)
+							: null,
+					},
+				};
+			}),
+		);
 	}
 
 	async remove(userId: string, commentId: string, isAdmin = false) {
@@ -34,4 +98,20 @@ export class CommentsService {
 
 		await this.commentsRepository.delete(commentId);
 	}
+
+	async like(userId: string, commentId: string) {
+		const comment = await this.commentsRepository.findOne(commentId);
+		if (!comment) {
+			throw new NotFoundException("Comment not found");
+		}
+		await this.commentLikesRepository.addLike(commentId, userId);
+	}
+
+	async unlike(userId: string, commentId: string) {
+		const comment = await this.commentsRepository.findOne(commentId);
+		if (!comment) {
+			throw new NotFoundException("Comment not found");
+		}
+		await this.commentLikesRepository.removeLike(commentId, userId);
+	}
 }

backend/src/comments/dto/create-comment.dto.ts

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

backend/src/comments/repositories/comment-likes.repository.ts

@@ -0,0 +1,42 @@
+import { Injectable } from "@nestjs/common";
+import { and, eq, sql } from "drizzle-orm";
+import { DatabaseService } from "../../database/database.service";
+import { commentLikes } from "../../database/schemas/comment_likes";
+
+@Injectable()
+export class CommentLikesRepository {
+	constructor(private readonly databaseService: DatabaseService) {}
+
+	async addLike(commentId: string, userId: string) {
+		await this.databaseService.db
+			.insert(commentLikes)
+			.values({ commentId, userId })
+			.onConflictDoNothing();
+	}
+
+	async removeLike(commentId: string, userId: string) {
+		await this.databaseService.db
+			.delete(commentLikes)
+			.where(
+				and(eq(commentLikes.commentId, commentId), eq(commentLikes.userId, userId)),
+			);
+	}
+
+	async countByCommentId(commentId: string) {
+		const results = await this.databaseService.db
+			.select({ count: sql<number>`count(*)` })
+			.from(commentLikes)
+			.where(eq(commentLikes.commentId, commentId));
+		return Number(results[0]?.count || 0);
+	}
+
+	async isLikedByUser(commentId: string, userId: string) {
+		const results = await this.databaseService.db
+			.select()
+			.from(commentLikes)
+			.where(
+				and(eq(commentLikes.commentId, commentId), eq(commentLikes.userId, userId)),
+			);
+		return !!results[0];
+	}
+}

backend/src/comments/repositories/comments.repository.ts

@@ -9,11 +9,11 @@ export class CommentsRepository {
 	constructor(private readonly databaseService: DatabaseService) {}
 
 	async create(data: NewCommentInDb) {
-		const [comment] = await this.databaseService.db
+		const results = await this.databaseService.db
 			.insert(comments)
 			.values(data)
 			.returning();
-		return comment;
+		return results[0];
 	}
 
 	async findAllByContentId(contentId: string) {
@@ -21,6 +21,7 @@ export class CommentsRepository {
 			.select({
 				id: comments.id,
 				text: comments.text,
+				parentId: comments.parentId,
 				createdAt: comments.createdAt,
 				updatedAt: comments.updatedAt,
 				user: {
@@ -37,11 +38,32 @@ export class CommentsRepository {
 	}
 
 	async findOne(id: string) {
-		const [comment] = await this.databaseService.db
+		const results = await this.databaseService.db
 			.select()
 			.from(comments)
 			.where(and(eq(comments.id, id), isNull(comments.deletedAt)));
-		return comment;
+		return results[0];
+	}
+
+	async findOneEnriched(id: string) {
+		const results = await this.databaseService.db
+			.select({
+				id: comments.id,
+				text: comments.text,
+				parentId: comments.parentId,
+				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.id, id), isNull(comments.deletedAt)));
+		return results[0];
 	}
 
 	async delete(id: string) {

backend/src/database/schemas/comment_likes.ts

@@ -0,0 +1,21 @@
+import { pgTable, primaryKey, timestamp, uuid } from "drizzle-orm/pg-core";
+import { comments } from "./comments";
+import { users } from "./users";
+
+export const commentLikes = pgTable(
+	"comment_likes",
+	{
+		commentId: uuid("comment_id")
+			.notNull()
+			.references(() => comments.id, { onDelete: "cascade" }),
+		userId: uuid("user_id")
+			.notNull()
+			.references(() => users.uuid, { onDelete: "cascade" }),
+		createdAt: timestamp("created_at", { withTimezone: true })
+			.notNull()
+			.defaultNow(),
+	},
+	(t) => ({
+		pk: primaryKey({ columns: [t.commentId, t.userId] }),
+	}),
+);

backend/src/database/schemas/comments.ts

@@ -12,6 +12,9 @@ export const comments = pgTable(
 		userId: uuid("user_id")
 			.notNull()
 			.references(() => users.uuid, { onDelete: "cascade" }),
+		parentId: uuid("parent_id").references(() => comments.id, {
+			onDelete: "cascade",
+		}),
 		text: text("text").notNull(),
 		createdAt: timestamp("created_at", { withTimezone: true })
 			.notNull()
@@ -24,6 +27,7 @@ export const comments = pgTable(
 	(table) => ({
 		contentIdIdx: index("comments_content_id_idx").on(table.contentId),
 		userIdIdx: index("comments_user_id_idx").on(table.userId),
+		parentIdIdx: index("comments_parent_id_idx").on(table.parentId),
 	}),
 );
 

backend/src/database/schemas/index.ts

@@ -1,6 +1,7 @@
 export * from "./api_keys";
 export * from "./audit_logs";
 export * from "./categories";
+export * from "./comment_likes";
 export * from "./comments";
 export * from "./content";
 export * from "./favorites";

backend/src/messages/messages.controller.ts

@@ -22,6 +22,22 @@ export class MessagesController {
 		return this.messagesService.getConversations(req.user.sub);
 	}
 
+	@Get("unread-count")
+	getUnreadCount(@Req() req: AuthenticatedRequest) {
+		return this.messagesService.getUnreadCount(req.user.sub);
+	}
+
+	@Get("conversations/with/:userId")
+	getConversationWithUser(
+		@Req() req: AuthenticatedRequest,
+		@Param("userId") targetUserId: string,
+	) {
+		return this.messagesService.getConversationWithUser(
+			req.user.sub,
+			targetUserId,
+		);
+	}
+
 	@Get("conversations/:id")
 	getMessages(
 		@Req() req: AuthenticatedRequest,

backend/src/messages/messages.service.spec.ts

@@ -6,8 +6,8 @@ import { MessagesRepository } from "./repositories/messages.repository";
 
 describe("MessagesService", () => {
 	let service: MessagesService;
-	let repository: MessagesRepository;
-	let eventsGateway: EventsGateway;
+	let _repository: MessagesRepository;
+	let _eventsGateway: EventsGateway;
 
 	const mockMessagesRepository = {
 		findConversationBetweenUsers: jest.fn(),
@@ -17,6 +17,8 @@ describe("MessagesService", () => {
 		findAllConversations: jest.fn(),
 		isParticipant: jest.fn(),
 		findMessagesByConversationId: jest.fn(),
+		markAsRead: jest.fn(),
+		countUnreadMessages: jest.fn(),
 	};
 
 	const mockEventsGateway = {
@@ -33,28 +35,39 @@ describe("MessagesService", () => {
 		}).compile();
 
 		service = module.get<MessagesService>(MessagesService);
-		repository = module.get<MessagesRepository>(MessagesRepository);
-		eventsGateway = module.get<EventsGateway>(EventsGateway);
+		_repository = module.get<MessagesRepository>(MessagesRepository);
+		_eventsGateway = module.get<EventsGateway>(EventsGateway);
 	});
 
 	describe("sendMessage", () => {
 		it("should send message to existing conversation", async () => {
 			const senderId = "s1";
 			const dto = { recipientId: "r1", text: "hello" };
-			mockMessagesRepository.findConversationBetweenUsers.mockResolvedValue({ id: "conv1" });
-			mockMessagesRepository.createMessage.mockResolvedValue({ id: "m1", text: "hello" });
+			mockMessagesRepository.findConversationBetweenUsers.mockResolvedValue({
+				id: "conv1",
+			});
+			mockMessagesRepository.createMessage.mockResolvedValue({
+				id: "m1",
+				text: "hello",
+			});
 
 			const result = await service.sendMessage(senderId, dto);
 
 			expect(result.id).toBe("m1");
-			expect(mockEventsGateway.sendToUser).toHaveBeenCalledWith("r1", "new_message", expect.anything());
+			expect(mockEventsGateway.sendToUser).toHaveBeenCalledWith(
+				"r1",
+				"new_message",
+				expect.anything(),
+			);
 		});
 
 		it("should create new conversation if not exists", async () => {
 			const senderId = "s1";
 			const dto = { recipientId: "r1", text: "hello" };
 			mockMessagesRepository.findConversationBetweenUsers.mockResolvedValue(null);
-			mockMessagesRepository.createConversation.mockResolvedValue({ id: "new_conv" });
+			mockMessagesRepository.createConversation.mockResolvedValue({
+				id: "new_conv",
+			});
 			mockMessagesRepository.createMessage.mockResolvedValue({ id: "m1" });
 
 			await service.sendMessage(senderId, dto);
@@ -67,7 +80,9 @@ describe("MessagesService", () => {
 	describe("getMessages", () => {
 		it("should return messages if user is participant", async () => {
 			mockMessagesRepository.isParticipant.mockResolvedValue(true);
-			mockMessagesRepository.findMessagesByConversationId.mockResolvedValue([{ id: "m1" }]);
+			mockMessagesRepository.findMessagesByConversationId.mockResolvedValue([
+				{ id: "m1" },
+			]);
 
 			const result = await service.getMessages("u1", "conv1");
 			expect(result).toHaveLength(1);
@@ -75,7 +90,9 @@ describe("MessagesService", () => {
 
 		it("should throw ForbiddenException if user is not participant", async () => {
 			mockMessagesRepository.isParticipant.mockResolvedValue(false);
-			await expect(service.getMessages("u1", "conv1")).rejects.toThrow(ForbiddenException);
+			await expect(service.getMessages("u1", "conv1")).rejects.toThrow(
+				ForbiddenException,
+			);
 		});
 	});
 });

backend/src/messages/messages.service.ts

@@ -42,6 +42,17 @@ export class MessagesService {
 		return this.messagesRepository.findAllConversations(userId);
 	}
 
+	async getUnreadCount(userId: string) {
+		return this.messagesRepository.countUnreadMessages(userId);
+	}
+
+	async getConversationWithUser(userId: string, targetUserId: string) {
+		return this.messagesRepository.findConversationBetweenUsers(
+			userId,
+			targetUserId,
+		);
+	}
+
 	async getMessages(userId: string, conversationId: string) {
 		const isParticipant = await this.messagesRepository.isParticipant(
 			conversationId,
@@ -51,6 +62,20 @@ export class MessagesService {
 			throw new ForbiddenException("You are not part of this conversation");
 		}
 
+		// Marquer comme lus
+		await this.messagesRepository.markAsRead(conversationId, userId);
+
 		return this.messagesRepository.findMessagesByConversationId(conversationId);
 	}
+
+	async markAsRead(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.markAsRead(conversationId, userId);
+	}
 }

backend/src/messages/repositories/messages.repository.ts

@@ -133,4 +133,35 @@ export class MessagesRepository {
 			.from(conversationParticipants)
 			.where(eq(conversationParticipants.conversationId, conversationId));
 	}
+
+	async markAsRead(conversationId: string, userId: string) {
+		await this.databaseService.db
+			.update(messages)
+			.set({ readAt: new Date() })
+			.where(
+				and(
+					eq(messages.conversationId, conversationId),
+					sql`${messages.senderId} != ${userId}`,
+					sql`${messages.readAt} IS NULL`,
+				),
+			);
+	}
+
+	async countUnreadMessages(userId: string) {
+		const result = await this.databaseService.db
+			.select({ count: sql<number>`count(*)` })
+			.from(messages)
+			.innerJoin(
+				conversationParticipants,
+				eq(messages.conversationId, conversationParticipants.conversationId),
+			)
+			.where(
+				and(
+					eq(conversationParticipants.userId, userId),
+					sql`${messages.senderId} != ${userId}`,
+					sql`${messages.readAt} IS NULL`,
+				),
+			);
+		return Number(result[0]?.count || 0);
+	}
 }

backend/src/realtime/events.gateway.spec.ts

@@ -1,12 +1,11 @@
 import { ConfigService } from "@nestjs/config";
 import { Test, TestingModule } from "@nestjs/testing";
-import { Server } from "socket.io";
 import { JwtService } from "../crypto/services/jwt.service";
 import { EventsGateway } from "./events.gateway";
 
 describe("EventsGateway", () => {
 	let gateway: EventsGateway;
-	let jwtService: JwtService;
+	let _jwtService: JwtService;
 
 	const mockJwtService = {
 		verifyJwt: jest.fn(),
@@ -26,7 +25,7 @@ describe("EventsGateway", () => {
 		}).compile();
 
 		gateway = module.get<EventsGateway>(EventsGateway);
-		jwtService = module.get<JwtService>(JwtService);
+		_jwtService = module.get<JwtService>(JwtService);
 		gateway.server = {
 			to: jest.fn().mockReturnThis(),
 			emit: jest.fn(),
@@ -46,7 +45,10 @@ describe("EventsGateway", () => {
 			gateway.sendToUser(userId, event, data);
 
 			expect(gateway.server.to).toHaveBeenCalledWith(`user:${userId}`);
-			expect(gateway.server.to(`user:${userId}`).emit).toHaveBeenCalledWith(event, data);
+			expect(gateway.server.to(`user:${userId}`).emit).toHaveBeenCalledWith(
+				event,
+				data,
+			);
 		});
 	});
 });

backend/src/realtime/events.gateway.ts

@@ -1,9 +1,12 @@
 import { Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import {
+	ConnectedSocket,
+	MessageBody,
 	OnGatewayConnection,
 	OnGatewayDisconnect,
 	OnGatewayInit,
+	SubscribeMessage,
 	WebSocketGateway,
 	WebSocketServer,
 } from "@nestjs/websockets";
@@ -54,6 +57,8 @@ export class EventsGateway
 
 			if (!session.accessToken) {
 				this.logger.warn(`Client ${client.id} unauthorized connection`);
+				// Permettre les connexions anonymes pour voir les commentaires en temps réel ?
+				// Pour l'instant on déconnecte car le système actuel semble exiger l'auth
 				client.disconnect();
 				return;
 			}
@@ -75,8 +80,30 @@ export class EventsGateway
 		this.logger.log(`Client disconnected: ${client.id}`);
 	}
 
+	@SubscribeMessage("join_content")
+	handleJoinContent(
+		@ConnectedSocket() client: Socket,
+		@MessageBody() contentId: string,
+	) {
+		client.join(`content:${contentId}`);
+		this.logger.log(`Client ${client.id} joined content room: ${contentId}`);
+	}
+
+	@SubscribeMessage("leave_content")
+	handleLeaveContent(
+		@ConnectedSocket() client: Socket,
+		@MessageBody() contentId: string,
+	) {
+		client.leave(`content:${contentId}`);
+		this.logger.log(`Client ${client.id} left content room: ${contentId}`);
+	}
+
 	// 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);
 	}
+
+	sendToContent(contentId: string, event: string, data: any) {
+		this.server.to(`content:${contentId}`).emit(event, data);
+	}
 }

backend/src/users/repositories/users.repository.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@nestjs/common";
-import { and, eq, lte, sql } from "drizzle-orm";
+import { and, eq, ilike, lte, or, sql } from "drizzle-orm";
 import { DatabaseService } from "../../database/database.service";
 import { contents, favorites, users } from "../../database/schemas";
 
@@ -97,6 +97,24 @@ export class UsersRepository {
 		return result[0] || null;
 	}
 
+	async search(query: string) {
+		return this.databaseService.db
+			.select({
+				uuid: users.uuid,
+				username: users.username,
+				displayName: users.displayName,
+				avatarUrl: users.avatarUrl,
+			})
+			.from(users)
+			.where(
+				or(
+					ilike(users.username, `%${query}%`),
+					ilike(users.displayName, `%${query}%`),
+				),
+			)
+			.limit(10);
+	}
+
 	async findOne(uuid: string) {
 		const result = await this.databaseService.db
 			.select()

backend/src/users/users.controller.ts

@@ -54,6 +54,12 @@ export class UsersController {
 		return this.usersService.findPublicProfile(username);
 	}
 
+	@Get("search")
+	@UseGuards(AuthGuard)
+	search(@Query("q") query: string) {
+		return this.usersService.search(query);
+	}
+
 	// Gestion de son propre compte
 	@Get("me")
 	@UseGuards(AuthGuard)

backend/src/users/users.service.ts

@@ -106,6 +106,16 @@ export class UsersService {
 		};
 	}
 
+	async search(query: string) {
+		const users = await this.usersRepository.search(query);
+		return users.map((user) => ({
+			...user,
+			avatarUrl: user.avatarUrl
+				? this.s3Service.getPublicUrl(user.avatarUrl)
+				: null,
+		}));
+	}
+
 	async findOne(uuid: string) {
 		const user = await this.usersRepository.findOne(uuid);
 		if (!user) return null;

frontend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@memegoat/frontend",
-	"version": "1.8.0",
+	"version": "1.8.3",
 	"private": true,
 	"scripts": {
 		"dev": "next dev",

frontend/src/app/(dashboard)/messages/page.tsx

@@ -2,7 +2,9 @@
 
 import { formatDistanceToNow } from "date-fns";
 import { fr } from "date-fns/locale";
-import { Search, Send } from "lucide-react";
+import { Search, Send, UserPlus, X } from "lucide-react";
+import Link from "next/link";
+import { useRouter, useSearchParams } from "next/navigation";
 import * as React from "react";
 import { toast } from "sonner";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
@@ -16,23 +18,54 @@ import {
 	type Message,
 	MessageService,
 } from "@/services/message.service";
+import { UserService } from "@/services/user.service";
+import type { User } from "@/types/user";
 
 export default function MessagesPage() {
 	const { user } = useAuth();
 	const { socket } = useSocket();
+	const _router = useRouter();
+	const searchParams = useSearchParams();
+	const targetUserId = searchParams.get("user");
+
 	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 [searchQuery, setSearchQuery] = React.useState("");
+	const [searchResults, setSearchResults] = React.useState<User[]>([]);
+	const [isSearching, setIsSearching] = React.useState(false);
+
 	const scrollRef = React.useRef<HTMLDivElement>(null);
 
+	// Charger les conversations initiales
 	React.useEffect(() => {
 		const fetchConvs = async () => {
 			try {
 				const data = await MessageService.getConversations();
 				setConversations(data);
+
+				// Si un utilisateur est spécifié dans l'URL, essayer de trouver la conversation
+				if (targetUserId) {
+					const existing = data.find((c) => c.recipient.uuid === targetUserId);
+					if (existing) {
+						setActiveConv(existing);
+					} else {
+						// Chercher les infos de l'utilisateur pour afficher une interface de chat vide
+						try {
+							const conv = await MessageService.getConversationWith(targetUserId);
+							if (conv) {
+								setConversations((prev) => [conv, ...prev]);
+								setActiveConv(conv);
+							}
+						} catch (_e) {
+							// Peut-être que l'utilisateur n'existe pas ou erreur
+						}
+					}
+				}
 			} catch (_error) {
 				toast.error("Erreur lors du chargement des conversations");
 			} finally {
@@ -40,7 +73,28 @@ export default function MessagesPage() {
 			}
 		};
 		fetchConvs();
-	}, []);
+	}, [targetUserId]);
+
+	// Recherche d'utilisateurs
+	React.useEffect(() => {
+		const delayDebounceFn = setTimeout(async () => {
+			if (searchQuery.length > 1) {
+				setIsSearching(true);
+				try {
+					const results = await UserService.search(searchQuery);
+					setSearchResults(results.filter((u) => u.uuid !== user?.uuid));
+				} catch (_error) {
+					console.error("Search failed");
+				} finally {
+					setIsSearching(false);
+				}
+			} else {
+				setSearchResults([]);
+			}
+		}, 300);
+
+		return () => clearTimeout(delayDebounceFn);
+	}, [searchQuery, user?.uuid]);
 
 	React.useEffect(() => {
 		if (activeConv) {
@@ -98,7 +152,12 @@ export default function MessagesPage() {
 
 	React.useEffect(() => {
 		if (scrollRef.current) {
-			scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+			const scrollContainer = scrollRef.current.querySelector(
+				"[data-slot='scroll-area-viewport']",
+			);
+			if (scrollContainer) {
+				scrollContainer.scrollTop = scrollContainer.scrollHeight;
+			}
 		}
 	}, []);
 
@@ -114,7 +173,21 @@ export default function MessagesPage() {
 				activeConv.recipient.uuid,
 				text,
 			);
-			setMessages((prev) => [...prev, msg]);
+
+			// Si c'était une conv temporaire, on la remplace par la vraie
+			if (activeConv.id.startsWith("temp-")) {
+				const fetchConvs = async () => {
+					const data = await MessageService.getConversations();
+					setConversations(data);
+					const realConv = data.find(
+						(c) => c.recipient.uuid === activeConv.recipient.uuid,
+					);
+					if (realConv) setActiveConv(realConv);
+				};
+				fetchConvs();
+			} else {
+				setMessages((prev) => [...prev, msg]);
+			}
 		} catch (_error) {
 			toast.error("Erreur lors de l'envoi");
 		}
@@ -125,15 +198,94 @@ export default function MessagesPage() {
 			{/* 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="flex items-center justify-between mb-4">
+						<h2 className="text-xl font-bold">Messages</h2>
+						<Button variant="ghost" size="icon" className="rounded-full">
+							<UserPlus className="h-5 w-5" />
+						</Button>
+					</div>
 					<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" />
+						<Input
+							placeholder="Rechercher un membre..."
+							className="pl-9"
+							value={searchQuery}
+							onChange={(e) => setSearchQuery(e.target.value)}
+						/>
+						{searchQuery && (
+							<button
+								type="button"
+								onClick={() => setSearchQuery("")}
+								className="absolute right-3 top-1/2 -translate-y-1/2 p-0.5 hover:bg-zinc-100 dark:hover:bg-zinc-800 rounded-full"
+							>
+								<X className="h-3 w-3 text-muted-foreground" />
+							</button>
+						)}
 					</div>
 				</div>
 				<ScrollArea className="flex-1">
 					<div className="p-2 space-y-1">
-						{isLoadingConvs ? (
+						{searchQuery.length > 0 ? (
+							<>
+								<p className="px-3 py-2 text-[10px] font-bold uppercase tracking-wider text-muted-foreground">
+									Membres
+								</p>
+								{isSearching ? (
+									<div className="p-4 text-center text-sm text-muted-foreground">
+										Recherche...
+									</div>
+								) : searchResults.length === 0 ? (
+									<div className="p-4 text-center text-sm text-muted-foreground">
+										Aucun membre trouvé.
+									</div>
+								) : (
+									searchResults.map((result) => (
+										<button
+											key={result.uuid}
+											type="button"
+											onClick={async () => {
+												setSearchQuery("");
+												// Chercher si une conv existe déjà
+												const existing = conversations.find(
+													(c) => c.recipient.uuid === result.uuid,
+												);
+												if (existing) {
+													setActiveConv(existing);
+												} else {
+													// Créer une interface de conv temporaire
+													const newConv: Conversation = {
+														id: `temp-${result.uuid}`,
+														updatedAt: new Date().toISOString(),
+														recipient: {
+															uuid: result.uuid,
+															username: result.username,
+															displayName: result.displayName,
+															avatarUrl: result.avatarUrl,
+														},
+													};
+													setConversations((prev) => [newConv, ...prev]);
+													setActiveConv(newConv);
+												}
+											}}
+											className="w-full flex items-center gap-3 p-3 rounded-xl hover:bg-zinc-100 dark:hover:bg-zinc-900 transition-colors"
+										>
+											<Avatar className="h-10 w-10">
+												<AvatarImage src={result.avatarUrl} />
+												<AvatarFallback>{result.username[0].toUpperCase()}</AvatarFallback>
+											</Avatar>
+											<div className="flex-1 text-left overflow-hidden">
+												<span className="font-bold block truncate">
+													{result.displayName || result.username}
+												</span>
+												<span className="text-xs text-muted-foreground block truncate">
+													@{result.username}
+												</span>
+											</div>
+										</button>
+									))
+								)}
+							</>
+						) : isLoadingConvs ? (
 							<div className="p-4 text-center text-sm text-muted-foreground">
 								Chargement...
 							</div>
@@ -188,19 +340,24 @@ export default function MessagesPage() {
 				{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 className="p-4 border-b flex items-center justify-between">
+							<Link
+								href={`/user/${activeConv.recipient.username}`}
+								className="flex items-center gap-3 hover:opacity-80 transition-opacity"
+							>
+								<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>
+							</Link>
 						</div>
 
 						{/* Messages */}
@@ -226,18 +383,25 @@ export default function MessagesPage() {
 												}`}
 											>
 												<p className="whitespace-pre-wrap">{msg.text}</p>
-												<p
-													className={`text-[10px] mt-1 ${
+												<div
+													className={`flex items-center gap-1 text-[10px] mt-1 ${
 														msg.senderId === user?.uuid
-															? "text-primary-foreground/70"
+															? "text-primary-foreground/70 justify-end"
 															: "text-muted-foreground"
 													}`}
 												>
-													{new Date(msg.createdAt).toLocaleTimeString([], {
-														hour: "2-digit",
-														minute: "2-digit",
-													})}
-												</p>
+													<span>
+														{new Date(msg.createdAt).toLocaleTimeString([], {
+															hour: "2-digit",
+															minute: "2-digit",
+														})}
+													</span>
+													{msg.senderId === user?.uuid && (
+														<span className="font-bold">
+															{msg.readAt ? "• Lu" : "• Envoyé"}
+														</span>
+													)}
+												</div>
 											</div>
 										</div>
 									))

frontend/src/app/(dashboard)/user/[username]/page.tsx

@@ -1,12 +1,19 @@
 "use client";
 
-import { Calendar, Share2, User as UserIcon } from "lucide-react";
+import {
+	Calendar,
+	MessageCircle,
+	Share2,
+	User as UserIcon,
+} from "lucide-react";
+import Link from "next/link";
 import * as React from "react";
 import { toast } from "sonner";
 import { ContentList } from "@/components/content-list";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import { Spinner } from "@/components/ui/spinner";
+import { useAuth } from "@/providers/auth-provider";
 import { ContentService } from "@/services/content.service";
 import { UserService } from "@/services/user.service";
 import type { User } from "@/types/user";
@@ -17,9 +24,12 @@ export default function PublicProfilePage({
 	params: Promise<{ username: string }>;
 }) {
 	const { username } = React.use(params);
+	const { user: currentUser, isAuthenticated } = useAuth();
 	const [user, setUser] = React.useState<User | null>(null);
 	const [loading, setLoading] = React.useState(true);
 
+	const isOwnProfile = currentUser?.username === username;
+
 	React.useEffect(() => {
 		UserService.getProfile(username)
 			.then(setUser)
@@ -93,7 +103,15 @@ export default function PublicProfilePage({
 								})}
 							</span>
 						</div>
-						<div className="flex justify-center md:justify-start pt-2">
+						<div className="flex flex-wrap justify-center md:justify-start gap-2 pt-2">
+							{!isOwnProfile && isAuthenticated && (
+								<Button size="sm" className="h-9 px-4" asChild>
+									<Link href={`/messages?user=${user.uuid}`}>
+										<MessageCircle className="h-4 w-4 mr-2" />
+										Message
+									</Link>
+								</Button>
+							)}
 							<Button
 								variant="outline"
 								size="sm"

frontend/src/components/app-sidebar.tsx

@@ -45,6 +45,7 @@ import {
 	SidebarGroupLabel,
 	SidebarHeader,
 	SidebarMenu,
+	SidebarMenuBadge,
 	SidebarMenuButton,
 	SidebarMenuItem,
 	SidebarMenuSub,
@@ -54,7 +55,9 @@ import {
 	SidebarTrigger,
 } from "@/components/ui/sidebar";
 import { useAuth } from "@/providers/auth-provider";
+import { useSocket } from "@/providers/socket-provider";
 import { CategoryService } from "@/services/category.service";
+import { MessageService } from "@/services/message.service";
 import type { Category } from "@/types/content";
 
 const mainNav = [
@@ -79,15 +82,46 @@ export function AppSidebar() {
 	const pathname = usePathname();
 	const searchParams = useSearchParams();
 	const { user, logout, isAuthenticated } = useAuth();
+	const { socket } = useSocket();
 	const { resolvedTheme } = useTheme();
 	const [categories, setCategories] = React.useState<Category[]>([]);
 	const [mounted, setMounted] = React.useState(false);
+	const [unreadMessages, setUnreadMessages] = React.useState(0);
 
 	React.useEffect(() => {
 		setMounted(true);
 		CategoryService.getAll().then(setCategories).catch(console.error);
 	}, []);
 
+	// Gérer le compteur de messages non-lus
+	React.useEffect(() => {
+		if (isAuthenticated) {
+			MessageService.getUnreadCount().then(setUnreadMessages).catch(console.error);
+		}
+	}, [isAuthenticated]);
+
+	React.useEffect(() => {
+		if (socket && isAuthenticated) {
+			socket.on("new_message", () => {
+				// Incrémenter si on n'est pas sur la page messages
+				if (pathname !== "/messages") {
+					setUnreadMessages((prev) => prev + 1);
+				}
+			});
+
+			return () => {
+				socket.off("new_message");
+			};
+		}
+	}, [socket, isAuthenticated, pathname]);
+
+	// Remettre à zéro si on arrive sur la page messages
+	React.useEffect(() => {
+		if (pathname === "/messages") {
+			setUnreadMessages(0);
+		}
+	}, [pathname]);
+
 	const logoSrc = React.useMemo(() => {
 		if (!mounted) return "/memegoat-color.svg";
 		return resolvedTheme === "dark"
@@ -193,6 +227,11 @@ export function AppSidebar() {
 										<span>Messages</span>
 									</Link>
 								</SidebarMenuButton>
+								{unreadMessages > 0 && (
+									<SidebarMenuBadge className="bg-red-500 text-white border-none h-5 min-w-5 flex items-center justify-center p-1 text-[10px]">
+										{unreadMessages > 9 ? "9+" : unreadMessages}
+									</SidebarMenuBadge>
+								)}
 							</SidebarMenuItem>
 						)}
 					</SidebarMenu>

frontend/src/components/comment-section.tsx

@@ -2,7 +2,7 @@
 
 import { formatDistanceToNow } from "date-fns";
 import { fr } from "date-fns/locale";
-import { MoreHorizontal, Send, Trash2 } from "lucide-react";
+import { Heart, MoreHorizontal, Send, Trash2 } from "lucide-react";
 import * as React from "react";
 import { toast } from "sonner";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
@@ -14,7 +14,9 @@ import {
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Textarea } from "@/components/ui/textarea";
+import { cn } from "@/lib/utils";
 import { useAuth } from "@/providers/auth-provider";
+import { useSocket } from "@/providers/socket-provider";
 import { type Comment, CommentService } from "@/services/comment.service";
 
 interface CommentSectionProps {
@@ -23,8 +25,10 @@ interface CommentSectionProps {
 
 export function CommentSection({ contentId }: CommentSectionProps) {
 	const { user, isAuthenticated } = useAuth();
+	const { socket } = useSocket();
 	const [comments, setComments] = React.useState<Comment[]>([]);
 	const [newComment, setNewComment] = React.useState("");
+	const [replyingTo, setReplyingTo] = React.useState<Comment | null>(null);
 	const [isSubmitting, setIsSubmitting] = React.useState(false);
 	const [isLoading, setIsLoading] = React.useState(true);
 
@@ -43,15 +47,40 @@ export function CommentSection({ contentId }: CommentSectionProps) {
 		fetchComments();
 	}, [fetchComments]);
 
+	// Gestion du WebSocket
+	React.useEffect(() => {
+		if (socket) {
+			socket.emit("join_content", contentId);
+
+			socket.on("new_comment", (comment: Comment) => {
+				setComments((prev) => {
+					// Éviter les doublons si l'auteur reçoit son propre commentaire via WS
+					if (prev.some((c) => c.id === comment.id)) return prev;
+					return [comment, ...prev];
+				});
+			});
+
+			return () => {
+				socket.emit("leave_content", contentId);
+				socket.off("new_comment");
+			};
+		}
+	}, [socket, contentId]);
+
 	const handleSubmit = async (e: React.FormEvent) => {
 		e.preventDefault();
 		if (!newComment.trim() || isSubmitting) return;
 
 		setIsSubmitting(true);
 		try {
-			const comment = await CommentService.create(contentId, newComment.trim());
+			const comment = await CommentService.create(
+				contentId,
+				newComment.trim(),
+				replyingTo?.id,
+			);
 			setComments((prev) => [comment, ...prev]);
 			setNewComment("");
+			setReplyingTo(null);
 			toast.success("Commentaire publié !");
 		} catch (_error) {
 			toast.error("Erreur lors de la publication du commentaire");
@@ -70,97 +99,214 @@ export function CommentSection({ contentId }: CommentSectionProps) {
 		}
 	};
 
-	return (
-		<div className="space-y-6 mt-8">
-			<h3 className="font-bold text-lg">Commentaires ({comments.length})</h3>
+	const handleLike = async (comment: Comment) => {
+		if (!isAuthenticated) {
+			toast.error("Vous devez être connecté pour liker");
+			return;
+		}
 
-			{isAuthenticated ? (
-				<form onSubmit={handleSubmit} className="flex gap-3">
-					<Avatar className="h-8 w-8">
-						<AvatarImage src={user?.avatarUrl} />
-						<AvatarFallback>{user?.username[0].toUpperCase()}</AvatarFallback>
+		try {
+			if (comment.isLiked) {
+				await CommentService.unlike(comment.id);
+				setComments((prev) =>
+					prev.map((c) =>
+						c.id === comment.id
+							? { ...c, isLiked: false, likesCount: c.likesCount - 1 }
+							: c,
+					),
+				);
+			} else {
+				await CommentService.like(comment.id);
+				setComments((prev) =>
+					prev.map((c) =>
+						c.id === comment.id
+							? { ...c, isLiked: true, likesCount: c.likesCount + 1 }
+							: c,
+					),
+				);
+			}
+		} catch (_error) {
+			toast.error("Une erreur est survenue");
+		}
+	};
+
+	// Organiser les commentaires : Parents d'abord
+	const rootComments = comments.filter((c) => !c.parentId);
+
+	const renderComment = (comment: Comment, depth = 0) => {
+		const replies = comments.filter((c) => c.parentId === comment.id);
+
+		return (
+			<div key={comment.id} className={cn("space-y-4", depth > 0 && "ml-10")}>
+				<div className="flex gap-3">
+					<Avatar className="h-8 w-8 shrink-0">
+						<AvatarImage src={comment.user.avatarUrl} />
+						<AvatarFallback>{comment.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 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>
+							<div className="flex items-center gap-1">
+								<Button
+									variant="ghost"
+									size="icon"
+									className={cn(
+										"h-8 w-8",
+										comment.isLiked && "text-red-500 hover:text-red-600",
+									)}
+									onClick={() => handleLike(comment)}
+								>
+									<Heart className={cn("h-4 w-4", comment.isLiked && "fill-current")} />
+								</Button>
+								{(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>
+						</div>
+						<p className="text-sm leading-relaxed whitespace-pre-wrap">
+							{comment.text}
+						</p>
+						<div className="flex items-center gap-4 pt-1">
+							{comment.likesCount > 0 && (
+								<span className="text-xs font-semibold text-muted-foreground">
+									{comment.likesCount} like{comment.likesCount > 1 ? "s" : ""}
+								</span>
+							)}
+							{isAuthenticated && depth < 1 && (
+								<Button
+									variant="ghost"
+									size="sm"
+									className="h-auto p-0 text-xs font-semibold text-muted-foreground hover:bg-transparent hover:text-foreground"
+									onClick={() => {
+										setReplyingTo(comment);
+										setNewComment(`@${comment.user.username} `);
+										document.querySelector("textarea")?.focus();
+									}}
+								>
+									Répondre
+								</Button>
+							)}
 						</div>
 					</div>
-				</form>
+				</div>
+				{replies.length > 0 && (
+					<div className="space-y-4 pt-2">
+						{replies.map((reply) => renderComment(reply, depth + 1))}
+					</div>
+				)}
+			</div>
+		);
+	};
+
+	return (
+		<div className="space-y-6 mt-8">
+			<div className="flex items-center justify-between">
+				<h3 className="font-bold text-lg">Commentaires ({comments.length})</h3>
+			</div>
+
+			{isAuthenticated ? (
+				<div className="space-y-2">
+					{replyingTo && (
+						<div className="flex items-center justify-between bg-zinc-100 dark:bg-zinc-800 px-3 py-1.5 rounded-lg text-xs">
+							<span className="text-muted-foreground">
+								En réponse à{" "}
+								<span className="font-bold">@{replyingTo.user.username}</span>
+							</span>
+							<Button
+								variant="ghost"
+								size="icon"
+								className="h-4 w-4"
+								onClick={() => {
+									setReplyingTo(null);
+									setNewComment("");
+								}}
+							>
+								<Trash2 className="h-3 w-3" />
+							</Button>
+						</div>
+					)}
+					<form onSubmit={handleSubmit} className="flex gap-3">
+						<Avatar className="h-8 w-8 shrink-0">
+							<AvatarImage src={user?.avatarUrl} />
+							<AvatarFallback>{user?.username[0].toUpperCase()}</AvatarFallback>
+						</Avatar>
+						<div className="flex-1 space-y-2">
+							<Textarea
+								placeholder={
+									replyingTo ? "Ajouter une réponse..." : "Ajouter un commentaire..."
+								}
+								value={newComment}
+								onChange={(e) => setNewComment(e.target.value)}
+								className="min-h-[80px] resize-none"
+							/>
+							<div className="flex justify-end gap-2">
+								{replyingTo && (
+									<Button
+										type="button"
+										variant="ghost"
+										size="sm"
+										onClick={() => {
+											setReplyingTo(null);
+											setNewComment("");
+										}}
+									>
+										Annuler
+									</Button>
+								)}
+								<Button
+									type="submit"
+									size="sm"
+									disabled={!newComment.trim() || isSubmitting}
+								>
+									{isSubmitting ? "Envoi..." : replyingTo ? "Répondre" : "Publier"}
+									<Send className="ml-2 h-4 w-4" />
+								</Button>
+							</div>
+						</div>
+					</form>
+				</div>
 			) : (
 				<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">
+			<div className="space-y-6">
 				{isLoading ? (
 					<div className="text-center text-muted-foreground py-4">Chargement...</div>
-				) : comments.length === 0 ? (
+				) : rootComments.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>
-					))
+					rootComments.map((comment) => renderComment(comment))
 				)}
 			</div>
 		</div>

frontend/src/components/two-factor-setup.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { Loader2, Shield, ShieldAlert, ShieldCheck } from "lucide-react";
+import Image from "next/image";
 import { useState } from "react";
 import { toast } from "sonner";
 import { Button } from "@/components/ui/button";
@@ -76,9 +77,7 @@ export function TwoFactorSetup() {
 	};
 
 	// 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;
+	const isEnabled = user?.twoFactorEnabled;
 
 	if (step === "idle") {
 		return (
@@ -154,7 +153,14 @@ export function TwoFactorSetup() {
 				<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" />
+							<Image
+								src={qrCode}
+								alt="QR Code 2FA"
+								width={192}
+								height={192}
+								className="w-48 h-48"
+								unoptimized
+							/>
 						</div>
 					)}
 					<div className="w-full space-y-2">

frontend/src/services/admin.service.ts

@@ -1,4 +1,5 @@
 import api from "@/lib/api";
+import type { User } from "@/types/user";
 import type { Report, ReportStatus } from "./report.service";
 
 export interface AdminStats {
@@ -29,7 +30,7 @@ export const adminService = {
 		await api.delete(`/users/${userId}`);
 	},
 
-	updateUser: async (userId: string, data: any): Promise<void> => {
+	updateUser: async (userId: string, data: Partial<User>): Promise<void> => {
 		await api.patch(`/users/admin/${userId}`, data);
 	},
 };

frontend/src/services/comment.service.ts

@@ -3,6 +3,9 @@ import api from "@/lib/api";
 export interface Comment {
 	id: string;
 	text: string;
+	parentId?: string;
+	likesCount: number;
+	isLiked: boolean;
 	createdAt: string;
 	updatedAt: string;
 	user: {
@@ -19,9 +22,14 @@ export const CommentService = {
 		return data;
 	},
 
-	async create(contentId: string, text: string): Promise<Comment> {
+	async create(
+		contentId: string,
+		text: string,
+		parentId?: string,
+	): Promise<Comment> {
 		const { data } = await api.post<Comment>(`/contents/${contentId}/comments`, {
 			text,
+			parentId,
 		});
 		return data;
 	},
@@ -29,4 +37,12 @@ export const CommentService = {
 	async remove(commentId: string): Promise<void> {
 		await api.delete(`/comments/${commentId}`);
 	},
+
+	async like(commentId: string): Promise<void> {
+		await api.post(`/comments/${commentId}/like`);
+	},
+
+	async unlike(commentId: string): Promise<void> {
+		await api.delete(`/comments/${commentId}/like`);
+	},
 };

frontend/src/services/message.service.ts

@@ -29,6 +29,11 @@ export const MessageService = {
 		return data;
 	},
 
+	async getUnreadCount(): Promise<number> {
+		const { data } = await api.get<number>("/messages/unread-count");
+		return data;
+	},
+
 	async getMessages(conversationId: string): Promise<Message[]> {
 		const { data } = await api.get<Message[]>(
 			`/messages/conversations/${conversationId}`,
@@ -36,6 +41,13 @@ export const MessageService = {
 		return data;
 	},
 
+	async getConversationWith(userId: string): Promise<Conversation | null> {
+		const { data } = await api.get<Conversation | null>(
+			`/messages/conversations/with/${userId}`,
+		);
+		return data;
+	},
+
 	async sendMessage(recipientId: string, text: string): Promise<Message> {
 		const { data } = await api.post<Message>("/messages", {
 			recipientId,

frontend/src/services/user.service.ts

@@ -12,6 +12,13 @@ export const UserService = {
 		return data;
 	},
 
+	async search(query: string): Promise<User[]> {
+		const { data } = await api.get<User[]>("/users/search", {
+			params: { q: query },
+		});
+		return data;
+	},
+
 	async updateMe(update: Partial<User>): Promise<User> {
 		const { data } = await api.patch<User>("/users/me", update);
 		return data;
@@ -54,8 +61,8 @@ export const UserService = {
 		return data;
 	},
 
-	async exportData(): Promise<any> {
-		const { data } = await api.get("/users/me/export");
+	async exportData(): Promise<Record<string, unknown>> {
+		const { data } = await api.get<Record<string, unknown>>("/users/me/export");
 		return data;
 	},
 };

frontend/src/types/user.ts

@@ -8,6 +8,7 @@ export interface User {
 	bio?: string;
 	role?: "user" | "admin" | "moderator";
 	status?: "active" | "verification" | "suspended" | "pending" | "deleted";
+	twoFactorEnabled?: boolean;
 	createdAt: string;
 }
 

package.json

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