Mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-01 06:50:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

stop paged endpoints returning null for empty items (#2597)

Browse source
This commit is contained in:
kim 2024-02-01 12:45:02 +00:00 committed by GitHub
parent b614d33c40
commit c13eb87ae7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/processing/account/block.go
View file

@ -151,6 +151,11 @@ func (p *Processor) BlocksGet(
return util.EmptyPageableResponse(), nil 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) items := make([]interface{}, 0, count)
for _, block := range blocks { for _, block := range blocks {
@ -165,11 +170,6 @@ func (p *Processor) BlocksGet(
items = append(items, account) 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{ return paging.PackageResponse(paging.ResponseParams{
Items: items, Items: items,
Path: "/api/v1/blocks", Path: "/api/v1/blocks",

3
internal/processing/common/account.go.go
View file

@ -201,9 +201,6 @@ func (p *Processor) GetVisibleAPIAccountsPaged(
length int, length int,
) []interface{} { ) []interface{} {
accounts := p.getVisibleAPIAccounts(ctx, 3, requester, next, length) accounts := p.getVisibleAPIAccounts(ctx, 3, requester, next, length)
if len(accounts) == 0 {
return nil
}
items := make([]interface{}, len(accounts)) items := make([]interface{}, len(accounts))
for i, account := range accounts { for i, account := range accounts {
items[i] = account items[i] = account