From 846057f0d696fded87d105dec1245e9ba32763ce Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Sun, 11 Jul 2021 16:22:21 +0200 Subject: Block/unblock (#96) * remote + local block logic, incl. federation * improve blocking stuff * fiddle with display of blocked profiles * go fmt --- internal/processing/account/removeblock.go | 67 ++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 internal/processing/account/removeblock.go (limited to 'internal/processing/account/removeblock.go') diff --git a/internal/processing/account/removeblock.go b/internal/processing/account/removeblock.go new file mode 100644 index 000000000..03b0c6750 --- /dev/null +++ b/internal/processing/account/removeblock.go @@ -0,0 +1,67 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + 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 account + +import ( + "fmt" + + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/db" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" +) + +func (p *processor) BlockRemove(requestingAccount *gtsmodel.Account, targetAccountID string) (*apimodel.Relationship, gtserror.WithCode) { + // make sure the target account actually exists in our db + targetAcct := >smodel.Account{} + if err := p.db.GetByID(targetAccountID, targetAcct); err != nil { + if _, ok := err.(db.ErrNoEntries); ok { + return nil, gtserror.NewErrorNotFound(fmt.Errorf("BlockRemove: account %s not found in the db: %s", targetAccountID, err)) + } + } + + // check if a block exists, and remove it if it does (storing the URI for later) + var blockChanged bool + block := >smodel.Block{} + if err := p.db.GetWhere([]db.Where{ + {Key: "account_id", Value: requestingAccount.ID}, + {Key: "target_account_id", Value: targetAccountID}, + }, block); err == nil { + block.Account = requestingAccount + block.TargetAccount = targetAcct + if err := p.db.DeleteByID(block.ID, >smodel.Block{}); err != nil { + return nil, gtserror.NewErrorInternalError(fmt.Errorf("BlockRemove: error removing block from db: %s", err)) + } + blockChanged = true + } + + // block status changed so send the UNDO activity to the channel for async processing + if blockChanged { + p.fromClientAPI <- gtsmodel.FromClientAPI{ + APObjectType: gtsmodel.ActivityStreamsBlock, + APActivityType: gtsmodel.ActivityStreamsUndo, + GTSModel: block, + OriginAccount: requestingAccount, + TargetAccount: targetAcct, + } + } + + // return whatever relationship results from all this + return p.RelationshipGet(requestingAccount, targetAccountID) +} -- cgit v1.2.3