qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-12-01 16:12:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some more little fixes for all to enjoy (#161)

Browse source
This commit is contained in:
tobi 2021-08-26 22:06:34 +02:00 committed by GitHub
parent 2162f21636
commit 30f688dbe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/db/bundb/account.go
View file

@ -217,10 +217,6 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
q = q.Limit(limit) q = q.Limit(limit)
} }
if excludeReplies {
q = q.WhereGroup(" AND ", whereEmptyOrNull("in_reply_to_id"))
}
if pinnedOnly { if pinnedOnly {
q = q.Where("pinned = ?", true) q = q.Where("pinned = ?", true)
} }
@ -237,6 +233,10 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
}) })
} }
if excludeReplies {
q = q.WhereGroup(" AND ", whereEmptyOrNull("in_reply_to_id"))
}
if err := q.Scan(ctx); err != nil { if err := q.Scan(ctx); err != nil {
return nil, err return nil, err
} }

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

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

2
internal/db/bundb/relationship.go
View file

@ -237,7 +237,7 @@ func (r *relationshipDB) AcceptFollowRequest(ctx context.Context, originAccountI
if _, err := r.conn. if _, err := r.conn.
NewInsert(). NewInsert().
Model(follow). Model(follow).
On("CONFLICT CONSTRAINT follows_account_id_target_account_id_key DO UPDATE set uri = ?", follow.URI). On("CONFLICT ON CONSTRAINT follows_account_id_target_account_id_key DO UPDATE set uri = ?", follow.URI).
Exec(ctx); err != nil { Exec(ctx); err != nil {
return nil, processErrorResponse(err) return nil, processErrorResponse(err)
} }