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

internal/db/bundb/account.go

@@ -217,10 +217,6 @@ func (a *accountDB) GetAccountStatuses(ctx context.Context, accountID string, li
 		q = q.Limit(limit)
 	}
 
-	if excludeReplies {
-		q = q.WhereGroup(" AND ", whereEmptyOrNull("in_reply_to_id"))
-	}
-
 	if pinnedOnly {
 		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 {
 		return nil, err
 	}

internal/db/bundb/instance.go

@@ -37,7 +37,9 @@ type instanceDB struct {
 func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int, db.Error) {
 	q := i.conn.
 		NewSelect().
-		Model(&[]*gtsmodel.Account{})
+		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
@@ -46,11 +48,6 @@ func (i *instanceDB) CountInstanceUsers(ctx context.Context, domain string) (int
 			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)
 
 	return count, processErrorResponse(err)

internal/db/bundb/relationship.go

@@ -237,7 +237,7 @@ func (r *relationshipDB) AcceptFollowRequest(ctx context.Context, originAccountI
 	if _, err := r.conn.
 		NewInsert().
 		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 {
 		return nil, processErrorResponse(err)
 	}