delete more stuff when an account is gone

internal/db/db.go

@@ -150,11 +150,11 @@ type DB interface {
 	// CountStatusesByAccountID is a shortcut for the common action of counting statuses produced by accountID.
 	CountStatusesByAccountID(accountID string) (int, error)
 
-	// GetStatusesByTimeDescending is a shortcut for getting the most recent statuses. accountID is optional, if not provided
+	// GetStatusesForAccount is a shortcut for getting the most recent statuses. accountID is optional, if not provided
 	// then all statuses will be returned. If limit is set to 0, the size of the returned slice will not be limited. This can
 	// be very memory intensive so you probably shouldn't do this!
 	// In case of no entries, a 'no entries' error will be returned
-	GetStatusesByTimeDescending(accountID string, statuses *[]gtsmodel.Status, limit int, excludeReplies bool, maxID string, pinned bool, mediaOnly bool) error
+	GetStatusesForAccount(accountID string, limit int, excludeReplies bool, maxID string, pinnedOnly bool, mediaOnly bool) ([]*gtsmodel.Status, error)
 
 	// GetLastStatusForAccountID simply gets the most recent status by the given account.
 	// The given slice 'status' pointer will be set to the result of the query, whatever it is.

internal/db/pg/pg.go

@@ -511,39 +511,43 @@ func (ps *postgresService) CountStatusesByAccountID(accountID string) (int, erro
 	return count, nil
 }
 
-func (ps *postgresService) GetStatusesByTimeDescending(accountID string, statuses *[]gtsmodel.Status, limit int, excludeReplies bool, maxID string, pinned bool, mediaOnly bool) error {
-	q := ps.conn.Model(statuses).Order("created_at DESC")
+func (ps *postgresService) GetStatusesForAccount(accountID string, limit int, excludeReplies bool, maxID string, pinnedOnly bool, mediaOnly bool) ([]*gtsmodel.Status, error) {
+	statuses := []*gtsmodel.Status{}
+
+	q := ps.conn.Model(&statuses).Order("id DESC")
 	if accountID != "" {
 		q = q.Where("account_id = ?", accountID)
 	}
+
 	if limit != 0 {
 		q = q.Limit(limit)
 	}
+
 	if excludeReplies {
 		q = q.Where("? IS NULL", pg.Ident("in_reply_to_id"))
 	}
-	if pinned {
+
+	if pinnedOnly {
 		q = q.Where("pinned = ?", true)
 	}
+
 	if mediaOnly {
 		q = q.WhereGroup(func(q *pg.Query) (*pg.Query, error) {
 			return q.Where("? IS NOT NULL", pg.Ident("attachments")).Where("attachments != '{}'"), nil
 		})
 	}
+
 	if maxID != "" {
-		s := &gtsmodel.Status{}
-		if err := ps.conn.Model(s).Where("id = ?", maxID).Select(); err != nil {
-			return err
-		}
-		q = q.Where("status.created_at < ?", s.CreatedAt)
+		q = q.Where("id < ?", maxID)
 	}
+
 	if err := q.Select(); err != nil {
 		if err == pg.ErrNoRows {
-			return db.ErrNoEntries{}
+			return nil, db.ErrNoEntries{}
 		}
-		return err
+		return nil, err
 	}
-	return nil
+	return statuses, nil
 }
 
 func (ps *postgresService) GetLastStatusForAccountID(accountID string, status *gtsmodel.Status) error {