Compare commits
42 Commits
v1.7.4
...
6398965f16
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6398965f16
|
||
|
|
9e9b1db012
|
||
|
|
62bf03d07a
|
||
|
|
c83ba6eb7d
|
||
|
|
05a05a1940
|
||
|
|
7c065a2fb9
|
||
|
|
001cdaff8f
|
||
|
|
0eb940c5ce
|
||
|
|
f0617c8ba5
|
||
|
|
27ea6fa413
|
||
|
|
e2146f4502
|
||
|
|
484b775923
|
||
|
|
5b05a14932
|
||
|
|
2704f7d5c5
|
||
|
|
d271cc215b
|
||
|
|
9eb5a60fb2
|
||
|
|
950646a426
|
||
|
|
a9b80e66cd
|
||
|
|
307655371d
|
||
|
|
8eb0cba050
|
||
|
|
50787c9357
|
||
|
|
0972ed951f
|
||
|
|
f852835c59
|
||
|
|
2c18fd1c1a
|
||
|
|
6d80795e44
|
||
|
|
ace438be6b
|
||
|
|
ea1afa7688
|
||
|
|
0976850c0c
|
||
|
|
ed3ed66cab
|
||
|
|
46ffdd809c
|
||
|
|
2dcd277347
|
||
|
|
9486803aeb
|
||
|
|
1e0bb03182
|
||
|
|
f1d1359dcb
|
||
|
|
7b76942795
|
||
|
|
1be8571f26
|
||
|
|
29b1db4aed
|
||
|
|
9db3067721
|
||
|
|
27f8c7148a
|
||
|
|
209711195b
|
||
|
|
fafdaee668
|
||
|
|
01117aad6d
|
54
backend/.migrations/0008_bitter_darwin.sql
Normal file
54
backend/.migrations/0008_bitter_darwin.sql
Normal file
@@ -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");
|
||||||
2080
backend/.migrations/meta/0008_snapshot.json
Normal file
2080
backend/.migrations/meta/0008_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -57,6 +57,13 @@
|
|||||||
"when": 1769605995410,
|
"when": 1769605995410,
|
||||||
"tag": "0007_melodic_synch",
|
"tag": "0007_melodic_synch",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 8,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1769696731978,
|
||||||
|
"tag": "0008_bitter_darwin",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/backend",
|
"name": "@memegoat/backend",
|
||||||
"version": "1.7.4",
|
"version": "1.9.0",
|
||||||
"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": [
|
||||||
|
|||||||
@@ -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(),
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
80
backend/src/comments/comments.controller.ts
Normal file
80
backend/src/comments/comments.controller.ts
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
Param,
|
||||||
|
Post,
|
||||||
|
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,
|
||||||
|
private readonly jwtService: JwtService,
|
||||||
|
private readonly configService: ConfigService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Get("contents/:contentId/comments")
|
||||||
|
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")
|
||||||
|
@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);
|
||||||
|
}
|
||||||
|
|
||||||
|
@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);
|
||||||
|
}
|
||||||
|
}
|
||||||
22
backend/src/comments/comments.module.ts
Normal file
22
backend/src/comments/comments.module.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { forwardRef, Module } from "@nestjs/common";
|
||||||
|
import { AuthModule } from "../auth/auth.module";
|
||||||
|
import { ContentsModule } from "../contents/contents.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,
|
||||||
|
S3Module,
|
||||||
|
RealtimeModule,
|
||||||
|
forwardRef(() => ContentsModule),
|
||||||
|
],
|
||||||
|
controllers: [CommentsController],
|
||||||
|
providers: [CommentsService, CommentsRepository, CommentLikesRepository],
|
||||||
|
exports: [CommentsService],
|
||||||
|
})
|
||||||
|
export class CommentsModule {}
|
||||||
151
backend/src/comments/comments.service.spec.ts
Normal file
151
backend/src/comments/comments.service.spec.ts
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
import { ForbiddenException, NotFoundException } from "@nestjs/common";
|
||||||
|
import { Test, TestingModule } from "@nestjs/testing";
|
||||||
|
import { ContentsRepository } from "../contents/repositories/contents.repository";
|
||||||
|
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", () => {
|
||||||
|
let service: CommentsService;
|
||||||
|
let repository: CommentsRepository;
|
||||||
|
|
||||||
|
const mockCommentsRepository = {
|
||||||
|
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 mockContentsRepository = {
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockS3Service = {
|
||||||
|
getPublicUrl: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockEventsGateway = {
|
||||||
|
sendToContent: jest.fn(),
|
||||||
|
sendToUser: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
CommentsService,
|
||||||
|
{ provide: CommentsRepository, useValue: mockCommentsRepository },
|
||||||
|
{ provide: CommentLikesRepository, useValue: mockCommentLikesRepository },
|
||||||
|
{ provide: ContentsRepository, useValue: mockContentsRepository },
|
||||||
|
{ provide: S3Service, useValue: mockS3Service },
|
||||||
|
{ provide: EventsGateway, useValue: mockEventsGateway },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
service = module.get<CommentsService>(CommentsService);
|
||||||
|
repository = module.get<CommentsRepository>(CommentsRepository);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should be defined", () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("create", () => {
|
||||||
|
it("should create a comment", async () => {
|
||||||
|
const userId = "user1";
|
||||||
|
const contentId = "content1";
|
||||||
|
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");
|
||||||
|
expect(repository.create).toHaveBeenCalledWith({
|
||||||
|
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", 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(result[0].likesCount).toBe(5);
|
||||||
|
expect(result[0].isLiked).toBe(true);
|
||||||
|
expect(result[0].user.avatarUrl).toBe("url");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("remove", () => {
|
||||||
|
it("should remove comment if owner", async () => {
|
||||||
|
mockCommentsRepository.findOne.mockResolvedValue({ userId: "u1" });
|
||||||
|
await service.remove("u1", "c1");
|
||||||
|
expect(repository.delete).toHaveBeenCalledWith("c1");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should remove comment if admin", async () => {
|
||||||
|
mockCommentsRepository.findOne.mockResolvedValue({ userId: "u1" });
|
||||||
|
await service.remove("other", "c1", true);
|
||||||
|
expect(repository.delete).toHaveBeenCalledWith("c1");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should throw NotFoundException if comment does not exist", async () => {
|
||||||
|
mockCommentsRepository.findOne.mockResolvedValue(null);
|
||||||
|
await expect(service.remove("u1", "c1")).rejects.toThrow(NotFoundException);
|
||||||
|
});
|
||||||
|
|
||||||
|
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,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
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",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
176
backend/src/comments/comments.service.ts
Normal file
176
backend/src/comments/comments.service.ts
Normal file
@@ -0,0 +1,176 @@
|
|||||||
|
import {
|
||||||
|
ForbiddenException,
|
||||||
|
forwardRef,
|
||||||
|
Inject,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from "@nestjs/common";
|
||||||
|
import { ContentsRepository } from "../contents/repositories/contents.repository";
|
||||||
|
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,
|
||||||
|
private readonly commentLikesRepository: CommentLikesRepository,
|
||||||
|
@Inject(forwardRef(() => ContentsRepository))
|
||||||
|
private readonly contentsRepository: ContentsRepository,
|
||||||
|
private readonly s3Service: S3Service,
|
||||||
|
private readonly eventsGateway: EventsGateway,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async create(userId: string, contentId: string, dto: CreateCommentDto) {
|
||||||
|
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 (room de contenu)
|
||||||
|
this.eventsGateway.sendToContent(contentId, "new_comment", enrichedComment);
|
||||||
|
|
||||||
|
// Notifications ciblées
|
||||||
|
try {
|
||||||
|
// 1. Notifier l'auteur du post
|
||||||
|
const content = await this.contentsRepository.findOne(contentId);
|
||||||
|
if (content && content.userId !== userId) {
|
||||||
|
this.eventsGateway.sendToUser(content.userId, "notification", {
|
||||||
|
type: "comment",
|
||||||
|
userId: userId,
|
||||||
|
username: enrichedComment.user.username,
|
||||||
|
contentId: contentId,
|
||||||
|
commentId: comment.id,
|
||||||
|
text: `a commenté votre post : "${dto.text.substring(0, 30)}${dto.text.length > 30 ? "..." : ""}"`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Si c'est une réponse, notifier l'auteur du commentaire parent
|
||||||
|
if (dto.parentId) {
|
||||||
|
const parentComment = await this.commentsRepository.findOne(dto.parentId);
|
||||||
|
if (
|
||||||
|
parentComment &&
|
||||||
|
parentComment.userId !== userId &&
|
||||||
|
(!content || parentComment.userId !== content.userId)
|
||||||
|
) {
|
||||||
|
this.eventsGateway.sendToUser(parentComment.userId, "notification", {
|
||||||
|
type: "reply",
|
||||||
|
userId: userId,
|
||||||
|
username: enrichedComment.user.username,
|
||||||
|
contentId: contentId,
|
||||||
|
commentId: comment.id,
|
||||||
|
text: `a répondu à votre commentaire : "${dto.text.substring(0, 30)}${dto.text.length > 30 ? "..." : ""}"`,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to send notification:", error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return enrichedComment;
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
// Notifier l'auteur du commentaire
|
||||||
|
if (comment.userId !== userId) {
|
||||||
|
try {
|
||||||
|
const liker = await this.findOneEnriched(commentId, userId);
|
||||||
|
this.eventsGateway.sendToUser(comment.userId, "notification", {
|
||||||
|
type: "like_comment",
|
||||||
|
userId: userId,
|
||||||
|
username: liker?.user.username,
|
||||||
|
contentId: comment.contentId,
|
||||||
|
commentId: commentId,
|
||||||
|
text: "a aimé votre commentaire",
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to send like notification:", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
18
backend/src/comments/dto/create-comment.dto.ts
Normal file
18
backend/src/comments/dto/create-comment.dto.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import {
|
||||||
|
IsNotEmpty,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
MaxLength,
|
||||||
|
} from "class-validator";
|
||||||
|
|
||||||
|
export class CreateCommentDto {
|
||||||
|
@IsString()
|
||||||
|
@IsNotEmpty()
|
||||||
|
@MaxLength(1000)
|
||||||
|
text!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
parentId?: string;
|
||||||
|
}
|
||||||
@@ -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];
|
||||||
|
}
|
||||||
|
}
|
||||||
75
backend/src/comments/repositories/comments.repository.ts
Normal file
75
backend/src/comments/repositories/comments.repository.ts
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
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 results = await this.databaseService.db
|
||||||
|
.insert(comments)
|
||||||
|
.values(data)
|
||||||
|
.returning();
|
||||||
|
return results[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
async findAllByContentId(contentId: string) {
|
||||||
|
return 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.contentId, contentId), isNull(comments.deletedAt)))
|
||||||
|
.orderBy(desc(comments.createdAt));
|
||||||
|
}
|
||||||
|
|
||||||
|
async findOne(id: string) {
|
||||||
|
const results = await this.databaseService.db
|
||||||
|
.select()
|
||||||
|
.from(comments)
|
||||||
|
.where(and(eq(comments.id, id), isNull(comments.deletedAt)));
|
||||||
|
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) {
|
||||||
|
await this.databaseService.db
|
||||||
|
.update(comments)
|
||||||
|
.set({ deletedAt: new Date() })
|
||||||
|
.where(eq(comments.id, id));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,5 +4,6 @@ export interface AuthenticatedRequest extends Request {
|
|||||||
user: {
|
user: {
|
||||||
sub: string;
|
sub: string;
|
||||||
username: string;
|
username: string;
|
||||||
|
role: string;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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],
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { BadRequestException } from "@nestjs/common";
|
|||||||
import { ConfigService } from "@nestjs/config";
|
import { ConfigService } from "@nestjs/config";
|
||||||
import { Test, TestingModule } from "@nestjs/testing";
|
import { Test, TestingModule } from "@nestjs/testing";
|
||||||
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 { ContentsService } from "./contents.service";
|
import { ContentsService } from "./contents.service";
|
||||||
import { ContentsRepository } from "./repositories/contents.repository";
|
import { ContentsRepository } from "./repositories/contents.repository";
|
||||||
@@ -49,6 +50,10 @@ describe("ContentsService", () => {
|
|||||||
del: jest.fn(),
|
del: jest.fn(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const mockEventsGateway = {
|
||||||
|
sendToUser: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
jest.clearAllMocks();
|
jest.clearAllMocks();
|
||||||
|
|
||||||
@@ -60,6 +65,7 @@ describe("ContentsService", () => {
|
|||||||
{ provide: MediaService, useValue: mockMediaService },
|
{ provide: MediaService, useValue: mockMediaService },
|
||||||
{ provide: ConfigService, useValue: mockConfigService },
|
{ provide: ConfigService, useValue: mockConfigService },
|
||||||
{ provide: CACHE_MANAGER, useValue: mockCacheManager },
|
{ provide: CACHE_MANAGER, useValue: mockCacheManager },
|
||||||
|
{ provide: EventsGateway, useValue: mockEventsGateway },
|
||||||
],
|
],
|
||||||
}).compile();
|
}).compile();
|
||||||
|
|
||||||
|
|||||||
@@ -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: {
|
||||||
|
|||||||
21
backend/src/database/schemas/comment_likes.ts
Normal file
21
backend/src/database/schemas/comment_likes.ts
Normal file
@@ -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] }),
|
||||||
|
}),
|
||||||
|
);
|
||||||
35
backend/src/database/schemas/comments.ts
Normal file
35
backend/src/database/schemas/comments.ts
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
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" }),
|
||||||
|
parentId: uuid("parent_id").references(() => comments.id, {
|
||||||
|
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),
|
||||||
|
parentIdIdx: index("comments_parent_id_idx").on(table.parentId),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
export type CommentInDb = typeof comments.$inferSelect;
|
||||||
|
export type NewCommentInDb = typeof comments.$inferInsert;
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
export * from "./api_keys";
|
export * from "./api_keys";
|
||||||
export * from "./audit_logs";
|
export * from "./audit_logs";
|
||||||
export * from "./categories";
|
export * from "./categories";
|
||||||
|
export * from "./comment_likes";
|
||||||
|
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";
|
||||||
|
|||||||
66
backend/src/database/schemas/messages.ts
Normal file
66
backend/src/database/schemas/messages.ts
Normal 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;
|
||||||
11
backend/src/messages/dto/create-message.dto.ts
Normal file
11
backend/src/messages/dto/create-message.dto.ts
Normal 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;
|
||||||
|
}
|
||||||
53
backend/src/messages/messages.controller.ts
Normal file
53
backend/src/messages/messages.controller.ts
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
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("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,
|
||||||
|
@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);
|
||||||
|
}
|
||||||
|
}
|
||||||
14
backend/src/messages/messages.module.ts
Normal file
14
backend/src/messages/messages.module.ts
Normal 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 {}
|
||||||
98
backend/src/messages/messages.service.spec.ts
Normal file
98
backend/src/messages/messages.service.spec.ts
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
import { ForbiddenException } from "@nestjs/common";
|
||||||
|
import { Test, TestingModule } from "@nestjs/testing";
|
||||||
|
import { EventsGateway } from "../realtime/events.gateway";
|
||||||
|
import { MessagesService } from "./messages.service";
|
||||||
|
import { MessagesRepository } from "./repositories/messages.repository";
|
||||||
|
|
||||||
|
describe("MessagesService", () => {
|
||||||
|
let service: MessagesService;
|
||||||
|
let _repository: MessagesRepository;
|
||||||
|
let _eventsGateway: EventsGateway;
|
||||||
|
|
||||||
|
const mockMessagesRepository = {
|
||||||
|
findConversationBetweenUsers: jest.fn(),
|
||||||
|
createConversation: jest.fn(),
|
||||||
|
addParticipant: jest.fn(),
|
||||||
|
createMessage: jest.fn(),
|
||||||
|
findAllConversations: jest.fn(),
|
||||||
|
isParticipant: jest.fn(),
|
||||||
|
findMessagesByConversationId: jest.fn(),
|
||||||
|
markAsRead: jest.fn(),
|
||||||
|
countUnreadMessages: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockEventsGateway = {
|
||||||
|
sendToUser: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
MessagesService,
|
||||||
|
{ provide: MessagesRepository, useValue: mockMessagesRepository },
|
||||||
|
{ provide: EventsGateway, useValue: mockEventsGateway },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
service = module.get<MessagesService>(MessagesService);
|
||||||
|
_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",
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await service.sendMessage(senderId, dto);
|
||||||
|
|
||||||
|
expect(result.id).toBe("m1");
|
||||||
|
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.createMessage.mockResolvedValue({ id: "m1" });
|
||||||
|
|
||||||
|
await service.sendMessage(senderId, dto);
|
||||||
|
|
||||||
|
expect(mockMessagesRepository.createConversation).toHaveBeenCalled();
|
||||||
|
expect(mockMessagesRepository.addParticipant).toHaveBeenCalledTimes(2);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("getMessages", () => {
|
||||||
|
it("should return messages if user is participant", async () => {
|
||||||
|
mockMessagesRepository.isParticipant.mockResolvedValue(true);
|
||||||
|
mockMessagesRepository.findMessagesByConversationId.mockResolvedValue([
|
||||||
|
{ id: "m1" },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const result = await service.getMessages("u1", "conv1");
|
||||||
|
expect(result).toHaveLength(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should throw ForbiddenException if user is not participant", async () => {
|
||||||
|
mockMessagesRepository.isParticipant.mockResolvedValue(false);
|
||||||
|
await expect(service.getMessages("u1", "conv1")).rejects.toThrow(
|
||||||
|
ForbiddenException,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
81
backend/src/messages/messages.service.ts
Normal file
81
backend/src/messages/messages.service.ts
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
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 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,
|
||||||
|
userId,
|
||||||
|
);
|
||||||
|
if (!isParticipant) {
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
167
backend/src/messages/repositories/messages.repository.ts
Normal file
167
backend/src/messages/repositories/messages.repository.ts
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
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));
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
54
backend/src/realtime/events.gateway.spec.ts
Normal file
54
backend/src/realtime/events.gateway.spec.ts
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
import { ConfigService } from "@nestjs/config";
|
||||||
|
import { Test, TestingModule } from "@nestjs/testing";
|
||||||
|
import { JwtService } from "../crypto/services/jwt.service";
|
||||||
|
import { EventsGateway } from "./events.gateway";
|
||||||
|
|
||||||
|
describe("EventsGateway", () => {
|
||||||
|
let gateway: EventsGateway;
|
||||||
|
let _jwtService: JwtService;
|
||||||
|
|
||||||
|
const mockJwtService = {
|
||||||
|
verifyJwt: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const mockConfigService = {
|
||||||
|
get: jest.fn().mockReturnValue("secret-password-32-chars-long-!!!"),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
EventsGateway,
|
||||||
|
{ provide: JwtService, useValue: mockJwtService },
|
||||||
|
{ provide: ConfigService, useValue: mockConfigService },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
|
||||||
|
gateway = module.get<EventsGateway>(EventsGateway);
|
||||||
|
_jwtService = module.get<JwtService>(JwtService);
|
||||||
|
gateway.server = {
|
||||||
|
to: jest.fn().mockReturnThis(),
|
||||||
|
emit: jest.fn(),
|
||||||
|
} as any;
|
||||||
|
});
|
||||||
|
|
||||||
|
it("should be defined", () => {
|
||||||
|
expect(gateway).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("sendToUser", () => {
|
||||||
|
it("should emit event to user room", () => {
|
||||||
|
const userId = "user123";
|
||||||
|
const event = "test_event";
|
||||||
|
const data = { foo: "bar" };
|
||||||
|
|
||||||
|
gateway.sendToUser(userId, event, data);
|
||||||
|
|
||||||
|
expect(gateway.server.to).toHaveBeenCalledWith(`user:${userId}`);
|
||||||
|
expect(gateway.server.to(`user:${userId}`).emit).toHaveBeenCalledWith(
|
||||||
|
event,
|
||||||
|
data,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
159
backend/src/realtime/events.gateway.ts
Normal file
159
backend/src/realtime/events.gateway.ts
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
import { Logger } from "@nestjs/common";
|
||||||
|
import { ConfigService } from "@nestjs/config";
|
||||||
|
import {
|
||||||
|
ConnectedSocket,
|
||||||
|
MessageBody,
|
||||||
|
OnGatewayConnection,
|
||||||
|
OnGatewayDisconnect,
|
||||||
|
OnGatewayInit,
|
||||||
|
SubscribeMessage,
|
||||||
|
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: (
|
||||||
|
_origin: string,
|
||||||
|
callback: (err: Error | null, allow?: boolean) => void,
|
||||||
|
) => {
|
||||||
|
// En production, on pourrait restreindre ici
|
||||||
|
// Pour l'instant on autorise tout en mode credentials pour faciliter le déploiement multi-domaines
|
||||||
|
callback(null, true);
|
||||||
|
},
|
||||||
|
credentials: true,
|
||||||
|
methods: ["GET", "POST"],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
export class EventsGateway
|
||||||
|
implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect
|
||||||
|
{
|
||||||
|
@WebSocketServer()
|
||||||
|
server!: Server;
|
||||||
|
|
||||||
|
private readonly logger = new Logger(EventsGateway.name);
|
||||||
|
private readonly onlineUsers = new Map<string, Set<string>>(); // userId -> Set of socketIds
|
||||||
|
|
||||||
|
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`);
|
||||||
|
// 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = await this.jwtService.verifyJwt(session.accessToken);
|
||||||
|
client.data.user = payload;
|
||||||
|
|
||||||
|
// Rejoindre une room personnelle pour les notifications
|
||||||
|
client.join(`user:${payload.sub}`);
|
||||||
|
|
||||||
|
// Gérer le statut en ligne
|
||||||
|
if (!this.onlineUsers.has(payload.sub)) {
|
||||||
|
this.onlineUsers.set(payload.sub, new Set());
|
||||||
|
this.server.emit("user_status", { userId: payload.sub, status: "online" });
|
||||||
|
}
|
||||||
|
this.onlineUsers.get(payload.sub)?.add(client.id);
|
||||||
|
|
||||||
|
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) {
|
||||||
|
const userId = client.data.user?.sub;
|
||||||
|
if (userId && this.onlineUsers.has(userId)) {
|
||||||
|
const sockets = this.onlineUsers.get(userId);
|
||||||
|
sockets?.delete(client.id);
|
||||||
|
if (sockets?.size === 0) {
|
||||||
|
this.onlineUsers.delete(userId);
|
||||||
|
this.server.emit("user_status", { userId, status: "offline" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeMessage("typing")
|
||||||
|
handleTyping(
|
||||||
|
@ConnectedSocket() client: Socket,
|
||||||
|
@MessageBody() data: { recipientId: string; isTyping: boolean },
|
||||||
|
) {
|
||||||
|
const userId = client.data.user?.sub;
|
||||||
|
if (!userId) return;
|
||||||
|
|
||||||
|
this.server.to(`user:${data.recipientId}`).emit("user_typing", {
|
||||||
|
userId,
|
||||||
|
isTyping: data.isTyping,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@SubscribeMessage("check_status")
|
||||||
|
handleCheckStatus(
|
||||||
|
@ConnectedSocket() _client: Socket,
|
||||||
|
@MessageBody() userId: string,
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
userId,
|
||||||
|
status: this.onlineUsers.has(userId) ? "online" : "offline",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
10
backend/src/realtime/realtime.module.ts
Normal file
10
backend/src/realtime/realtime.module.ts
Normal 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 {}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Injectable } from "@nestjs/common";
|
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 { DatabaseService } from "../../database/database.service";
|
||||||
import { contents, favorites, users } from "../../database/schemas";
|
import { contents, favorites, users } from "../../database/schemas";
|
||||||
|
|
||||||
@@ -97,6 +97,24 @@ export class UsersRepository {
|
|||||||
return result[0] || null;
|
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) {
|
async findOne(uuid: string) {
|
||||||
const result = await this.databaseService.db
|
const result = await this.databaseService.db
|
||||||
.select()
|
.select()
|
||||||
|
|||||||
@@ -54,6 +54,12 @@ export class UsersController {
|
|||||||
return this.usersService.findPublicProfile(username);
|
return this.usersService.findPublicProfile(username);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get("search")
|
||||||
|
@UseGuards(AuthGuard)
|
||||||
|
search(@Query("q") query: string) {
|
||||||
|
return this.usersService.search(query);
|
||||||
|
}
|
||||||
|
|
||||||
// Gestion de son propre compte
|
// Gestion de son propre compte
|
||||||
@Get("me")
|
@Get("me")
|
||||||
@UseGuards(AuthGuard)
|
@UseGuards(AuthGuard)
|
||||||
|
|||||||
@@ -108,6 +108,7 @@ describe("UsersService", () => {
|
|||||||
describe("findOne", () => {
|
describe("findOne", () => {
|
||||||
it("should find a user", async () => {
|
it("should find a user", async () => {
|
||||||
mockUsersRepository.findOne.mockResolvedValue({ uuid: "uuid1" });
|
mockUsersRepository.findOne.mockResolvedValue({ uuid: "uuid1" });
|
||||||
|
mockRbacService.getUserRoles.mockResolvedValue([]);
|
||||||
const result = await service.findOne("uuid1");
|
const result = await service.findOne("uuid1");
|
||||||
expect(result.uuid).toBe("uuid1");
|
expect(result.uuid).toBe("uuid1");
|
||||||
});
|
});
|
||||||
@@ -139,6 +140,7 @@ describe("UsersService", () => {
|
|||||||
describe("findByEmailHash", () => {
|
describe("findByEmailHash", () => {
|
||||||
it("should call repository.findByEmailHash", async () => {
|
it("should call repository.findByEmailHash", async () => {
|
||||||
mockUsersRepository.findByEmailHash.mockResolvedValue({ uuid: "u1" });
|
mockUsersRepository.findByEmailHash.mockResolvedValue({ uuid: "u1" });
|
||||||
|
mockRbacService.getUserRoles.mockResolvedValue([]);
|
||||||
const result = await service.findByEmailHash("hash");
|
const result = await service.findByEmailHash("hash");
|
||||||
expect(result.uuid).toBe("u1");
|
expect(result.uuid).toBe("u1");
|
||||||
expect(mockUsersRepository.findByEmailHash).toHaveBeenCalledWith("hash");
|
expect(mockUsersRepository.findByEmailHash).toHaveBeenCalledWith("hash");
|
||||||
|
|||||||
@@ -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) {
|
||||||
@@ -94,8 +106,30 @@ 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) {
|
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) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/frontend",
|
"name": "@memegoat/frontend",
|
||||||
"version": "1.7.4",
|
"version": "1.9.0",
|
||||||
"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",
|
||||||
|
|||||||
@@ -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>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -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">
|
||||||
|
|||||||
513
frontend/src/app/(dashboard)/messages/page.tsx
Normal file
513
frontend/src/app/(dashboard)/messages/page.tsx
Normal file
@@ -0,0 +1,513 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { formatDistanceToNow } from "date-fns";
|
||||||
|
import { fr } from "date-fns/locale";
|
||||||
|
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";
|
||||||
|
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";
|
||||||
|
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 typingTimeoutRef = React.useRef<NodeJS.Timeout | null>(null);
|
||||||
|
|
||||||
|
const handleTyping = () => {
|
||||||
|
if (!socket || !activeConv) return;
|
||||||
|
|
||||||
|
socket.emit("typing", {
|
||||||
|
recipientId: activeConv.recipient.uuid,
|
||||||
|
isTyping: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (typingTimeoutRef.current) clearTimeout(typingTimeoutRef.current);
|
||||||
|
|
||||||
|
typingTimeoutRef.current = setTimeout(() => {
|
||||||
|
socket.emit("typing", {
|
||||||
|
recipientId: activeConv.recipient.uuid,
|
||||||
|
isTyping: false,
|
||||||
|
});
|
||||||
|
}, 3000);
|
||||||
|
};
|
||||||
|
const [isLoadingConvs, setIsLoadingConvs] = React.useState(true);
|
||||||
|
const [isLoadingMsgs, setIsLoadingMsgs] = React.useState(false);
|
||||||
|
const [isOtherTyping, setIsOtherTyping] = React.useState(false);
|
||||||
|
const [onlineUsers, setOnlineUsers] = React.useState<Set<string>>(new Set());
|
||||||
|
|
||||||
|
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 {
|
||||||
|
setIsLoadingConvs(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
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) {
|
||||||
|
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]);
|
||||||
|
setIsOtherTyping(false); // S'il a envoyé un message, il ne tape plus
|
||||||
|
}
|
||||||
|
// 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;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
socket.on("user_status", (data: { userId: string; status: string }) => {
|
||||||
|
setOnlineUsers((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (data.status === "online") {
|
||||||
|
next.add(data.userId);
|
||||||
|
} else {
|
||||||
|
next.delete(data.userId);
|
||||||
|
}
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
socket.on("user_typing", (data: { userId: string; isTyping: boolean }) => {
|
||||||
|
if (activeConv?.recipient.uuid === data.userId) {
|
||||||
|
setIsOtherTyping(data.isTyping);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
socket.off("new_message");
|
||||||
|
socket.off("user_status");
|
||||||
|
socket.off("user_typing");
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}, [socket, activeConv]);
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (scrollRef.current) {
|
||||||
|
const scrollContainer = scrollRef.current.querySelector(
|
||||||
|
"[data-slot='scroll-area-viewport']",
|
||||||
|
);
|
||||||
|
if (scrollContainer) {
|
||||||
|
scrollContainer.scrollTop = scrollContainer.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,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 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");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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">
|
||||||
|
<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 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">
|
||||||
|
{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>
|
||||||
|
) : 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 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 font-medium ${
|
||||||
|
onlineUsers.has(activeConv.recipient.uuid)
|
||||||
|
? "text-green-500"
|
||||||
|
: "text-muted-foreground"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{onlineUsers.has(activeConv.recipient.uuid)
|
||||||
|
? "En ligne"
|
||||||
|
: "Hors ligne"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
</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>
|
||||||
|
<div
|
||||||
|
className={`flex items-center gap-1 text-[10px] mt-1 ${
|
||||||
|
msg.senderId === user?.uuid
|
||||||
|
? "text-primary-foreground/70 justify-end"
|
||||||
|
: "text-muted-foreground"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
<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>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
{isOtherTyping && (
|
||||||
|
<div className="flex justify-start">
|
||||||
|
<div className="bg-zinc-100 dark:bg-zinc-800 p-3 rounded-2xl rounded-bl-none">
|
||||||
|
<div className="flex gap-1">
|
||||||
|
<span className="w-1.5 h-1.5 bg-zinc-400 rounded-full animate-bounce [animation-delay:-0.3s]" />
|
||||||
|
<span className="w-1.5 h-1.5 bg-zinc-400 rounded-full animate-bounce [animation-delay:-0.15s]" />
|
||||||
|
<span className="w-1.5 h-1.5 bg-zinc-400 rounded-full animate-bounce" />
|
||||||
|
</div>
|
||||||
|
</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);
|
||||||
|
handleTyping();
|
||||||
|
}}
|
||||||
|
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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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"
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -1,12 +1,19 @@
|
|||||||
"use client";
|
"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 * as React from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { ContentList } from "@/components/content-list";
|
import { ContentList } from "@/components/content-list";
|
||||||
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
|
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Spinner } from "@/components/ui/spinner";
|
import { Spinner } from "@/components/ui/spinner";
|
||||||
|
import { useAuth } from "@/providers/auth-provider";
|
||||||
import { ContentService } from "@/services/content.service";
|
import { ContentService } from "@/services/content.service";
|
||||||
import { UserService } from "@/services/user.service";
|
import { UserService } from "@/services/user.service";
|
||||||
import type { User } from "@/types/user";
|
import type { User } from "@/types/user";
|
||||||
@@ -17,9 +24,12 @@ export default function PublicProfilePage({
|
|||||||
params: Promise<{ username: string }>;
|
params: Promise<{ username: string }>;
|
||||||
}) {
|
}) {
|
||||||
const { username } = React.use(params);
|
const { username } = React.use(params);
|
||||||
|
const { user: currentUser, isAuthenticated } = useAuth();
|
||||||
const [user, setUser] = React.useState<User | null>(null);
|
const [user, setUser] = React.useState<User | null>(null);
|
||||||
const [loading, setLoading] = React.useState(true);
|
const [loading, setLoading] = React.useState(true);
|
||||||
|
|
||||||
|
const isOwnProfile = currentUser?.username === username;
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
UserService.getProfile(username)
|
UserService.getProfile(username)
|
||||||
.then(setUser)
|
.then(setUser)
|
||||||
@@ -93,7 +103,15 @@ export default function PublicProfilePage({
|
|||||||
})}
|
})}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</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
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { Ubuntu_Mono, Ubuntu_Sans } from "next/font/google";
|
import { Ubuntu_Mono, Ubuntu_Sans } from "next/font/google";
|
||||||
|
import { NotificationHandler } from "@/components/notification-handler";
|
||||||
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 +74,13 @@ export default function RootLayout({
|
|||||||
disableTransitionOnChange
|
disableTransitionOnChange
|
||||||
>
|
>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<AudioProvider>
|
<SocketProvider>
|
||||||
{children}
|
<AudioProvider>
|
||||||
<Toaster />
|
{children}
|
||||||
</AudioProvider>
|
<NotificationHandler />
|
||||||
|
<Toaster />
|
||||||
|
</AudioProvider>
|
||||||
|
</SocketProvider>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import {
|
|||||||
LayoutGrid,
|
LayoutGrid,
|
||||||
LogIn,
|
LogIn,
|
||||||
LogOut,
|
LogOut,
|
||||||
|
MessageCircle,
|
||||||
PlusCircle,
|
PlusCircle,
|
||||||
Settings,
|
Settings,
|
||||||
ShieldCheck,
|
ShieldCheck,
|
||||||
@@ -44,6 +45,7 @@ import {
|
|||||||
SidebarGroupLabel,
|
SidebarGroupLabel,
|
||||||
SidebarHeader,
|
SidebarHeader,
|
||||||
SidebarMenu,
|
SidebarMenu,
|
||||||
|
SidebarMenuBadge,
|
||||||
SidebarMenuButton,
|
SidebarMenuButton,
|
||||||
SidebarMenuItem,
|
SidebarMenuItem,
|
||||||
SidebarMenuSub,
|
SidebarMenuSub,
|
||||||
@@ -53,7 +55,9 @@ import {
|
|||||||
SidebarTrigger,
|
SidebarTrigger,
|
||||||
} from "@/components/ui/sidebar";
|
} from "@/components/ui/sidebar";
|
||||||
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 { MessageService } from "@/services/message.service";
|
||||||
import type { Category } from "@/types/content";
|
import type { Category } from "@/types/content";
|
||||||
|
|
||||||
const mainNav = [
|
const mainNav = [
|
||||||
@@ -78,15 +82,46 @@ export function AppSidebar() {
|
|||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
const { user, logout, isAuthenticated } = useAuth();
|
const { user, logout, isAuthenticated } = useAuth();
|
||||||
|
const { socket } = useSocket();
|
||||||
const { resolvedTheme } = useTheme();
|
const { resolvedTheme } = useTheme();
|
||||||
const [categories, setCategories] = React.useState<Category[]>([]);
|
const [categories, setCategories] = React.useState<Category[]>([]);
|
||||||
const [mounted, setMounted] = React.useState(false);
|
const [mounted, setMounted] = React.useState(false);
|
||||||
|
const [unreadMessages, setUnreadMessages] = React.useState(0);
|
||||||
|
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
setMounted(true);
|
setMounted(true);
|
||||||
CategoryService.getAll().then(setCategories).catch(console.error);
|
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(() => {
|
const logoSrc = React.useMemo(() => {
|
||||||
if (!mounted) return "/memegoat-color.svg";
|
if (!mounted) return "/memegoat-color.svg";
|
||||||
return resolvedTheme === "dark"
|
return resolvedTheme === "dark"
|
||||||
@@ -180,6 +215,25 @@ 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>
|
||||||
|
{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>
|
</SidebarMenu>
|
||||||
</SidebarGroup>
|
</SidebarGroup>
|
||||||
|
|
||||||
|
|||||||
314
frontend/src/components/comment-section.tsx
Normal file
314
frontend/src/components/comment-section.tsx
Normal file
@@ -0,0 +1,314 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { formatDistanceToNow } from "date-fns";
|
||||||
|
import { fr } from "date-fns/locale";
|
||||||
|
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";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import {
|
||||||
|
DropdownMenu,
|
||||||
|
DropdownMenuContent,
|
||||||
|
DropdownMenuItem,
|
||||||
|
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 {
|
||||||
|
contentId: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
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]);
|
||||||
|
|
||||||
|
// 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(),
|
||||||
|
replyingTo?.id,
|
||||||
|
);
|
||||||
|
setComments((prev) => [comment, ...prev]);
|
||||||
|
setNewComment("");
|
||||||
|
setReplyingTo(null);
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleLike = async (comment: Comment) => {
|
||||||
|
if (!isAuthenticated) {
|
||||||
|
toast.error("Vous devez être connecté pour liker");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
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-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>
|
||||||
|
</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-6">
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="text-center text-muted-foreground py-4">Chargement...</div>
|
||||||
|
) : rootComments.length === 0 ? (
|
||||||
|
<div className="text-center text-muted-foreground py-4">
|
||||||
|
Aucun commentaire pour le moment. Soyez le premier !
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
rootComments.map((comment) => renderComment(comment))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -35,7 +35,9 @@ import { useAuth } from "@/providers/auth-provider";
|
|||||||
import { ContentService } from "@/services/content.service";
|
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 { ShareDialog } from "./share-dialog";
|
||||||
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;
|
||||||
@@ -50,6 +52,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 [shareDialogOpen, setShareDialogOpen] = React.useState(false);
|
||||||
const [_reportDialogOpen, setReportDialogOpen] = React.useState(false);
|
const [_reportDialogOpen, setReportDialogOpen] = React.useState(false);
|
||||||
|
|
||||||
const isAuthor = user?.uuid === content.authorId;
|
const isAuthor = user?.uuid === content.authorId;
|
||||||
@@ -98,6 +101,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");
|
||||||
@@ -146,6 +151,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">
|
||||||
@@ -186,7 +192,15 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
|
|||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
<DropdownMenuItem onClick={() => toast.success("Lien copié !")}>
|
<DropdownMenuItem
|
||||||
|
onClick={() => {
|
||||||
|
if (!isAuthenticated) {
|
||||||
|
toast.error("Connectez-vous pour partager");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setShareDialogOpen(true);
|
||||||
|
}}
|
||||||
|
>
|
||||||
<Share2 className="h-4 w-4 mr-2" />
|
<Share2 className="h-4 w-4 mr-2" />
|
||||||
Partager
|
Partager
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
@@ -259,10 +273,11 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
navigator.clipboard.writeText(
|
if (!isAuthenticated) {
|
||||||
`${window.location.origin}/meme/${content.slug}`,
|
toast.error("Connectez-vous pour partager");
|
||||||
);
|
return;
|
||||||
toast.success("Lien copié !");
|
}
|
||||||
|
setShareDialogOpen(true);
|
||||||
}}
|
}}
|
||||||
className="hover:text-muted-foreground"
|
className="hover:text-muted-foreground"
|
||||||
>
|
>
|
||||||
@@ -318,6 +333,13 @@ export function ContentCard({ content, onUpdate }: ContentCardProps) {
|
|||||||
onOpenChange={setEditDialogOpen}
|
onOpenChange={setEditDialogOpen}
|
||||||
onSuccess={() => onUpdate?.()}
|
onSuccess={() => onUpdate?.()}
|
||||||
/>
|
/>
|
||||||
|
<ShareDialog
|
||||||
|
contentId={content.id}
|
||||||
|
contentTitle={content.title}
|
||||||
|
contentUrl={`${typeof window !== "undefined" ? window.location.origin : ""}/meme/${content.slug}`}
|
||||||
|
open={shareDialogOpen}
|
||||||
|
onOpenChange={setShareDialogOpen}
|
||||||
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
116
frontend/src/components/notification-handler.tsx
Normal file
116
frontend/src/components/notification-handler.tsx
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Bell, Heart, MessageCircle, Reply } from "lucide-react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import * as React from "react";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { useSocket } from "@/providers/socket-provider";
|
||||||
|
|
||||||
|
interface NotificationData {
|
||||||
|
type: "comment" | "reply" | "like_comment" | "message";
|
||||||
|
userId: string;
|
||||||
|
username: string;
|
||||||
|
contentId?: string;
|
||||||
|
commentId?: string;
|
||||||
|
text: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NotificationHandler() {
|
||||||
|
const { socket } = useSocket();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (!socket) return;
|
||||||
|
|
||||||
|
const handleNotification = (data: NotificationData) => {
|
||||||
|
// Ne pas afficher de toast si on est déjà sur la page des messages pour un nouveau message
|
||||||
|
if (data.type === "message" && window.location.pathname === "/messages") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
toast.custom(
|
||||||
|
(t) => (
|
||||||
|
<div
|
||||||
|
role="button"
|
||||||
|
tabIndex={0}
|
||||||
|
className="flex items-start gap-3 bg-white dark:bg-zinc-900 p-4 rounded-xl shadow-lg border border-zinc-200 dark:border-zinc-800 w-full max-w-sm cursor-pointer hover:bg-zinc-50 dark:hover:bg-zinc-800 transition-colors"
|
||||||
|
onClick={() => {
|
||||||
|
toast.dismiss(t);
|
||||||
|
if (data.type === "message") {
|
||||||
|
router.push("/messages");
|
||||||
|
} else if (data.contentId) {
|
||||||
|
router.push(`/meme/${data.contentId}`);
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
onKeyDown={(e) => {
|
||||||
|
if (e.key === "Enter" || e.key === " ") {
|
||||||
|
toast.dismiss(t);
|
||||||
|
if (data.type === "message") {
|
||||||
|
router.push("/messages");
|
||||||
|
} else if (data.contentId) {
|
||||||
|
router.push(`/meme/${data.contentId}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div className="bg-primary/10 p-2 rounded-full shrink-0">
|
||||||
|
{data.type === "comment" && (
|
||||||
|
<MessageCircle className="h-4 w-4 text-primary" />
|
||||||
|
)}
|
||||||
|
{data.type === "reply" && <Reply className="h-4 w-4 text-primary" />}
|
||||||
|
{data.type === "like_comment" && (
|
||||||
|
<Heart className="h-4 w-4 text-red-500" />
|
||||||
|
)}
|
||||||
|
{data.type === "message" && (
|
||||||
|
<MessageCircle className="h-4 w-4 text-primary" />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="flex-1 overflow-hidden">
|
||||||
|
<p className="text-sm font-bold">@{data.username}</p>
|
||||||
|
<p className="text-xs text-muted-foreground truncate">{data.text}</p>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={(e) => {
|
||||||
|
e.stopPropagation();
|
||||||
|
toast.dismiss(t);
|
||||||
|
}}
|
||||||
|
className="text-muted-foreground hover:text-foreground"
|
||||||
|
>
|
||||||
|
<Bell className="h-3 w-3" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
),
|
||||||
|
{
|
||||||
|
duration: 5000,
|
||||||
|
position: "top-right",
|
||||||
|
},
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
socket.on("notification", handleNotification);
|
||||||
|
|
||||||
|
// Aussi pour les nouveaux messages (si on veut un toast global)
|
||||||
|
socket.on("new_message", (data: { message: any }) => {
|
||||||
|
if (window.location.pathname !== "/messages") {
|
||||||
|
toast(
|
||||||
|
`Nouveau message de @${data.message.sender?.username || "un membre"}`,
|
||||||
|
{
|
||||||
|
description: data.message.text.substring(0, 50),
|
||||||
|
action: {
|
||||||
|
label: "Voir",
|
||||||
|
onClick: () => router.push("/messages"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
socket.off("notification");
|
||||||
|
socket.off("new_message");
|
||||||
|
};
|
||||||
|
}, [socket, router]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
185
frontend/src/components/share-dialog.tsx
Normal file
185
frontend/src/components/share-dialog.tsx
Normal file
@@ -0,0 +1,185 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { Search, Send, X } 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 {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
} from "@/components/ui/dialog";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { ScrollArea } from "@/components/ui/scroll-area";
|
||||||
|
import { MessageService } from "@/services/message.service";
|
||||||
|
import { UserService } from "@/services/user.service";
|
||||||
|
import type { User } from "@/types/user";
|
||||||
|
|
||||||
|
interface ShareDialogProps {
|
||||||
|
contentId: string;
|
||||||
|
contentTitle: string;
|
||||||
|
contentUrl: string;
|
||||||
|
open: boolean;
|
||||||
|
onOpenChange: (open: boolean) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ShareDialog({
|
||||||
|
contentId,
|
||||||
|
contentTitle,
|
||||||
|
open,
|
||||||
|
onOpenChange,
|
||||||
|
}: Omit<ShareDialogProps, "contentUrl">) {
|
||||||
|
const [searchQuery, setSearchQuery] = React.useState("");
|
||||||
|
const [results, setResults] = React.useState<User[]>([]);
|
||||||
|
const [isLoading, setIsLoading] = React.useState(false);
|
||||||
|
const [sendingTo, setSendingTo] = React.useState<string | null>(null);
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (!open) {
|
||||||
|
setSearchQuery("");
|
||||||
|
setResults([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const fetchInitial = async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
// Par défaut, montrer les conversations récentes ou suggérer des gens
|
||||||
|
const recent = await UserService.search("");
|
||||||
|
setResults(recent);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Failed to fetch users", error);
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
fetchInitial();
|
||||||
|
}, [open]);
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (searchQuery.length < 2) return;
|
||||||
|
|
||||||
|
const timeout = setTimeout(async () => {
|
||||||
|
setIsLoading(true);
|
||||||
|
try {
|
||||||
|
const data = await UserService.search(searchQuery);
|
||||||
|
setResults(data);
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Search failed", error);
|
||||||
|
} finally {
|
||||||
|
setIsLoading(false);
|
||||||
|
}
|
||||||
|
}, 300);
|
||||||
|
|
||||||
|
return () => clearTimeout(timeout);
|
||||||
|
}, [searchQuery]);
|
||||||
|
|
||||||
|
const handleShare = async (user: User) => {
|
||||||
|
setSendingTo(user.uuid);
|
||||||
|
try {
|
||||||
|
const shareUrl = `${window.location.origin}/meme/${contentId}`;
|
||||||
|
await MessageService.sendMessage(
|
||||||
|
user.uuid,
|
||||||
|
`Regarde ce mème : ${contentTitle}\n${shareUrl}`,
|
||||||
|
);
|
||||||
|
toast.success(`Partagé avec @${user.username}`);
|
||||||
|
onOpenChange(false);
|
||||||
|
} catch (_error) {
|
||||||
|
toast.error("Échec du partage");
|
||||||
|
} finally {
|
||||||
|
setSendingTo(null);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||||
|
<DialogContent className="sm:max-w-[425px] p-0 gap-0 overflow-hidden">
|
||||||
|
<DialogHeader className="p-4 border-b">
|
||||||
|
<DialogTitle>Partager avec</DialogTitle>
|
||||||
|
</DialogHeader>
|
||||||
|
<div className="p-4 border-b">
|
||||||
|
<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 un membre..."
|
||||||
|
className="pl-9 h-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="h-[300px]">
|
||||||
|
<div className="p-2 space-y-1">
|
||||||
|
{isLoading && results.length === 0 ? (
|
||||||
|
<div className="p-4 text-center text-sm text-muted-foreground">
|
||||||
|
Chargement...
|
||||||
|
</div>
|
||||||
|
) : results.length === 0 ? (
|
||||||
|
<div className="p-4 text-center text-sm text-muted-foreground">
|
||||||
|
Aucun membre trouvé.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
results.map((user) => (
|
||||||
|
<div
|
||||||
|
key={user.uuid}
|
||||||
|
className="flex items-center justify-between p-2 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-900"
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<Avatar className="h-9 w-9">
|
||||||
|
<AvatarImage src={user.avatarUrl} />
|
||||||
|
<AvatarFallback>{user.username[0].toUpperCase()}</AvatarFallback>
|
||||||
|
</Avatar>
|
||||||
|
<div className="flex flex-col">
|
||||||
|
<span className="text-sm font-bold leading-none">
|
||||||
|
{user.displayName || user.username}
|
||||||
|
</span>
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
@{user.username}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant={sendingTo === user.uuid ? "outline" : "default"}
|
||||||
|
disabled={sendingTo !== null}
|
||||||
|
onClick={() => handleShare(user)}
|
||||||
|
className="h-8 px-4 rounded-full"
|
||||||
|
>
|
||||||
|
{sendingTo === user.uuid ? "Envoi..." : "Envoyer"}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</ScrollArea>
|
||||||
|
<div className="p-4 border-t bg-zinc-50 dark:bg-zinc-900/50">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
className="w-full justify-start gap-2 h-10 rounded-xl"
|
||||||
|
onClick={() => {
|
||||||
|
navigator.clipboard.writeText(
|
||||||
|
`${window.location.origin}/meme/${contentId}`,
|
||||||
|
);
|
||||||
|
toast.success("Lien copié !");
|
||||||
|
onOpenChange(false);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Send className="h-4 w-4" />
|
||||||
|
Copier le lien
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { Loader2, Shield, ShieldAlert, ShieldCheck } from "lucide-react";
|
import { Loader2, Shield, ShieldAlert, ShieldCheck } from "lucide-react";
|
||||||
|
import Image from "next/image";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
@@ -76,9 +77,7 @@ export function TwoFactorSetup() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Note: We need a way to know if 2FA is enabled.
|
// Note: We need a way to know if 2FA is enabled.
|
||||||
// Assuming user object might have twoFactorEnabled property or similar.
|
const isEnabled = user?.twoFactorEnabled;
|
||||||
// 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") {
|
if (step === "idle") {
|
||||||
return (
|
return (
|
||||||
@@ -154,7 +153,14 @@ export function TwoFactorSetup() {
|
|||||||
<CardContent className="flex flex-col items-center gap-6">
|
<CardContent className="flex flex-col items-center gap-6">
|
||||||
{qrCode && (
|
{qrCode && (
|
||||||
<div className="bg-white p-4 rounded-xl border-4 border-zinc-100">
|
<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>
|
||||||
)}
|
)}
|
||||||
<div className="w-full space-y-2">
|
<div className="w-full space-y-2">
|
||||||
|
|||||||
@@ -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}
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
66
frontend/src/providers/socket-provider.tsx
Normal file
66
frontend/src/providers/socket-provider.tsx
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
"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";
|
||||||
|
|
||||||
|
// Initialisation du socket avec configuration optimisée pour la production
|
||||||
|
const socketInstance = io(apiUrl, {
|
||||||
|
withCredentials: true,
|
||||||
|
transports: ["websocket"], // Recommandé pour éviter les problèmes de sticky sessions
|
||||||
|
reconnectionAttempts: 5,
|
||||||
|
reconnectionDelay: 1000,
|
||||||
|
});
|
||||||
|
|
||||||
|
socketInstance.on("connect", () => {
|
||||||
|
console.log("WebSocket connected to:", apiUrl);
|
||||||
|
setIsConnected(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
socketInstance.on("connect_error", (error) => {
|
||||||
|
console.error("WebSocket connection error:", error);
|
||||||
|
// Si le websocket pur échoue, on peut tenter le polling en fallback (optionnel)
|
||||||
|
});
|
||||||
|
|
||||||
|
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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import api from "@/lib/api";
|
import api from "@/lib/api";
|
||||||
|
import type { User } from "@/types/user";
|
||||||
import type { Report, ReportStatus } from "./report.service";
|
import type { Report, ReportStatus } from "./report.service";
|
||||||
|
|
||||||
export interface AdminStats {
|
export interface AdminStats {
|
||||||
@@ -29,7 +30,7 @@ export const adminService = {
|
|||||||
await api.delete(`/users/${userId}`);
|
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);
|
await api.patch(`/users/admin/${userId}`, data);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
48
frontend/src/services/comment.service.ts
Normal file
48
frontend/src/services/comment.service.ts
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import api from "@/lib/api";
|
||||||
|
|
||||||
|
export interface Comment {
|
||||||
|
id: string;
|
||||||
|
text: string;
|
||||||
|
parentId?: string;
|
||||||
|
likesCount: number;
|
||||||
|
isLiked: boolean;
|
||||||
|
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,
|
||||||
|
parentId?: string,
|
||||||
|
): Promise<Comment> {
|
||||||
|
const { data } = await api.post<Comment>(`/contents/${contentId}/comments`, {
|
||||||
|
text,
|
||||||
|
parentId,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
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`);
|
||||||
|
},
|
||||||
|
};
|
||||||
58
frontend/src/services/message.service.ts
Normal file
58
frontend/src/services/message.service.ts
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
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 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}`,
|
||||||
|
);
|
||||||
|
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,
|
||||||
|
text,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -12,6 +12,13 @@ export const UserService = {
|
|||||||
return data;
|
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> {
|
async updateMe(update: Partial<User>): Promise<User> {
|
||||||
const { data } = await api.patch<User>("/users/me", update);
|
const { data } = await api.patch<User>("/users/me", update);
|
||||||
return data;
|
return data;
|
||||||
@@ -54,8 +61,8 @@ export const UserService = {
|
|||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
|
|
||||||
async exportData(): Promise<any> {
|
async exportData(): Promise<Record<string, unknown>> {
|
||||||
const { data } = await api.get("/users/me/export");
|
const { data } = await api.get<Record<string, unknown>>("/users/me/export");
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ export interface User {
|
|||||||
bio?: string;
|
bio?: string;
|
||||||
role?: "user" | "admin" | "moderator";
|
role?: "user" | "admin" | "moderator";
|
||||||
status?: "active" | "verification" | "suspended" | "pending" | "deleted";
|
status?: "active" | "verification" | "suspended" | "pending" | "deleted";
|
||||||
|
twoFactorEnabled?: boolean;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@memegoat/source",
|
"name": "@memegoat/source",
|
||||||
"version": "1.7.4",
|
"version": "1.9.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"version:get": "cmake -P version.cmake GET",
|
"version:get": "cmake -P version.cmake GET",
|
||||||
|
|||||||
263
pnpm-lock.yaml
generated
263
pnpm-lock.yaml
generated
@@ -28,19 +28,25 @@ importers:
|
|||||||
version: 4.0.2(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(rxjs@7.8.2)
|
version: 4.0.2(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(rxjs@7.8.2)
|
||||||
'@nestjs/core':
|
'@nestjs/core':
|
||||||
specifier: ^11.0.1
|
specifier: ^11.0.1
|
||||||
version: 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
version: 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/mapped-types':
|
'@nestjs/mapped-types':
|
||||||
specifier: ^2.1.0
|
specifier: ^2.1.0
|
||||||
version: 2.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)
|
version: 2.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)
|
||||||
'@nestjs/platform-express':
|
'@nestjs/platform-express':
|
||||||
specifier: ^11.0.1
|
specifier: ^11.0.1
|
||||||
version: 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
version: 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
||||||
|
'@nestjs/platform-socket.io':
|
||||||
|
specifier: ^11.1.12
|
||||||
|
version: 11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.12)(rxjs@7.8.2)
|
||||||
'@nestjs/schedule':
|
'@nestjs/schedule':
|
||||||
specifier: ^6.1.0
|
specifier: ^6.1.0
|
||||||
version: 6.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
version: 6.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
||||||
'@nestjs/throttler':
|
'@nestjs/throttler':
|
||||||
specifier: ^6.5.0
|
specifier: ^6.5.0
|
||||||
version: 6.5.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(reflect-metadata@0.2.2)
|
version: 6.5.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(reflect-metadata@0.2.2)
|
||||||
|
'@nestjs/websockets':
|
||||||
|
specifier: ^11.1.12
|
||||||
|
version: 11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-socket.io@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@noble/post-quantum':
|
'@noble/post-quantum':
|
||||||
specifier: ^0.5.4
|
specifier: ^0.5.4
|
||||||
version: 0.5.4
|
version: 0.5.4
|
||||||
@@ -113,6 +119,9 @@ importers:
|
|||||||
sharp:
|
sharp:
|
||||||
specifier: ^0.34.5
|
specifier: ^0.34.5
|
||||||
version: 0.34.5
|
version: 0.34.5
|
||||||
|
socket.io:
|
||||||
|
specifier: ^4.8.3
|
||||||
|
version: 4.8.3
|
||||||
uuid:
|
uuid:
|
||||||
specifier: ^13.0.0
|
specifier: ^13.0.0
|
||||||
version: 13.0.0
|
version: 13.0.0
|
||||||
@@ -156,6 +165,9 @@ importers:
|
|||||||
'@types/sharp':
|
'@types/sharp':
|
||||||
specifier: ^0.32.0
|
specifier: ^0.32.0
|
||||||
version: 0.32.0
|
version: 0.32.0
|
||||||
|
'@types/socket.io':
|
||||||
|
specifier: ^3.0.2
|
||||||
|
version: 3.0.2
|
||||||
'@types/supertest':
|
'@types/supertest':
|
||||||
specifier: ^6.0.2
|
specifier: ^6.0.2
|
||||||
version: 6.0.3
|
version: 6.0.3
|
||||||
@@ -388,6 +400,9 @@ importers:
|
|||||||
recharts:
|
recharts:
|
||||||
specifier: 2.15.4
|
specifier: 2.15.4
|
||||||
version: 2.15.4(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
|
version: 2.15.4(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
|
||||||
|
socket.io-client:
|
||||||
|
specifier: ^4.8.3
|
||||||
|
version: 4.8.3
|
||||||
sonner:
|
sonner:
|
||||||
specifier: ^2.0.7
|
specifier: ^2.0.7
|
||||||
version: 2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
|
version: 2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
|
||||||
@@ -2020,6 +2035,13 @@ packages:
|
|||||||
'@nestjs/common': ^11.0.0
|
'@nestjs/common': ^11.0.0
|
||||||
'@nestjs/core': ^11.0.0
|
'@nestjs/core': ^11.0.0
|
||||||
|
|
||||||
|
'@nestjs/platform-socket.io@11.1.12':
|
||||||
|
resolution: {integrity: sha512-1itTTYsAZecrq2NbJOkch32y8buLwN7UpcNRdJrhlS+ovJ5GxLx3RyJ3KylwBhbYnO5AeYyL1U/i4W5mg/4qDA==}
|
||||||
|
peerDependencies:
|
||||||
|
'@nestjs/common': ^11.0.0
|
||||||
|
'@nestjs/websockets': ^11.0.0
|
||||||
|
rxjs: ^7.1.0
|
||||||
|
|
||||||
'@nestjs/schedule@6.1.0':
|
'@nestjs/schedule@6.1.0':
|
||||||
resolution: {integrity: sha512-W25Ydc933Gzb1/oo7+bWzzDiOissE+h/dhIAPugA39b9MuIzBbLybuXpc1AjoQLczO3v0ldmxaffVl87W0uqoQ==}
|
resolution: {integrity: sha512-W25Ydc933Gzb1/oo7+bWzzDiOissE+h/dhIAPugA39b9MuIzBbLybuXpc1AjoQLczO3v0ldmxaffVl87W0uqoQ==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -2051,6 +2073,18 @@ packages:
|
|||||||
'@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
'@nestjs/core': ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0
|
||||||
reflect-metadata: ^0.1.13 || ^0.2.0
|
reflect-metadata: ^0.1.13 || ^0.2.0
|
||||||
|
|
||||||
|
'@nestjs/websockets@11.1.12':
|
||||||
|
resolution: {integrity: sha512-ulSOYcgosx1TqY425cRC5oXtAu1R10+OSmVfgyR9ueR25k4luekURt8dzAZxhxSCI0OsDj9WKCFLTkEuAwg0wg==}
|
||||||
|
peerDependencies:
|
||||||
|
'@nestjs/common': ^11.0.0
|
||||||
|
'@nestjs/core': ^11.0.0
|
||||||
|
'@nestjs/platform-socket.io': ^11.0.0
|
||||||
|
reflect-metadata: ^0.1.12 || ^0.2.0
|
||||||
|
rxjs: ^7.1.0
|
||||||
|
peerDependenciesMeta:
|
||||||
|
'@nestjs/platform-socket.io':
|
||||||
|
optional: true
|
||||||
|
|
||||||
'@next/env@16.1.1':
|
'@next/env@16.1.1':
|
||||||
resolution: {integrity: sha512-3oxyM97Sr2PqiVyMyrZUtrtM3jqqFxOQJVuKclDsgj/L728iZt/GyslkN4NwarledZATCenbk4Offjk1hQmaAA==}
|
resolution: {integrity: sha512-3oxyM97Sr2PqiVyMyrZUtrtM3jqqFxOQJVuKclDsgj/L728iZt/GyslkN4NwarledZATCenbk4Offjk1hQmaAA==}
|
||||||
|
|
||||||
@@ -3513,6 +3547,9 @@ packages:
|
|||||||
resolution: {integrity: sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==}
|
resolution: {integrity: sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==}
|
||||||
engines: {node: '>=18.0.0'}
|
engines: {node: '>=18.0.0'}
|
||||||
|
|
||||||
|
'@socket.io/component-emitter@3.1.2':
|
||||||
|
resolution: {integrity: sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==}
|
||||||
|
|
||||||
'@standard-schema/spec@1.1.0':
|
'@standard-schema/spec@1.1.0':
|
||||||
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
||||||
|
|
||||||
@@ -3657,6 +3694,9 @@ packages:
|
|||||||
'@types/cookiejar@2.1.5':
|
'@types/cookiejar@2.1.5':
|
||||||
resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
|
resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
|
||||||
|
|
||||||
|
'@types/cors@2.8.19':
|
||||||
|
resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
|
||||||
|
|
||||||
'@types/d3-array@3.2.2':
|
'@types/d3-array@3.2.2':
|
||||||
resolution: {integrity: sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==}
|
resolution: {integrity: sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==}
|
||||||
|
|
||||||
@@ -3879,6 +3919,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-OOi3kL+FZDnPhVzsfD37J88FNeZh6gQsGcLc95NbeURRGvmSjeXiDcyWzF2o3yh/gQAUn2uhh/e+CPCa5nwAxw==}
|
resolution: {integrity: sha512-OOi3kL+FZDnPhVzsfD37J88FNeZh6gQsGcLc95NbeURRGvmSjeXiDcyWzF2o3yh/gQAUn2uhh/e+CPCa5nwAxw==}
|
||||||
deprecated: This is a stub types definition. sharp provides its own type definitions, so you do not need this installed.
|
deprecated: This is a stub types definition. sharp provides its own type definitions, so you do not need this installed.
|
||||||
|
|
||||||
|
'@types/socket.io@3.0.2':
|
||||||
|
resolution: {integrity: sha512-pu0sN9m5VjCxBZVK8hW37ZcMe8rjn4HHggBN5CbaRTvFwv5jOmuIRZEuddsBPa9Th0ts0SIo3Niukq+95cMBbQ==}
|
||||||
|
deprecated: This is a stub types definition. socket.io provides its own type definitions, so you do not need this installed.
|
||||||
|
|
||||||
'@types/stack-utils@2.0.3':
|
'@types/stack-utils@2.0.3':
|
||||||
resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
|
resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
|
||||||
|
|
||||||
@@ -4139,6 +4183,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==}
|
resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==}
|
||||||
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
|
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
|
||||||
|
|
||||||
|
accepts@1.3.8:
|
||||||
|
resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
|
||||||
|
engines: {node: '>= 0.6'}
|
||||||
|
|
||||||
accepts@2.0.0:
|
accepts@2.0.0:
|
||||||
resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
|
resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
|
||||||
engines: {node: '>= 0.6'}
|
engines: {node: '>= 0.6'}
|
||||||
@@ -4331,6 +4379,10 @@ packages:
|
|||||||
base64-js@1.5.1:
|
base64-js@1.5.1:
|
||||||
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
|
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
|
||||||
|
|
||||||
|
base64id@2.0.0:
|
||||||
|
resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==}
|
||||||
|
engines: {node: ^4.5.0 || >= 5.9}
|
||||||
|
|
||||||
baseline-browser-mapping@2.9.11:
|
baseline-browser-mapping@2.9.11:
|
||||||
resolution: {integrity: sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==}
|
resolution: {integrity: sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
@@ -5192,6 +5244,17 @@ packages:
|
|||||||
resolution: {integrity: sha512-EuJWwlHPZ1LbADuKTClvHtwbaFn4rOD+dRAbWysqEOXRc2Uui0hJInNJrsdH0c+OhJA4nrCBdSkW4DD5YxAo6A==}
|
resolution: {integrity: sha512-EuJWwlHPZ1LbADuKTClvHtwbaFn4rOD+dRAbWysqEOXRc2Uui0hJInNJrsdH0c+OhJA4nrCBdSkW4DD5YxAo6A==}
|
||||||
engines: {node: '>=8.10.0'}
|
engines: {node: '>=8.10.0'}
|
||||||
|
|
||||||
|
engine.io-client@6.6.4:
|
||||||
|
resolution: {integrity: sha512-+kjUJnZGwzewFDw951CDWcwj35vMNf2fcj7xQWOctq1F2i1jkDdVvdFG9kM/BEChymCH36KgjnW0NsL58JYRxw==}
|
||||||
|
|
||||||
|
engine.io-parser@5.2.3:
|
||||||
|
resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==}
|
||||||
|
engines: {node: '>=10.0.0'}
|
||||||
|
|
||||||
|
engine.io@6.6.5:
|
||||||
|
resolution: {integrity: sha512-2RZdgEbXmp5+dVbRm0P7HQUImZpICccJy7rN7Tv+SFa55pH+lxnuw6/K1ZxxBfHoYpSkHLAO92oa8O4SwFXA2A==}
|
||||||
|
engines: {node: '>=10.2.0'}
|
||||||
|
|
||||||
enhanced-resolve@5.18.4:
|
enhanced-resolve@5.18.4:
|
||||||
resolution: {integrity: sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==}
|
resolution: {integrity: sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==}
|
||||||
engines: {node: '>=10.13.0'}
|
engines: {node: '>=10.13.0'}
|
||||||
@@ -6850,6 +6913,10 @@ packages:
|
|||||||
natural-compare@1.4.0:
|
natural-compare@1.4.0:
|
||||||
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
|
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
|
||||||
|
|
||||||
|
negotiator@0.6.3:
|
||||||
|
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
|
||||||
|
engines: {node: '>= 0.6'}
|
||||||
|
|
||||||
negotiator@1.0.0:
|
negotiator@1.0.0:
|
||||||
resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
|
resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
|
||||||
engines: {node: '>= 0.6'}
|
engines: {node: '>= 0.6'}
|
||||||
@@ -6955,6 +7022,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
|
resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
|
||||||
|
object-hash@3.0.0:
|
||||||
|
resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
|
||||||
|
engines: {node: '>= 6'}
|
||||||
|
|
||||||
object-inspect@1.13.4:
|
object-inspect@1.13.4:
|
||||||
resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
|
resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
|
||||||
engines: {node: '>= 0.4'}
|
engines: {node: '>= 0.4'}
|
||||||
@@ -7664,6 +7735,21 @@ packages:
|
|||||||
slick@1.12.2:
|
slick@1.12.2:
|
||||||
resolution: {integrity: sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==}
|
resolution: {integrity: sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==}
|
||||||
|
|
||||||
|
socket.io-adapter@2.5.6:
|
||||||
|
resolution: {integrity: sha512-DkkO/dz7MGln0dHn5bmN3pPy+JmywNICWrJqVWiVOyvXjWQFIv9c2h24JrQLLFJ2aQVQf/Cvl1vblnd4r2apLQ==}
|
||||||
|
|
||||||
|
socket.io-client@4.8.3:
|
||||||
|
resolution: {integrity: sha512-uP0bpjWrjQmUt5DTHq9RuoCBdFJF10cdX9X+a368j/Ft0wmaVgxlrjvK3kjvgCODOMMOz9lcaRzxmso0bTWZ/g==}
|
||||||
|
engines: {node: '>=10.0.0'}
|
||||||
|
|
||||||
|
socket.io-parser@4.2.5:
|
||||||
|
resolution: {integrity: sha512-bPMmpy/5WWKHea5Y/jYAP6k74A+hvmRCQaJuJB6I/ML5JZq/KfNieUVo/3Mh7SAqn7TyFdIo6wqYHInG1MU1bQ==}
|
||||||
|
engines: {node: '>=10.0.0'}
|
||||||
|
|
||||||
|
socket.io@4.8.3:
|
||||||
|
resolution: {integrity: sha512-2Dd78bqzzjE6KPkD5fHZmDAKRNe3J15q+YHDrIsy9WEkqttc7GY+kT9OBLSMaPbQaEd0x1BjcmtMtXkfpc+T5A==}
|
||||||
|
engines: {node: '>=10.2.0'}
|
||||||
|
|
||||||
sonner@2.0.7:
|
sonner@2.0.7:
|
||||||
resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==}
|
resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@@ -8341,6 +8427,18 @@ packages:
|
|||||||
resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
|
resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
|
||||||
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
|
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
|
||||||
|
|
||||||
|
ws@8.18.3:
|
||||||
|
resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==}
|
||||||
|
engines: {node: '>=10.0.0'}
|
||||||
|
peerDependencies:
|
||||||
|
bufferutil: ^4.0.1
|
||||||
|
utf-8-validate: '>=5.0.2'
|
||||||
|
peerDependenciesMeta:
|
||||||
|
bufferutil:
|
||||||
|
optional: true
|
||||||
|
utf-8-validate:
|
||||||
|
optional: true
|
||||||
|
|
||||||
xml2js@0.6.2:
|
xml2js@0.6.2:
|
||||||
resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
|
resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
|
||||||
engines: {node: '>=4.0.0'}
|
engines: {node: '>=4.0.0'}
|
||||||
@@ -8349,6 +8447,10 @@ packages:
|
|||||||
resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
|
resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
|
||||||
engines: {node: '>=4.0'}
|
engines: {node: '>=4.0'}
|
||||||
|
|
||||||
|
xmlhttprequest-ssl@2.1.2:
|
||||||
|
resolution: {integrity: sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==}
|
||||||
|
engines: {node: '>=0.4.0'}
|
||||||
|
|
||||||
xtend@4.0.2:
|
xtend@4.0.2:
|
||||||
resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
|
resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
|
||||||
engines: {node: '>=0.4'}
|
engines: {node: '>=0.4'}
|
||||||
@@ -9857,7 +9959,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@jest/fake-timers': 30.2.0
|
'@jest/fake-timers': 30.2.0
|
||||||
'@jest/types': 30.2.0
|
'@jest/types': 30.2.0
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
jest-mock: 30.2.0
|
jest-mock: 30.2.0
|
||||||
|
|
||||||
'@jest/expect-utils@30.2.0':
|
'@jest/expect-utils@30.2.0':
|
||||||
@@ -9875,7 +9977,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@jest/types': 30.2.0
|
'@jest/types': 30.2.0
|
||||||
'@sinonjs/fake-timers': 13.0.5
|
'@sinonjs/fake-timers': 13.0.5
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
jest-message-util: 30.2.0
|
jest-message-util: 30.2.0
|
||||||
jest-mock: 30.2.0
|
jest-mock: 30.2.0
|
||||||
jest-util: 30.2.0
|
jest-util: 30.2.0
|
||||||
@@ -10063,7 +10165,7 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
'@css-inline/css-inline': 0.14.1
|
'@css-inline/css-inline': 0.14.1
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
glob: 10.3.12
|
glob: 10.3.12
|
||||||
nodemailer: 7.0.12
|
nodemailer: 7.0.12
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
@@ -10082,7 +10184,7 @@ snapshots:
|
|||||||
'@nestjs/cache-manager@3.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(cache-manager@7.2.7)(keyv@5.5.5)(rxjs@7.8.2)':
|
'@nestjs/cache-manager@3.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(cache-manager@7.2.7)(keyv@5.5.5)(rxjs@7.8.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
cache-manager: 7.2.7
|
cache-manager: 7.2.7
|
||||||
keyv: 5.5.5
|
keyv: 5.5.5
|
||||||
rxjs: 7.8.2
|
rxjs: 7.8.2
|
||||||
@@ -10136,7 +10238,7 @@ snapshots:
|
|||||||
lodash: 4.17.21
|
lodash: 4.17.21
|
||||||
rxjs: 7.8.2
|
rxjs: 7.8.2
|
||||||
|
|
||||||
'@nestjs/core@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
|
'@nestjs/core@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nuxt/opencollective': 0.4.1
|
'@nuxt/opencollective': 0.4.1
|
||||||
@@ -10149,6 +10251,7 @@ snapshots:
|
|||||||
uid: 2.0.2
|
uid: 2.0.2
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@nestjs/platform-express': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
'@nestjs/platform-express': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
||||||
|
'@nestjs/websockets': 11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-socket.io@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
|
||||||
'@nestjs/mapped-types@2.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)':
|
'@nestjs/mapped-types@2.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -10161,7 +10264,7 @@ snapshots:
|
|||||||
'@nestjs/platform-express@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
'@nestjs/platform-express@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
cors: 2.8.5
|
cors: 2.8.5
|
||||||
express: 5.2.1
|
express: 5.2.1
|
||||||
multer: 2.0.2
|
multer: 2.0.2
|
||||||
@@ -10170,10 +10273,22 @@ snapshots:
|
|||||||
transitivePeerDependencies:
|
transitivePeerDependencies:
|
||||||
- supports-color
|
- supports-color
|
||||||
|
|
||||||
|
'@nestjs/platform-socket.io@11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.12)(rxjs@7.8.2)':
|
||||||
|
dependencies:
|
||||||
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/websockets': 11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-socket.io@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
rxjs: 7.8.2
|
||||||
|
socket.io: 4.8.3
|
||||||
|
tslib: 2.8.1
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
'@nestjs/schedule@6.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
'@nestjs/schedule@6.1.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
cron: 4.3.5
|
cron: 4.3.5
|
||||||
|
|
||||||
'@nestjs/schematics@11.0.9(chokidar@4.0.3)(typescript@5.9.3)':
|
'@nestjs/schematics@11.0.9(chokidar@4.0.3)(typescript@5.9.3)':
|
||||||
@@ -10190,7 +10305,7 @@ snapshots:
|
|||||||
'@nestjs/testing@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-express@11.1.11)':
|
'@nestjs/testing@11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-express@11.1.11)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
'@nestjs/platform-express': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
'@nestjs/platform-express': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)
|
||||||
@@ -10198,9 +10313,21 @@ snapshots:
|
|||||||
'@nestjs/throttler@6.5.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(reflect-metadata@0.2.2)':
|
'@nestjs/throttler@6.5.0(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(reflect-metadata@0.2.2)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
reflect-metadata: 0.2.2
|
reflect-metadata: 0.2.2
|
||||||
|
|
||||||
|
'@nestjs/websockets@11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)(@nestjs/platform-socket.io@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
|
||||||
|
dependencies:
|
||||||
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
|
iterare: 1.2.1
|
||||||
|
object-hash: 3.0.0
|
||||||
|
reflect-metadata: 0.2.2
|
||||||
|
rxjs: 7.8.2
|
||||||
|
tslib: 2.8.1
|
||||||
|
optionalDependencies:
|
||||||
|
'@nestjs/platform-socket.io': 11.1.12(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.12)(rxjs@7.8.2)
|
||||||
|
|
||||||
'@next/env@16.1.1': {}
|
'@next/env@16.1.1': {}
|
||||||
|
|
||||||
'@next/swc-darwin-arm64@16.1.1':
|
'@next/swc-darwin-arm64@16.1.1':
|
||||||
@@ -11380,7 +11507,7 @@ snapshots:
|
|||||||
'@sentry/nestjs@10.32.1(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
'@sentry/nestjs@10.32.1(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.11)':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/common': 11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
'@nestjs/core': 11.1.11(@nestjs/common@11.1.11(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.11)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
|
||||||
'@opentelemetry/api': 1.9.0
|
'@opentelemetry/api': 1.9.0
|
||||||
'@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
|
'@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
|
||||||
'@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
|
'@opentelemetry/instrumentation': 0.208.0(@opentelemetry/api@1.9.0)
|
||||||
@@ -11795,6 +11922,8 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
tslib: 2.8.1
|
tslib: 2.8.1
|
||||||
|
|
||||||
|
'@socket.io/component-emitter@3.1.2': {}
|
||||||
|
|
||||||
'@standard-schema/spec@1.1.0': {}
|
'@standard-schema/spec@1.1.0': {}
|
||||||
|
|
||||||
'@standard-schema/utils@0.3.0': {}
|
'@standard-schema/utils@0.3.0': {}
|
||||||
@@ -11926,6 +12055,10 @@ snapshots:
|
|||||||
|
|
||||||
'@types/cookiejar@2.1.5': {}
|
'@types/cookiejar@2.1.5': {}
|
||||||
|
|
||||||
|
'@types/cors@2.8.19':
|
||||||
|
dependencies:
|
||||||
|
'@types/node': 24.10.4
|
||||||
|
|
||||||
'@types/d3-array@3.2.2': {}
|
'@types/d3-array@3.2.2': {}
|
||||||
|
|
||||||
'@types/d3-axis@3.0.6':
|
'@types/d3-axis@3.0.6':
|
||||||
@@ -12134,7 +12267,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/mysql@2.15.27':
|
'@types/mysql@2.15.27':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
|
|
||||||
'@types/node@20.19.27':
|
'@types/node@20.19.27':
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -12161,7 +12294,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/pg@8.15.6':
|
'@types/pg@8.15.6':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
pg-protocol: 1.10.3
|
pg-protocol: 1.10.3
|
||||||
pg-types: 2.2.0
|
pg-types: 2.2.0
|
||||||
|
|
||||||
@@ -12203,6 +12336,14 @@ snapshots:
|
|||||||
dependencies:
|
dependencies:
|
||||||
sharp: 0.34.5
|
sharp: 0.34.5
|
||||||
|
|
||||||
|
'@types/socket.io@3.0.2':
|
||||||
|
dependencies:
|
||||||
|
socket.io: 4.8.3
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
'@types/stack-utils@2.0.3': {}
|
'@types/stack-utils@2.0.3': {}
|
||||||
|
|
||||||
'@types/superagent@8.1.9':
|
'@types/superagent@8.1.9':
|
||||||
@@ -12219,7 +12360,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/tedious@4.0.14':
|
'@types/tedious@4.0.14':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
|
|
||||||
'@types/trusted-types@2.0.7':
|
'@types/trusted-types@2.0.7':
|
||||||
optional: true
|
optional: true
|
||||||
@@ -12485,6 +12626,11 @@ snapshots:
|
|||||||
abbrev@2.0.0:
|
abbrev@2.0.0:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
accepts@1.3.8:
|
||||||
|
dependencies:
|
||||||
|
mime-types: 2.1.35
|
||||||
|
negotiator: 0.6.3
|
||||||
|
|
||||||
accepts@2.0.0:
|
accepts@2.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
mime-types: 3.0.2
|
mime-types: 3.0.2
|
||||||
@@ -12681,6 +12827,8 @@ snapshots:
|
|||||||
|
|
||||||
base64-js@1.5.1: {}
|
base64-js@1.5.1: {}
|
||||||
|
|
||||||
|
base64id@2.0.0: {}
|
||||||
|
|
||||||
baseline-browser-mapping@2.9.11: {}
|
baseline-browser-mapping@2.9.11: {}
|
||||||
|
|
||||||
binary-extensions@2.3.0:
|
binary-extensions@2.3.0:
|
||||||
@@ -13511,6 +13659,36 @@ snapshots:
|
|||||||
encoding-japanese@2.2.0:
|
encoding-japanese@2.2.0:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
engine.io-client@6.6.4:
|
||||||
|
dependencies:
|
||||||
|
'@socket.io/component-emitter': 3.1.2
|
||||||
|
debug: 4.4.3
|
||||||
|
engine.io-parser: 5.2.3
|
||||||
|
ws: 8.18.3
|
||||||
|
xmlhttprequest-ssl: 2.1.2
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
|
engine.io-parser@5.2.3: {}
|
||||||
|
|
||||||
|
engine.io@6.6.5:
|
||||||
|
dependencies:
|
||||||
|
'@types/cors': 2.8.19
|
||||||
|
'@types/node': 24.10.4
|
||||||
|
accepts: 1.3.8
|
||||||
|
base64id: 2.0.0
|
||||||
|
cookie: 0.7.2
|
||||||
|
cors: 2.8.5
|
||||||
|
debug: 4.4.3
|
||||||
|
engine.io-parser: 5.2.3
|
||||||
|
ws: 8.18.3
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
enhanced-resolve@5.18.4:
|
enhanced-resolve@5.18.4:
|
||||||
dependencies:
|
dependencies:
|
||||||
graceful-fs: 4.2.11
|
graceful-fs: 4.2.11
|
||||||
@@ -14604,7 +14782,7 @@ snapshots:
|
|||||||
'@jest/expect': 30.2.0
|
'@jest/expect': 30.2.0
|
||||||
'@jest/test-result': 30.2.0
|
'@jest/test-result': 30.2.0
|
||||||
'@jest/types': 30.2.0
|
'@jest/types': 30.2.0
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
chalk: 4.1.2
|
chalk: 4.1.2
|
||||||
co: 4.6.0
|
co: 4.6.0
|
||||||
dedent: 1.7.1
|
dedent: 1.7.1
|
||||||
@@ -14701,7 +14879,7 @@ snapshots:
|
|||||||
'@jest/environment': 30.2.0
|
'@jest/environment': 30.2.0
|
||||||
'@jest/fake-timers': 30.2.0
|
'@jest/fake-timers': 30.2.0
|
||||||
'@jest/types': 30.2.0
|
'@jest/types': 30.2.0
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
jest-mock: 30.2.0
|
jest-mock: 30.2.0
|
||||||
jest-util: 30.2.0
|
jest-util: 30.2.0
|
||||||
jest-validate: 30.2.0
|
jest-validate: 30.2.0
|
||||||
@@ -14886,13 +15064,13 @@ snapshots:
|
|||||||
|
|
||||||
jest-worker@27.5.1:
|
jest-worker@27.5.1:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
merge-stream: 2.0.0
|
merge-stream: 2.0.0
|
||||||
supports-color: 8.1.1
|
supports-color: 8.1.1
|
||||||
|
|
||||||
jest-worker@30.2.0:
|
jest-worker@30.2.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@types/node': 22.19.6
|
'@types/node': 24.10.4
|
||||||
'@ungap/structured-clone': 1.3.0
|
'@ungap/structured-clone': 1.3.0
|
||||||
jest-util: 30.2.0
|
jest-util: 30.2.0
|
||||||
merge-stream: 2.0.0
|
merge-stream: 2.0.0
|
||||||
@@ -16078,6 +16256,8 @@ snapshots:
|
|||||||
|
|
||||||
natural-compare@1.4.0: {}
|
natural-compare@1.4.0: {}
|
||||||
|
|
||||||
|
negotiator@0.6.3: {}
|
||||||
|
|
||||||
negotiator@1.0.0: {}
|
negotiator@1.0.0: {}
|
||||||
|
|
||||||
neo-async@2.6.2: {}
|
neo-async@2.6.2: {}
|
||||||
@@ -16173,6 +16353,8 @@ snapshots:
|
|||||||
|
|
||||||
object-assign@4.1.1: {}
|
object-assign@4.1.1: {}
|
||||||
|
|
||||||
|
object-hash@3.0.0: {}
|
||||||
|
|
||||||
object-inspect@1.13.4: {}
|
object-inspect@1.13.4: {}
|
||||||
|
|
||||||
on-finished@2.4.1:
|
on-finished@2.4.1:
|
||||||
@@ -17110,6 +17292,47 @@ snapshots:
|
|||||||
slick@1.12.2:
|
slick@1.12.2:
|
||||||
optional: true
|
optional: true
|
||||||
|
|
||||||
|
socket.io-adapter@2.5.6:
|
||||||
|
dependencies:
|
||||||
|
debug: 4.4.3
|
||||||
|
ws: 8.18.3
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
|
socket.io-client@4.8.3:
|
||||||
|
dependencies:
|
||||||
|
'@socket.io/component-emitter': 3.1.2
|
||||||
|
debug: 4.4.3
|
||||||
|
engine.io-client: 6.6.4
|
||||||
|
socket.io-parser: 4.2.5
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
|
socket.io-parser@4.2.5:
|
||||||
|
dependencies:
|
||||||
|
'@socket.io/component-emitter': 3.1.2
|
||||||
|
debug: 4.4.3
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- supports-color
|
||||||
|
|
||||||
|
socket.io@4.8.3:
|
||||||
|
dependencies:
|
||||||
|
accepts: 1.3.8
|
||||||
|
base64id: 2.0.0
|
||||||
|
cors: 2.8.5
|
||||||
|
debug: 4.4.3
|
||||||
|
engine.io: 6.6.5
|
||||||
|
socket.io-adapter: 2.5.6
|
||||||
|
socket.io-parser: 4.2.5
|
||||||
|
transitivePeerDependencies:
|
||||||
|
- bufferutil
|
||||||
|
- supports-color
|
||||||
|
- utf-8-validate
|
||||||
|
|
||||||
sonner@2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
|
sonner@2.0.7(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.2.3
|
react: 19.2.3
|
||||||
@@ -17812,6 +18035,8 @@ snapshots:
|
|||||||
imurmurhash: 0.1.4
|
imurmurhash: 0.1.4
|
||||||
signal-exit: 4.1.0
|
signal-exit: 4.1.0
|
||||||
|
|
||||||
|
ws@8.18.3: {}
|
||||||
|
|
||||||
xml2js@0.6.2:
|
xml2js@0.6.2:
|
||||||
dependencies:
|
dependencies:
|
||||||
sax: 1.4.3
|
sax: 1.4.3
|
||||||
@@ -17819,6 +18044,8 @@ snapshots:
|
|||||||
|
|
||||||
xmlbuilder@11.0.1: {}
|
xmlbuilder@11.0.1: {}
|
||||||
|
|
||||||
|
xmlhttprequest-ssl@2.1.2: {}
|
||||||
|
|
||||||
xtend@4.0.2: {}
|
xtend@4.0.2: {}
|
||||||
|
|
||||||
y18n@4.0.3: {}
|
y18n@4.0.3: {}
|
||||||
|
|||||||
Reference in New Issue
Block a user