summaryrefslogtreecommitdiff
path: root/internal/db/bundb/account.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/db/bundb/account.go')
-rw-r--r--internal/db/bundb/account.go17
1 files changed, 3 insertions, 14 deletions
diff --git a/internal/db/bundb/account.go b/internal/db/bundb/account.go
index f46143401..7bee375e3 100644
--- a/internal/db/bundb/account.go
+++ b/internal/db/bundb/account.go
@@ -91,11 +91,13 @@ func (a *accountDB) GetAccountByUsernameDomain(ctx context.Context, username str
return a.cache.GetByUsernameDomain(username, domain)
},
func(account *gtsmodel.Account) error {
- q := a.newAccountQ(account).Where("account.username = ?", username)
+ q := a.newAccountQ(account)
if domain != "" {
+ q = q.Where("account.username = ?", username)
q = q.Where("account.domain = ?", domain)
} else {
+ q = q.Where("account.username = ?", strings.ToLower(username))
q = q.Where("account.domain IS NULL")
}
@@ -217,19 +219,6 @@ func (a *accountDB) SetAccountHeaderOrAvatar(ctx context.Context, mediaAttachmen
return nil
}
-func (a *accountDB) GetLocalAccountByUsername(ctx context.Context, username string) (*gtsmodel.Account, db.Error) {
- account := new(gtsmodel.Account)
-
- q := a.newAccountQ(account).
- Where("username = ?", strings.ToLower(username)). // usernames on our instance will always be lowercase
- WhereGroup(" AND ", whereEmptyOrNull("domain"))
-
- if err := q.Scan(ctx); err != nil {
- return nil, a.conn.ProcessError(err)
- }
- return account, nil
-}
-
func (a *accountDB) GetAccountFaves(ctx context.Context, accountID string) ([]*gtsmodel.StatusFave, db.Error) {
faves := new([]*gtsmodel.StatusFave)