mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-26 01:33:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix public timeline bug (#150)

Browse source
This commit is contained in:
tobi 2021-08-26 11:28:16 +02:00 • committed by GitHub
commit ddc120d5e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 162 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/db/bundb/relationship.go
View file

@ -294,18 +294,10 @@ func (r *relationshipDB) GetAccountFollowedBy(ctx context.Context, accountID str
Model(&follows)
if localOnly {
// for local accounts let's get where domain is null OR where domain is an empty string, just to be safe
whereGroup := func(q *bun.SelectQuery) *bun.SelectQuery {
q = q.
WhereOr("? IS NULL", bun.Ident("a.domain")).
WhereOr("a.domain = ?", "")
return q
}
q = q.ColumnExpr("follow.*").
Join("JOIN accounts AS a ON follow.account_id = TEXT(a.id)").
Where("follow.target_account_id = ?", accountID).
WhereGroup(" AND ", whereGroup)
WhereGroup(" AND ", whereEmptyOrNull("a.domain"))
} else {
q = q.Where("target_account_id = ?", accountID)
}