diff --git a/internal/api/client/lists/listaccounts_test.go b/internal/api/client/lists/listaccounts_test.go index bbd187f7d..e0a16e29f 100644 --- a/internal/api/client/lists/listaccounts_test.go +++ b/internal/api/client/lists/listaccounts_test.go @@ -19,7 +19,7 @@ package lists_test import ( "encoding/json" - "io/ioutil" + "io" "net/http" "net/http/httptest" "strconv" @@ -97,7 +97,7 @@ func (suite *ListAccountsTestSuite) getListAccounts( result := recorder.Result() defer result.Body.Close() - b, err := ioutil.ReadAll(result.Body) + b, err := io.ReadAll(result.Body) if err != nil { return nil, "", err } @@ -151,8 +151,7 @@ func (suite *ListAccountsTestSuite) TestGetListAccountsPaginatedDefaultLimit() { suite.Len(accounts, 2) suite.Equal( - `; rel="next", `+ - `; rel="prev"`, + "; rel=\"next\", ; rel=\"prev\"", link, ) } @@ -184,8 +183,7 @@ func (suite *ListAccountsTestSuite) TestGetListAccountsPaginatedNextPage() { suite.Len(accounts, 1) suite.Equal( - `; rel="next", `+ - `; rel="prev"`, + "; rel=\"next\", ; rel=\"prev\"", link, ) @@ -206,8 +204,7 @@ func (suite *ListAccountsTestSuite) TestGetListAccountsPaginatedNextPage() { suite.Len(accounts, 1) suite.Equal( - `; rel="next", `+ - `; rel="prev"`, + "; rel=\"next\", ; rel=\"prev\"", link, ) } diff --git a/internal/api/client/lists/listaccountsadd_test.go b/internal/api/client/lists/listaccountsadd_test.go index 1d0d37c37..e71cf0992 100644 --- a/internal/api/client/lists/listaccountsadd_test.go +++ b/internal/api/client/lists/listaccountsadd_test.go @@ -98,7 +98,7 @@ func (suite *ListAccountsAddTestSuite) TestPostListAccountNotFollowed() { resp, err := suite.postListAccounts(http.StatusNotFound, listID, accountIDs) suite.NoError(err) - suite.Equal(`{"error":"Not Found: you do not follow account 01F8MH5ZK5VRH73AKHQM6Y9VNX"}`, string(resp)) + suite.Equal(`{"error":"Not Found: account 01F8MH5ZK5VRH73AKHQM6Y9VNX not currently followed"}`, string(resp)) } func (suite *ListAccountsAddTestSuite) TestPostListAccountOK() { diff --git a/internal/db/bundb/list.go b/internal/db/bundb/list.go index 6659f15f9..05ea1281c 100644 --- a/internal/db/bundb/list.go +++ b/internal/db/bundb/list.go @@ -296,7 +296,7 @@ func (l *listDB) GetAccountIDsInList(ctx context.Context, listID string, page *p Join("INNER JOIN ?", bun.Ident("list_entries")). JoinOn("? = ?", bun.Ident("follows.id"), bun.Ident("list_entries.follow_id")). Where("? = ?", bun.Ident("list_entries.list_id"), listID). - OrderExpr("? DESC", bun.Ident("list_entries.created_at")). + OrderExpr("? DESC", bun.Ident("list_entries.id")). Exec(ctx, &accountIDs) if err != nil && !errors.Is(err, db.ErrNoEntries) { return nil, err diff --git a/internal/processing/list/updateentries.go b/internal/processing/list/updateentries.go index b876695be..c15248f39 100644 --- a/internal/processing/list/updateentries.go +++ b/internal/processing/list/updateentries.go @@ -86,7 +86,7 @@ func (p *Processor) AddToList(ctx context.Context, account *gtsmodel.Account, li if follow == nil { text := fmt.Sprintf("account %s not currently followed", targetAccountID) - return gtserror.NewErrorUnprocessableEntity(errors.New(text), text) + return gtserror.NewErrorNotFound(errors.New(text), text) } // Generate new entry for this follow in list.