From 7d51385ad9fd4d9f9877e5662489983909437e2d Mon Sep 17 00:00:00 2001 From: DevMiner Date: Tue, 27 Aug 2024 02:11:26 +0200 Subject: [PATCH] fix: /api/users/:id shouldn't return remote users --- internal/handlers/user_handler/app_user_get.go | 2 +- internal/handlers/user_handler/lysand_user_get.go | 2 +- internal/service/service.go | 2 +- internal/service/svc_impls/note_service_impl.go | 2 +- internal/service/svc_impls/user_service_impl.go | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/handlers/user_handler/app_user_get.go b/internal/handlers/user_handler/app_user_get.go index a0bf665..5a932ab 100644 --- a/internal/handlers/user_handler/app_user_get.go +++ b/internal/handlers/user_handler/app_user_get.go @@ -14,7 +14,7 @@ func (i *Handler) GetUser(c *fiber.Ctx) error { }) } - u, err := i.userService.GetUserByID(c.UserContext(), parsedRequestedUserID) + u, err := i.userService.GetLocalUserByID(c.UserContext(), parsedRequestedUserID) if err != nil { i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID) diff --git a/internal/handlers/user_handler/lysand_user_get.go b/internal/handlers/user_handler/lysand_user_get.go index ebdf06c..edf2345 100644 --- a/internal/handlers/user_handler/lysand_user_get.go +++ b/internal/handlers/user_handler/lysand_user_get.go @@ -14,7 +14,7 @@ func (i *Handler) GetLysandUser(c *fiber.Ctx) error { }) } - u, err := i.userService.GetUserByID(c.UserContext(), parsedRequestedUserID) + u, err := i.userService.GetLocalUserByID(c.UserContext(), parsedRequestedUserID) if err != nil { i.log.Error(err, "Failed to query user", "id", parsedRequestedUserID) diff --git a/internal/service/service.go b/internal/service/service.go index ed29fc9..4db69f5 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -19,7 +19,7 @@ type UserService interface { NewUser(ctx context.Context, username, password string) (*entity.User, error) - GetUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) + GetLocalUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) diff --git a/internal/service/svc_impls/note_service_impl.go b/internal/service/svc_impls/note_service_impl.go index 80076f1..2ca0dac 100644 --- a/internal/service/svc_impls/note_service_impl.go +++ b/internal/service/svc_impls/note_service_impl.go @@ -82,7 +82,7 @@ func (i NoteServiceImpl) CreateNote(ctx context.Context, req api_schema.CreateNo } func (i NoteServiceImpl) GetNote(ctx context.Context, id uuid.UUID) (*entity.Note, error) { - s := i.telemetry.StartSpan(ctx, "function", "svc_impls/NoteServiceImpl.GetUserByID") + s := i.telemetry.StartSpan(ctx, "function", "svc_impls/NoteServiceImpl.GetLocalUserByID") defer s.End() ctx = s.Context() diff --git a/internal/service/svc_impls/user_service_impl.go b/internal/service/svc_impls/user_service_impl.go index e1f557e..98b45aa 100644 --- a/internal/service/svc_impls/user_service_impl.go +++ b/internal/service/svc_impls/user_service_impl.go @@ -72,12 +72,12 @@ func (i UserServiceImpl) NewUser(ctx context.Context, username, password string) return user, nil } -func (i UserServiceImpl) GetUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) { - s := i.telemetry.StartSpan(ctx, "function", "svc_impls/UserServiceImpl.GetUserByID") +func (i UserServiceImpl) GetLocalUserByID(ctx context.Context, id uuid.UUID) (*entity.User, error) { + s := i.telemetry.StartSpan(ctx, "function", "svc_impls/UserServiceImpl.GetLocalUserByID") defer s.End() ctx = s.Context() - return i.repositories.Users().GetByID(ctx, id) + return i.repositories.Users().GetLocalByID(ctx, id) } func (i UserServiceImpl) GetWebfingerForUser(ctx context.Context, userID string) (*webfinger.User, error) {