diff options
Diffstat (limited to 'internal/db/bundb/instance.go')
| -rw-r--r-- | internal/db/bundb/instance.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go index 006a76e24..4c47a96f4 100644 --- a/internal/db/bundb/instance.go +++ b/internal/db/bundb/instance.go @@ -20,7 +20,9 @@ package bundb import ( "context" + "github.com/sirupsen/logrus" + "github.com/spf13/viper" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" @@ -29,8 +31,7 @@ import ( ) type instanceDB struct { - config *config.Config - conn *DBConn + conn *DBConn } func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int, db.Error) { @@ -40,7 +41,8 @@ func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int Where("username != ?", domain). Where("? IS NULL", bun.Ident("suspended_at")) - if domain == i.config.Host { + host := viper.GetString(config.Keys.Host) + if domain == host { // if the domain is *this* domain, just count where the domain field is null q = q.WhereGroup(" AND ", whereEmptyOrNull("domain")) } else { @@ -59,7 +61,8 @@ func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) ( NewSelect(). Model(&[]*gtsmodel.Status{}) - if domain == i.config.Host { + host := viper.GetString(config.Keys.Host) + if domain == host { // if the domain is *this* domain, just count where local is true q = q.Where("local = ?", true) } else { @@ -80,7 +83,8 @@ func (i *instanceDB) CountInstanceDomains(ctx context.Context, domain string) (i NewSelect(). Model(&[]*gtsmodel.Instance{}) - if domain == i.config.Host { + host := viper.GetString(config.Keys.Host) + if domain == host { // if the domain is *this* domain, just count other instances it knows about // exclude domains that are blocked q = q. |