diff options
author | 2024-09-10 14:34:49 +0200 | |
---|---|---|
committer | 2024-09-10 12:34:49 +0000 | |
commit | 307d98e3862b6e867eea524b81d5428b03e6607c (patch) | |
tree | b990378c5452f5779b85bd0d769db77a78f93600 /internal/db | |
parent | [chore] status dereferencing improvements (#3255) (diff) | |
download | gotosocial-307d98e3862b6e867eea524b81d5428b03e6607c.tar.xz |
[feature] Process `Reject` of interaction via fedi API, put rejected statuses in the "sin bin" 😈 (#3271)
* [feature] Process `Reject` of interaction via fedi API, put rejected statuses in the "sin bin"
* update test
* move nil check back to `rejectStatusIRI`
Diffstat (limited to 'internal/db')
-rw-r--r-- | internal/db/bundb/bundb.go | 5 | ||||
-rw-r--r-- | internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go | 67 | ||||
-rw-r--r-- | internal/db/bundb/sinbinstatus.go | 122 | ||||
-rw-r--r-- | internal/db/db.go | 1 | ||||
-rw-r--r-- | internal/db/sinbinstatus.go | 41 |
5 files changed, 236 insertions, 0 deletions
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go index 6ecd43cbc..45607ea15 100644 --- a/internal/db/bundb/bundb.go +++ b/internal/db/bundb/bundb.go @@ -76,6 +76,7 @@ type DBService struct { db.Rule db.Search db.Session + db.SinBinStatus db.Status db.StatusBookmark db.StatusFave @@ -271,6 +272,10 @@ func NewBunDBService(ctx context.Context, state *state.State) (db.DB, error) { Session: &sessionDB{ db: db, }, + SinBinStatus: &sinBinStatusDB{ + db: db, + state: state, + }, Status: &statusDB{ db: db, state: state, diff --git a/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go b/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go new file mode 100644 index 000000000..d97d35372 --- /dev/null +++ b/internal/db/bundb/migrations/20240904084406_fedi_api_reject_interaction.go @@ -0,0 +1,67 @@ +// 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/superseriousbusiness/gotosocial/internal/gtsmodel" + "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 { + if _, err := tx. + NewCreateTable(). + Model(>smodel.SinBinStatus{}). + IfNotExists(). + Exec(ctx); err != nil { + return err + } + + for idx, col := range map[string]string{ + "sin_bin_statuses_account_uri_idx": "account_uri", + "sin_bin_statuses_domain_idx": "domain", + "sin_bin_statuses_in_reply_to_uri_idx": "in_reply_to_uri", + } { + if _, err := tx. + NewCreateIndex(). + Table("sin_bin_statuses"). + 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) + } +} diff --git a/internal/db/bundb/sinbinstatus.go b/internal/db/bundb/sinbinstatus.go new file mode 100644 index 000000000..5fc368022 --- /dev/null +++ b/internal/db/bundb/sinbinstatus.go @@ -0,0 +1,122 @@ +// 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 bundb + +import ( + "context" + "time" + + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/state" + "github.com/uptrace/bun" +) + +type sinBinStatusDB struct { + db *bun.DB + state *state.State +} + +func (s *sinBinStatusDB) GetSinBinStatusByID(ctx context.Context, id string) (*gtsmodel.SinBinStatus, error) { + return s.getSinBinStatus( + "ID", + func(sbStatus *gtsmodel.SinBinStatus) error { + return s.db. + NewSelect(). + Model(sbStatus). + Where("? = ?", bun.Ident("sin_bin_status.id"), id). + Scan(ctx) + }, + id, + ) +} + +func (s *sinBinStatusDB) GetSinBinStatusByURI(ctx context.Context, uri string) (*gtsmodel.SinBinStatus, error) { + return s.getSinBinStatus( + "URI", + func(sbStatus *gtsmodel.SinBinStatus) error { + return s.db. + NewSelect(). + Model(sbStatus). + Where("? = ?", bun.Ident("sin_bin_status.uri"), uri). + Scan(ctx) + }, + uri, + ) +} + +func (s *sinBinStatusDB) getSinBinStatus( + lookup string, + dbQuery func(*gtsmodel.SinBinStatus) error, + keyParts ...any, +) (*gtsmodel.SinBinStatus, error) { + // Fetch from database cache with loader callback. + return s.state.Caches.DB.SinBinStatus.LoadOne(lookup, func() (*gtsmodel.SinBinStatus, error) { + // Not cached! Perform database query. + sbStatus := new(gtsmodel.SinBinStatus) + if err := dbQuery(sbStatus); err != nil { + return nil, err + } + + return sbStatus, nil + }, keyParts...) +} + +func (s *sinBinStatusDB) PutSinBinStatus(ctx context.Context, sbStatus *gtsmodel.SinBinStatus) error { + return s.state.Caches.DB.SinBinStatus.Store(sbStatus, func() error { + _, err := s.db. + NewInsert(). + Model(sbStatus). + Exec(ctx) + return err + }) +} + +func (s *sinBinStatusDB) UpdateSinBinStatus( + ctx context.Context, + sbStatus *gtsmodel.SinBinStatus, + columns ...string, +) error { + sbStatus.UpdatedAt = time.Now() + if len(columns) > 0 { + // If we're updating by column, + // ensure "updated_at" is included. + columns = append(columns, "updated_at") + } + + return s.state.Caches.DB.SinBinStatus.Store(sbStatus, func() error { + _, err := s.db. + NewUpdate(). + Model(sbStatus). + Column(columns...). + Where("? = ?", bun.Ident("sin_bin_status.id"), sbStatus.ID). + Exec(ctx) + return err + }) +} + +func (s *sinBinStatusDB) DeleteSinBinStatusByID(ctx context.Context, id string) error { + // On return ensure status invalidated from cache. + defer s.state.Caches.DB.SinBinStatus.Invalidate("ID", id) + + _, err := s.db. + NewDelete(). + TableExpr("? AS ?", bun.Ident("sin_bin_statuses"), bun.Ident("sin_bin_status")). + Where("? = ?", bun.Ident("sin_bin_status.id"), id). + Exec(ctx) + return err +} diff --git a/internal/db/db.go b/internal/db/db.go index cd621871a..c42985912 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -48,6 +48,7 @@ type DB interface { Rule Search Session + SinBinStatus Status StatusBookmark StatusFave diff --git a/internal/db/sinbinstatus.go b/internal/db/sinbinstatus.go new file mode 100644 index 000000000..16abcf8bd --- /dev/null +++ b/internal/db/sinbinstatus.go @@ -0,0 +1,41 @@ +// 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 db + +import ( + "context" + + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +) + +type SinBinStatus interface { + // GetSinBinStatusByID fetches the sin bin status from the database with matching id column. + GetSinBinStatusByID(ctx context.Context, id string) (*gtsmodel.SinBinStatus, error) + + // GetSinBinStatusByURI fetches the sin bin status from the database with matching uri column. + GetSinBinStatusByURI(ctx context.Context, uri string) (*gtsmodel.SinBinStatus, error) + + // PutSinBinStatus stores one sin bin status in the database. + PutSinBinStatus(ctx context.Context, sbStatus *gtsmodel.SinBinStatus) error + + // UpdateSinBinStatus updates one sin bin status in the database. + UpdateSinBinStatus(ctx context.Context, sbStatus *gtsmodel.SinBinStatus, columns ...string) error + + // DeleteSinBinStatusByID deletes one sin bin status from the database. + DeleteSinBinStatusByID(ctx context.Context, id string) error +} |