mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-14 07:47:28 -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/instance.go
View file

@ -41,7 +41,7 @@ func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int
if domain == i.config.Host {
// if the domain is *this* domain, just count where the domain field is null
q = q.Where("? IS NULL", bun.Ident("domain"))
q = q.WhereGroup(" AND ", whereEmptyOrNull("domain"))
} else {
q = q.Where("domain = ?", domain)
}
@ -83,7 +83,9 @@ func (i *instanceDB) CountInstanceDomains(ctx context.Context, domain string) (i
if domain == i.config.Host {
// if the domain is *this* domain, just count other instances it knows about
// exclude domains that are blocked
q = q.Where("domain != ?", domain).Where("? IS NULL", bun.Ident("suspended_at"))
q = q.
Where("domain != ?", domain).
Where("? IS NULL", bun.Ident("suspended_at"))
} else {
// TODO: implement federated domain counting properly for remote domains
return 0, nil