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

Merge remote-tracking branch 'upstream/main' into feature/add-sqlite-support

Browse source
This commit is contained in:
kim (grufwub) 2021-08-26 21:07:42 +01:00
commit b654a1235a
3 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/db/bundb/instance.go
View file

@ -37,20 +37,17 @@ type instanceDB struct {
func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int, db.Error) {
q := i.conn.
NewSelect().
Model(&[]*gtsmodel.Account{})
if domain == i.config.Host {
// if the domain is *this* domain, just count where the domain field is null
q = q.WhereGroup(" AND ", whereEmptyOrNull("domain"))
} else {
q = q.Where("domain = ?", domain)
}
// don't count the instance account or suspended users
q = q.
Model(&[]*gtsmodel.Account{}).
Where("username != ?", domain).
Where("? IS NULL", bun.Ident("suspended_at"))
if domain == i.config.Host {
// if the domain is *this* domain, just count where the domain field is null
q = q.WhereGroup(" AND ", whereEmptyOrNull("domain"))
} else {
q = q.Where("domain = ?", domain)
}
count, err := q.Count(ctx)
return count, i.conn.ProcessError(err)