diff --git a/internal/db/bundb/interaction.go b/internal/db/bundb/interaction.go index 88a044b6f..a04e97905 100644 --- a/internal/db/bundb/interaction.go +++ b/internal/db/bundb/interaction.go @@ -302,9 +302,9 @@ func (i *interactionDB) GetInteractionsRequestsForAcct( bun.Ident("interaction_request"), ). // Select only interaction requests that - // are neither accepted or rejected yet, - // ie., without an Accept or Reject URI. - Where("? IS NULL", bun.Ident("uri")) + // are neither accepted or rejected yet. + Where("? IS NULL", bun.Ident("accepted_at")). + Where("? IS NULL", bun.Ident("rejected_at")) // Select interactions targeting status. if statusID != "" { diff --git a/internal/db/bundb/migrations/20241005100438_interaction_requests_pending_tweak.go b/internal/db/bundb/migrations/20241005100438_interaction_requests_pending_tweak.go new file mode 100644 index 000000000..4e405d4b3 --- /dev/null +++ b/internal/db/bundb/migrations/20241005100438_interaction_requests_pending_tweak.go @@ -0,0 +1,57 @@ +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +package migrations + +import ( + "context" + + "github.com/uptrace/bun" +) + +func init() { + up := func(ctx context.Context, db *bun.DB) error { + return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { + for idx, col := range map[string]string{ + "interaction_requests_accepted_at_idx": "accepted_at", + "interaction_requests_rejected_at_idx": "rejected_at", + } { + if _, err := tx. + NewCreateIndex(). + Table("interaction_requests"). + Index(idx). + Column(col). + IfNotExists(). + Exec(ctx); err != nil { + return err + } + } + + return nil + }) + } + + down := func(ctx context.Context, db *bun.DB) error { + return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { + return nil + }) + } + + if err := Migrations.Register(up, down); err != nil { + panic(err) + } +}