mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-30 07:26:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ensure returned ID lists are ordered correctly

Browse source
This commit is contained in:
kim 2024-09-12 11:58:13 +01:00
commit e5c27a9fea
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/db/bundb/list.go
View file

@ -248,6 +248,7 @@ func (l *listDB) getListIDsByAccountID(ctx context.Context, accountID string) ([
Table("lists").
Column("id").
Where("? = ?", bun.Ident("account_id"), accountID).
OrderExpr("? DESC", bun.Ident("created_at")).
Exec(ctx, &listIDs); err != nil &&
!errors.Is(err, db.ErrNoEntries) {
return nil, err
@ -267,6 +268,7 @@ func (l *listDB) getListIDsWithFollowID(ctx context.Context, followID string) ([
Table("list_entries").
Column("list_id").
Where("? = ?", bun.Ident("follow_id"), followID).
OrderExpr("? DESC", bun.Ident("created_at")).
Exec(ctx, &listIDs); err != nil &&
!errors.Is(err, db.ErrNoEntries) {
return nil, err
@ -286,6 +288,7 @@ func (l *listDB) GetFollowIDsInList(ctx context.Context, listID string, page *pa
Table("list_entries").
Column("follow_id").
Where("? = ?", bun.Ident("list_id"), listID).
OrderExpr("? DESC", bun.Ident("created_at")).
Exec(ctx, &followIDs)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, err
@ -307,6 +310,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")).
Exec(ctx, &accountIDs)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, err

6
internal/db/bundb/tag.go
View file

@ -197,12 +197,6 @@ func (t *tagDB) IsAccountFollowingTag(ctx context.Context, accountID string, tag
if err != nil {
return false, err
}
// NOTE: it should only become useful to cache
// FollowedTag{} objects separately here (for
// caching by AccountID.TagID) only if the number
// of accounts following a tag becomes rather ridiculous,
// i.e. in the order of thousands. So we should be good.
return slices.Contains(followingTagIDs, tagID), nil
}