From 89e0cfd8741b6763ca04e90558bccf4c3c380cfa Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:25:10 +0200 Subject: [feature] Admin accounts endpoints; approve/reject sign-ups (#2826) * update settings panels, add pending overview + approve/deny functions * add admin accounts get, approve, reject * send approved/rejected emails * use signup URL * docs! * email * swagger * web linting * fix email tests * wee lil fixerinos * use new paging logic for GetAccounts() series of admin endpoints, small changes to query building * shuffle useAccountIDIn check *before* adding to query * fix parse from toot react error * use `netip.Addr` * put valid slices in globals * optimistic updates for account state --------- Co-authored-by: kim --- internal/processing/admin/account.go | 102 ----------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 internal/processing/admin/account.go (limited to 'internal/processing/admin/account.go') diff --git a/internal/processing/admin/account.go b/internal/processing/admin/account.go deleted file mode 100644 index 155d8c0b4..000000000 --- a/internal/processing/admin/account.go +++ /dev/null @@ -1,102 +0,0 @@ -// 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 admin - -import ( - "context" - "fmt" - - "github.com/superseriousbusiness/gotosocial/internal/ap" - apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/gtserror" - "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" - "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/messages" -) - -func (p *Processor) AccountAction( - ctx context.Context, - adminAcct *gtsmodel.Account, - request *apimodel.AdminActionRequest, -) (string, gtserror.WithCode) { - targetAcct, err := p.state.DB.GetAccountByID(ctx, request.TargetID) - if err != nil { - err := gtserror.Newf("db error getting target account: %w", err) - return "", gtserror.NewErrorInternalError(err) - } - - switch gtsmodel.NewAdminActionType(request.Type) { - case gtsmodel.AdminActionSuspend: - return p.accountActionSuspend(ctx, adminAcct, targetAcct, request.Text) - - default: - // TODO: add more types to this slice when adding - // more types to the switch statement above. - supportedTypes := []string{ - gtsmodel.AdminActionSuspend.String(), - } - - err := fmt.Errorf( - "admin action type %s is not supported for this endpoint, "+ - "currently supported types are: %q", - request.Type, supportedTypes) - - return "", gtserror.NewErrorBadRequest(err, err.Error()) - } -} - -func (p *Processor) accountActionSuspend( - ctx context.Context, - adminAcct *gtsmodel.Account, - targetAcct *gtsmodel.Account, - text string, -) (string, gtserror.WithCode) { - actionID := id.NewULID() - - errWithCode := p.actions.Run( - ctx, - >smodel.AdminAction{ - ID: actionID, - TargetCategory: gtsmodel.AdminActionCategoryAccount, - TargetID: targetAcct.ID, - Target: targetAcct, - Type: gtsmodel.AdminActionSuspend, - AccountID: adminAcct.ID, - Text: text, - }, - func(ctx context.Context) gtserror.MultiError { - if err := p.state.Workers.ProcessFromClientAPI( - ctx, - messages.FromClientAPI{ - APObjectType: ap.ActorPerson, - APActivityType: ap.ActivityDelete, - OriginAccount: adminAcct, - TargetAccount: targetAcct, - }, - ); err != nil { - errs := gtserror.NewMultiError(1) - errs.Append(err) - return errs - } - - return nil - }, - ) - - return actionID, errWithCode -} -- cgit v1.2.3