mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-11-22 01:05:53 +03:00
[bugfix] Update select of pending interaction requests to account for potential nil URI (#3392)
This commit is contained in:
parent
36abd568b1
commit
c33b1e89c1
2 changed files with 60 additions and 3 deletions
|
@ -302,9 +302,9 @@ func (i *interactionDB) GetInteractionsRequestsForAcct(
|
||||||
bun.Ident("interaction_request"),
|
bun.Ident("interaction_request"),
|
||||||
).
|
).
|
||||||
// Select only interaction requests that
|
// Select only interaction requests that
|
||||||
// are neither accepted or rejected yet,
|
// are neither accepted or rejected yet.
|
||||||
// ie., without an Accept or Reject URI.
|
Where("? IS NULL", bun.Ident("accepted_at")).
|
||||||
Where("? IS NULL", bun.Ident("uri"))
|
Where("? IS NULL", bun.Ident("rejected_at"))
|
||||||
|
|
||||||
// Select interactions targeting status.
|
// Select interactions targeting status.
|
||||||
if statusID != "" {
|
if statusID != "" {
|
||||||
|
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue