diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2024-02-01 12:45:02 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-02-01 12:45:02 +0000 |
| commit | c13eb87ae73ac1ba78e22fd3a6fd547038cb23cb (patch) | |
| tree | 8e518c7e9de86018b4e09aa26efa29f9964bec40 /internal/processing | |
| parent | [feature] Try HTTP signature validation with and without query params for inc... (diff) | |
| download | gotosocial-c13eb87ae73ac1ba78e22fd3a6fd547038cb23cb.tar.xz | |
stop paged endpoints returning null for empty items (#2597)
Diffstat (limited to 'internal/processing')
| -rw-r--r-- | internal/processing/account/block.go | 10 | ||||
| -rw-r--r-- | internal/processing/common/account.go.go | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/internal/processing/account/block.go b/internal/processing/account/block.go index 58b0328a4..49f81557d 100644 --- a/internal/processing/account/block.go +++ b/internal/processing/account/block.go @@ -151,6 +151,11 @@ func (p *Processor) BlocksGet( return util.EmptyPageableResponse(), nil } + // Get the lowest and highest + // ID values, used for paging. + lo := blocks[count-1].ID + hi := blocks[0].ID + items := make([]interface{}, 0, count) for _, block := range blocks { @@ -165,11 +170,6 @@ func (p *Processor) BlocksGet( items = append(items, account) } - // Get the lowest and highest - // ID values, used for paging. - lo := blocks[count-1].ID - hi := blocks[0].ID - return paging.PackageResponse(paging.ResponseParams{ Items: items, Path: "/api/v1/blocks", diff --git a/internal/processing/common/account.go.go b/internal/processing/common/account.go.go index c4436e77e..f4bd06e76 100644 --- a/internal/processing/common/account.go.go +++ b/internal/processing/common/account.go.go @@ -201,9 +201,6 @@ func (p *Processor) GetVisibleAPIAccountsPaged( length int, ) []interface{} { accounts := p.getVisibleAPIAccounts(ctx, 3, requester, next, length) - if len(accounts) == 0 { - return nil - } items := make([]interface{}, len(accounts)) for i, account := range accounts { items[i] = account |