4 files changed, 59 insertions, 0 deletions
diff --git a/internal/processing/admin.go b/internal/processing/admin.go
index 764e6d302..d3452968a 100644
--- a/internal/processing/admin.go
+++ b/internal/processing/admin.go
@@ -26,6 +26,10 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/oauth"
 )
 
+func (p *processor) AdminAccountAction(ctx context.Context, authed *oauth.Auth, form *apimodel.AdminAccountActionRequest) gtserror.WithCode {
+	return p.adminProcessor.AccountAction(ctx, authed.Account, form)
+}
+
 func (p *processor) AdminEmojiCreate(ctx context.Context, authed *oauth.Auth, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, gtserror.WithCode) {
 	return p.adminProcessor.EmojiCreate(ctx, authed.Account, authed.User, form)
 }
diff --git a/internal/processing/admin/accountaction.go b/internal/processing/admin/accountaction.go
new file mode 100644
index 000000000..c9b2edf64
--- /dev/null
+++ b/internal/processing/admin/accountaction.go
@@ -0,0 +1,52 @@
+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, account *gtsmodel.Account, form *apimodel.AdminAccountActionRequest) gtserror.WithCode {
+	targetAccount, err := p.db.GetAccountByID(ctx, form.TargetAccountID)
+	if err != nil {
+		return gtserror.NewErrorInternalError(err)
+	}
+
+	adminActionID, err := id.NewULID()
+	if err != nil {
+		return gtserror.NewErrorInternalError(err)
+	}
+
+	adminAction := &gtsmodel.AdminAccountAction{
+		ID:              adminActionID,
+		AccountID:       account.ID,
+		TargetAccountID: targetAccount.ID,
+		Text:            form.Text,
+	}
+
+	switch form.Type {
+	case string(gtsmodel.AdminActionSuspend):
+		adminAction.Type = gtsmodel.AdminActionSuspend
+		// pass the account delete through the client api channel for processing
+		p.fromClientAPI <- messages.FromClientAPI{
+			APObjectType:   ap.ActorPerson,
+			APActivityType: ap.ActivityDelete,
+			OriginAccount:  account,
+			TargetAccount:  targetAccount,
+		}
+	default:
+		return gtserror.NewErrorBadRequest(fmt.Errorf("admin action type %s is not supported for this endpoint", form.Type))
+	}
+
+	if err := p.db.Put(ctx, adminAction); err != nil {
+		return gtserror.NewErrorInternalError(err)
+	}
+
+	return nil
+}
diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index bdb586588..28d47acf1 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -38,6 +38,7 @@ type Processor interface {
 	DomainBlocksGet(ctx context.Context, account *gtsmodel.Account, export bool) ([]*apimodel.DomainBlock, gtserror.WithCode)
 	DomainBlockGet(ctx context.Context, account *gtsmodel.Account, id string, export bool) (*apimodel.DomainBlock, gtserror.WithCode)
 	DomainBlockDelete(ctx context.Context, account *gtsmodel.Account, id string) (*apimodel.DomainBlock, gtserror.WithCode)
+	AccountAction(ctx context.Context, account *gtsmodel.Account, form *apimodel.AdminAccountActionRequest) gtserror.WithCode
 	EmojiCreate(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, gtserror.WithCode)
 }
 
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index 973b44084..50f4af492 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -97,6 +97,8 @@ type Processor interface {
 	// AccountBlockRemove handles the removal of a block from authed account to target account, either remote or local.
 	AccountBlockRemove(ctx context.Context, authed *oauth.Auth, targetAccountID string) (*apimodel.Relationship, gtserror.WithCode)
 
+	// AdminAccountAction handles the creation/execution of an action on an account.
+	AdminAccountAction(ctx context.Context, authed *oauth.Auth, form *apimodel.AdminAccountActionRequest) gtserror.WithCode
 	// AdminEmojiCreate handles the creation of a new instance emoji by an admin, using the given form.
 	AdminEmojiCreate(ctx context.Context, authed *oauth.Auth, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, gtserror.WithCode)
 	// AdminDomainBlockCreate handles the creation of a new domain block by an admin, using the given form.