diff options
author | 2024-08-24 11:49:37 +0200 | |
---|---|---|
committer | 2024-08-24 11:49:37 +0200 | |
commit | f23f04e0b1d117be714bf91d5266dab219ed741e (patch) | |
tree | 0b3ddd60d51c8729949c3669993910a7f8f32a7b /internal/db/bundb/migrations | |
parent | [performance] ffmpeg ffprobe wrapper improvements (#3225) (diff) | |
download | gotosocial-f23f04e0b1d117be714bf91d5266dab219ed741e.tar.xz |
[feature] Interaction requests client api + settings panel (#3215)
* [feature] Interaction requests client api + settings panel
* test accept / reject
* fmt
* don't pin rejected interaction
* use single db model for interaction accept, reject, and request
* swaggor
* env sharting
* append errors
* remove ErrNoEntries checks
* change intReqID to reqID
* rename "pend" to "request"
* markIntsPending -> mark interactionsPending
* use log instead of returning error when rejecting interaction
* empty migration
* jolly renaming
* make interactionURI unique again
* swag grr
* remove unnecessary locks
* invalidate as last step
Diffstat (limited to 'internal/db/bundb/migrations')
-rw-r--r-- | internal/db/bundb/migrations/20240716151327_interaction_policy.go | 29 | ||||
-rw-r--r-- | internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go | 154 |
2 files changed, 154 insertions, 29 deletions
diff --git a/internal/db/bundb/migrations/20240716151327_interaction_policy.go b/internal/db/bundb/migrations/20240716151327_interaction_policy.go index fb0d1d752..210d4b2c5 100644 --- a/internal/db/bundb/migrations/20240716151327_interaction_policy.go +++ b/internal/db/bundb/migrations/20240716151327_interaction_policy.go @@ -20,41 +20,12 @@ package migrations import ( "context" - gtsmodel "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.InteractionApproval{}). - IfNotExists(). - Exec(ctx); err != nil { - return err - } - - if _, err := tx. - NewCreateIndex(). - Table("interaction_approvals"). - Index("interaction_approvals_account_id_idx"). - Column("account_id"). - IfNotExists(). - Exec(ctx); err != nil { - return err - } - - if _, err := tx. - NewCreateIndex(). - Table("interaction_approvals"). - Index("interaction_approvals_interacting_account_id_idx"). - Column("interacting_account_id"). - IfNotExists(). - Exec(ctx); err != nil { - return err - } - return nil }) } diff --git a/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go b/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go new file mode 100644 index 000000000..82c2b4016 --- /dev/null +++ b/internal/db/bundb/migrations/20240809134448_interaction_requests_client_api.go @@ -0,0 +1,154 @@ +// 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/superseriousbusiness/gotosocial/internal/typeutils" + + "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 { + + // Drop interaction approvals table if it exists, + // ie., if instance was running on main between now + // and 2024-07-16. + // + // We might lose some interaction approvals this way, + // but since they weren't *really* used much yet this + // it's not a big deal, that's the running-on-main life! + if _, err := tx.NewDropTable(). + Table("interaction_approvals"). + IfExists(). + Exec(ctx); err != nil { + return err + } + + // Add `interaction_requests` + // table and new indexes. + if _, err := tx. + NewCreateTable(). + Model(>smodel.InteractionRequest{}). + IfNotExists(). + Exec(ctx); err != nil { + return err + } + + for idx, col := range map[string]string{ + "interaction_requests_status_id_idx": "status_id", + "interaction_requests_target_account_id_idx": "target_account_id", + "interaction_requests_interacting_account_id_idx": "interacting_account_id", + } { + if _, err := tx. + NewCreateIndex(). + Table("interaction_requests"). + Index(idx). + Column(col). + IfNotExists(). + Exec(ctx); err != nil { + return err + } + } + + // Select all pending statuses (replies or boosts). + pendingStatuses := []*gtsmodel.Status{} + err := tx. + NewSelect(). + Model(&pendingStatuses). + Column( + "created_at", + "in_reply_to_id", + "boost_of_id", + "in_reply_to_account_id", + "boost_of_account_id", + "account_id", + "uri", + ). + Where("? = ?", bun.Ident("pending_approval"), true). + Scan(ctx) + if err != nil { + return err + } + + // For each currently pending status, check whether it's a reply or + // a boost, and insert a corresponding interaction request into the db. + for _, pendingStatus := range pendingStatuses { + req, err := typeutils.StatusToInteractionRequest(ctx, pendingStatus) + if err != nil { + return err + } + + if _, err := tx. + NewInsert(). + Model(req). + Exec(ctx); err != nil { + return err + } + } + + // Now do the same thing for pending faves. + pendingFaves := []*gtsmodel.StatusFave{} + err = tx. + NewSelect(). + Model(&pendingFaves). + Column( + "created_at", + "status_id", + "target_account_id", + "account_id", + "uri", + ). + Where("? = ?", bun.Ident("pending_approval"), true). + Scan(ctx) + if err != nil { + return err + } + + for _, pendingFave := range pendingFaves { + req, err := typeutils.StatusFaveToInteractionRequest(ctx, pendingFave) + if err != nil { + return err + } + + if _, err := tx. + NewInsert(). + Model(req). + 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) + } +} |