mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-10-31 22:18:52 +00:00
[bugfix] Sort follows chronologically
The id on the follows table is not a ULID, but a random ID. Sorting on them results in a completely random order. Instead, sort on created_at, which sould result in a stable and intended sort order. Fixes: #2769
This commit is contained in:
parent
65b5366031
commit
4fd18919b8
2 changed files with 6 additions and 6 deletions
|
@ -331,7 +331,7 @@ func newSelectFollows(db *bun.DB, accountID string) *bun.SelectQuery {
|
|||
Table("follows").
|
||||
Column("id").
|
||||
Where("? = ?", bun.Ident("account_id"), accountID).
|
||||
OrderExpr("? DESC", bun.Ident("id"))
|
||||
OrderExpr("? DESC", bun.Ident("created_at"))
|
||||
}
|
||||
|
||||
// newSelectLocalFollows returns a new select query for all rows in the follows table with
|
||||
|
@ -349,7 +349,7 @@ func newSelectLocalFollows(db *bun.DB, accountID string) *bun.SelectQuery {
|
|||
Column("id").
|
||||
Where("? IS NULL", bun.Ident("domain")),
|
||||
).
|
||||
OrderExpr("? DESC", bun.Ident("id"))
|
||||
OrderExpr("? DESC", bun.Ident("created_at"))
|
||||
}
|
||||
|
||||
// newSelectFollowers returns a new select query for all rows in the follows table with target_account_id = accountID.
|
||||
|
@ -358,7 +358,7 @@ func newSelectFollowers(db *bun.DB, accountID string) *bun.SelectQuery {
|
|||
Table("follows").
|
||||
Column("id").
|
||||
Where("? = ?", bun.Ident("target_account_id"), accountID).
|
||||
OrderExpr("? DESC", bun.Ident("id"))
|
||||
OrderExpr("? DESC", bun.Ident("created_at"))
|
||||
}
|
||||
|
||||
// newSelectLocalFollowers returns a new select query for all rows in the follows table with
|
||||
|
@ -376,7 +376,7 @@ func newSelectLocalFollowers(db *bun.DB, accountID string) *bun.SelectQuery {
|
|||
Column("id").
|
||||
Where("? IS NULL", bun.Ident("domain")),
|
||||
).
|
||||
OrderExpr("? DESC", bun.Ident("id"))
|
||||
OrderExpr("? DESC", bun.Ident("created_at"))
|
||||
}
|
||||
|
||||
// newSelectBlocks returns a new select query for all rows in the blocks table with account_id = accountID.
|
||||
|
|
|
@ -47,8 +47,8 @@ func (suite *FollowingTestSuite) TestGetFollowing() {
|
|||
suite.Equal(`{
|
||||
"@context": "https://www.w3.org/ns/activitystreams",
|
||||
"items": [
|
||||
"http://localhost:8080/users/1happyturtle",
|
||||
"http://localhost:8080/users/admin"
|
||||
"http://localhost:8080/users/admin",
|
||||
"http://localhost:8080/users/1happyturtle"
|
||||
],
|
||||
"type": "Collection"
|
||||
}`, string(fJson))
|
||||
|
|
Loading…
Reference in a new issue