From 715ff0eb7fb28a3e5a5f505d3d84d4a2c70926d6 Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Wed, 1 May 2024 15:23:39 +0200 Subject: [PATCH] remove unused & fix wording --- models/forgefed/activity.go | 4 ++-- models/forgefed/actor_test.go | 2 +- modules/validation/validatable.go | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/models/forgefed/activity.go b/models/forgefed/activity.go index ae3b1493d0..c1ca57c4a8 100644 --- a/models/forgefed/activity.go +++ b/models/forgefed/activity.go @@ -47,12 +47,12 @@ func (like ForgeLike) Validate() []string { result = append(result, validation.ValidateNotEmpty(string(like.Type), "type")...) result = append(result, validation.ValidateOneOf(string(like.Type), []any{"Like"}, "type")...) if like.Actor == nil { - result = append(result, "Actor my not be nil.") + result = append(result, "Actor should not be nil.") } else { result = append(result, validation.ValidateNotEmpty(like.Actor.GetID().String(), "actor")...) } if like.Object == nil { - result = append(result, "Object my not be nil.") + result = append(result, "Object should not be nil.") } else { result = append(result, validation.ValidateNotEmpty(like.Object.GetID().String(), "object")...) } diff --git a/models/forgefed/actor_test.go b/models/forgefed/actor_test.go index 88d2867429..9a1dbd4c3d 100644 --- a/models/forgefed/actor_test.go +++ b/models/forgefed/actor_test.go @@ -66,7 +66,7 @@ func TestActorIdValidation(t *testing.T) { sut.Host = "an.other.host" sut.Port = "" sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/" - if sut.Validate()[0] != "Field userId should not be empty" { + if sut.Validate()[0] != "userId should not be empty" { t.Errorf("validation error expected but was: %v\n", sut.Validate()) } diff --git a/modules/validation/validatable.go b/modules/validation/validatable.go index f4f3d04da0..fc38ad2524 100644 --- a/modules/validation/validatable.go +++ b/modules/validation/validatable.go @@ -65,7 +65,3 @@ func ValidateOneOf(value any, allowed []any, name string) []string { } return []string{fmt.Sprintf("Value %v is not contained in allowed values %v", value, allowed)} } - -func ValidateSuffix(str, suffix string) bool { - return strings.HasSuffix(str, suffix) -}