From 961fc6bfe95ccc9d67f1f0b7139221d30a56bd1f Mon Sep 17 00:00:00 2001 From: k srisri reddy <58304531+srisri332@users.noreply.github.com> Date: Fri, 29 Nov 2024 20:57:15 +0530 Subject: [PATCH] fix: MM-61260: handled errors to fix linting (#29340) Co-authored-by: Ibrahim Serdar Acikgoz --- server/.golangci.yml | 1 - server/channels/app/imports/import_validators.go | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index 9827d6a29d..3d17025592 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -91,7 +91,6 @@ issues: channels/app/file_test.go|\ channels/app/helper_test.go|\ channels/app/import_functions.go|\ - channels/app/imports/import_validators.go|\ channels/app/integration_action.go|\ channels/app/job_test.go|\ channels/app/migrations.go|\ diff --git a/server/channels/app/imports/import_validators.go b/server/channels/app/imports/import_validators.go index faff856c19..40748ff0af 100644 --- a/server/channels/app/imports/import_validators.go +++ b/server/channels/app/imports/import_validators.go @@ -501,14 +501,18 @@ func ValidatePostImportData(data *PostImportData, maxPostSize int) *model.AppErr if data.Reactions != nil { for _, reaction := range *data.Reactions { reaction := reaction - ValidateReactionImportData(&reaction, *data.CreateAt) + if err := ValidateReactionImportData(&reaction, *data.CreateAt); err != nil { + return err + } } } if data.Replies != nil { for _, reply := range *data.Replies { reply := reply - ValidateReplyImportData(&reply, *data.CreateAt, maxPostSize) + if err := ValidateReplyImportData(&reply, *data.CreateAt, maxPostSize); err != nil { + return err + } } } @@ -617,14 +621,18 @@ func ValidateDirectPostImportData(data *DirectPostImportData, maxPostSize int) * if data.Reactions != nil { for _, reaction := range *data.Reactions { reaction := reaction - ValidateReactionImportData(&reaction, *data.CreateAt) + if err := ValidateReactionImportData(&reaction, *data.CreateAt); err != nil { + return err + } } } if data.Replies != nil { for _, reply := range *data.Replies { reply := reply - ValidateReplyImportData(&reply, *data.CreateAt, maxPostSize) + if err := ValidateReplyImportData(&reply, *data.CreateAt, maxPostSize); err != nil { + return err + } } }