mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-28 08:23:33 -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

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

@ -110,7 +110,7 @@ func (a *accountDB) GetInstanceAccount(ctx context.Context, domain string) (*gts
} else {
q = q.
Where("account.username = ?", domain).
Where("? IS NULL", bun.Ident("domain"))
WhereGroup(" AND ", whereEmptyOrNull("domain"))
}
err := processErrorResponse(q.Scan(ctx))
@ -172,7 +172,7 @@ func (a *accountDB) GetLocalAccountByUsername(ctx context.Context, username stri
q := a.newAccountQ(account).
Where("username = ?", username).
Where("? IS NULL", bun.Ident("domain"))
WhereGroup(" AND ", whereEmptyOrNull("domain"))
err := processErrorResponse(q.Scan(ctx))
@ -218,7 +218,7 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
}
if excludeReplies {
q = q.Where("? IS NULL", bun.Ident("in_reply_to_id"))
q = q.WhereGroup(" AND ", whereEmptyOrNull("in_reply_to_id"))
}
if pinnedOnly {