From f77b03bee18175271f977f6f015d26103926342c Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 28 Aug 2025 21:21:48 +0300 Subject: [PATCH] =?UTF-8?q?v0.0.28=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B5=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=20S3=20=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=20url=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D1=81=D0=BE=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B2=20?= =?UTF-8?q?=D0=B1=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/service/post_service.go | 18 ++++++++++++++++++ pkg/moderation/moderation.go | 12 +++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/internal/service/post_service.go b/internal/service/post_service.go index eee678b..61dee46 100644 --- a/internal/service/post_service.go +++ b/internal/service/post_service.go @@ -11,6 +11,7 @@ import ( "tailly_back_v2/internal/repository" "tailly_back_v2/internal/utils" "tailly_back_v2/pkg/S3" + "tailly_back_v2/pkg/moderation" "time" "github.com/99designs/gqlgen/graphql" @@ -109,6 +110,23 @@ func (s *postService) Create(ctx context.Context, authorID int, title string, co imageURL := fmt.Sprintf("https://s3.regru.cloud/tailly/%s", s3Key) + modClient, err := moderation.NewModerationClient("tailly_censor:50051") + if err != nil { + S3.DeleteFromS3(imageURL) // удаляем если ошибка модерации + return nil, fmt.Errorf("%s: failed to create moderation client: %w", op, err) + } + defer modClient.Close() + + allowed, err := modClient.CheckImageURL(ctx, imageURL) + if err != nil { + S3.DeleteFromS3(imageURL) + return nil, fmt.Errorf("%s: image moderation failed: %w", op, err) + } + if !allowed { + S3.DeleteFromS3(imageURL) + return nil, errors.New("image rejected by moderation service") + } + post := &domain.Post{ Title: title, Content: imageURL, diff --git a/pkg/moderation/moderation.go b/pkg/moderation/moderation.go index 30c22f8..2acbe92 100644 --- a/pkg/moderation/moderation.go +++ b/pkg/moderation/moderation.go @@ -3,8 +3,9 @@ package moderation import ( "context" - "google.golang.org/grpc" pb "tailly_back_v2/pkg/moderation/proto" + + "google.golang.org/grpc" ) type ModerationClient struct { @@ -38,3 +39,12 @@ func (c *ModerationClient) CheckImage(ctx context.Context, imageData []byte) (bo func (c *ModerationClient) Close() { c.conn.Close() } +func (c *ModerationClient) CheckImageURL(ctx context.Context, imageURL string) (bool, error) { + resp, err := c.client.CheckImage(ctx, &pb.ImageRequest{ + ImageUrl: imageURL, // ← Передаем URL вместо данных! + }) + if err != nil { + return false, err + } + return resp.OverallDecision == "allowed", nil +}