From ac564c18624aea229defc38bc1cc516d6c787520 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Fri, 7 Jul 2023 14:58:53 +0200 Subject: [bugfix] Reorder web view logic, other small fixes (#1954) --- internal/api/util/parsequery.go | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'internal/api/util/parsequery.go') diff --git a/internal/api/util/parsequery.go b/internal/api/util/parsequery.go index f5966bca1..59b07f7ee 100644 --- a/internal/api/util/parsequery.go +++ b/internal/api/util/parsequery.go @@ -43,6 +43,11 @@ const ( SearchResolveKey = "resolve" SearchTypeKey = "type" + /* Web endpoint keys */ + + WebUsernameKey = "username" + WebStatusIDKey = "status" + /* Domain block keys */ DomainBlockExportKey = "export" @@ -75,6 +80,14 @@ func ParseLocal(value string, defaultValue bool) (bool, gtserror.WithCode) { return parseBool(value, defaultValue, LocalKey) } +func ParseMaxID(value string, defaultValue string) string { + if value == "" { + return defaultValue + } + + return value +} + func ParseSearchExcludeUnreviewed(value string, defaultValue bool) (bool, gtserror.WithCode) { return parseBool(value, defaultValue, SearchExcludeUnreviewedKey) } @@ -133,6 +146,26 @@ func ParseSearchQuery(value string) (string, gtserror.WithCode) { return value, nil } +func ParseWebUsername(value string) (string, gtserror.WithCode) { + key := WebUsernameKey + + if value == "" { + return "", requiredError(key) + } + + return value, nil +} + +func ParseWebStatusID(value string) (string, gtserror.WithCode) { + key := WebStatusIDKey + + if value == "" { + return "", requiredError(key) + } + + return value, nil +} + /* Internal functions */ -- cgit v1.2.3