diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-07-07 11:34:12 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-07-07 11:34:12 +0200 |
| commit | e70bf8a6c82e3d5c943550b364fc6f8120f6f07e (patch) | |
| tree | f408ccff2e6f2451bf95ee9a5d96e5b678d686d5 /internal/api/client/admin/domainblockget.go | |
| parent | [chore/performance] Remove remaining 'whereEmptyOrNull' funcs (#1946) (diff) | |
| download | gotosocial-e70bf8a6c82e3d5c943550b364fc6f8120f6f07e.tar.xz | |
[chore/bugfix] Domain block tidying up, Implement first pass of `207 Multi-Status` (#1886)
* [chore/refactor] update domain block processing
* expose domain block import errors a lil better
* move/remove unused query keys
Diffstat (limited to 'internal/api/client/admin/domainblockget.go')
| -rw-r--r-- | internal/api/client/admin/domainblockget.go | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/internal/api/client/admin/domainblockget.go b/internal/api/client/admin/domainblockget.go index 335faed90..87bb75a27 100644 --- a/internal/api/client/admin/domainblockget.go +++ b/internal/api/client/admin/domainblockget.go @@ -18,10 +18,8 @@ package admin import ( - "errors" "fmt" "net/http" - "strconv" "github.com/gin-gonic/gin" apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" @@ -87,26 +85,19 @@ func (m *Module) DomainBlockGETHandler(c *gin.Context) { return } - domainBlockID := c.Param(IDKey) - if domainBlockID == "" { - err := errors.New("no domain block id specified") - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) + domainBlockID, errWithCode := apiutil.ParseID(c.Param(apiutil.IDKey)) + if errWithCode != nil { + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) return } - export := false - exportString := c.Query(ExportQueryKey) - if exportString != "" { - i, err := strconv.ParseBool(exportString) - if err != nil { - err := fmt.Errorf("error parsing %s: %s", ExportQueryKey, err) - apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) - return - } - export = i + export, errWithCode := apiutil.ParseDomainBlockExport(c.Query(apiutil.DomainBlockExportKey), false) + if errWithCode != nil { + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) + return } - domainBlock, errWithCode := m.processor.Admin().DomainBlockGet(c.Request.Context(), authed.Account, domainBlockID, export) + domainBlock, errWithCode := m.processor.Admin().DomainBlockGet(c.Request.Context(), domainBlockID, export) if errWithCode != nil { apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) return |