From ddc120d5e6e0f18f235a6b5bbe5ceec86efedc41 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 26 Aug 2021 11:28:16 +0200 Subject: fix public timeline bug (#150) --- internal/db/bundb/admin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal/db/bundb/admin.go') diff --git a/internal/db/bundb/admin.go b/internal/db/bundb/admin.go index 67a1e8a0d..09f2d3bff 100644 --- a/internal/db/bundb/admin.go +++ b/internal/db/bundb/admin.go @@ -97,7 +97,7 @@ func (a *adminDB) NewSignup(ctx context.Context, username string, reason string, err = a.conn.NewSelect(). Model(acct). Where("username = ?", username). - Where("? IS NULL", bun.Ident("domain")). + WhereGroup(" AND ", whereEmptyOrNull("domain")). Scan(ctx) if err != nil { // we just don't have an account yet create one @@ -181,7 +181,7 @@ func (a *adminDB) CreateInstanceAccount(ctx context.Context) db.Error { NewSelect(). Model(>smodel.Account{}). Where("username = ?", username). - Where("? IS NULL", bun.Ident("domain")) + WhereGroup(" AND ", whereEmptyOrNull("domain")) count, err := existsQ.Count(ctx) if err != nil && count == 1 { a.log.Infof("instance account %s already exists", username) -- cgit v1.2.3