summaryrefslogtreecommitdiff
path: root/internal/processing/admin
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2024-06-06 15:43:25 +0200
committerLibravatar GitHub <noreply@github.com>2024-06-06 14:43:25 +0100
commitbcda048eab799284fc46d74706334bf9ef76dc83 (patch)
treec4595fe5e6e6fd570d59cee7095a336f2e884344 /internal/processing/admin
parentdrop date (#2969) (diff)
downloadgotosocial-bcda048eab799284fc46d74706334bf9ef76dc83.tar.xz
[feature] Self-serve email change for users (#2957)
* [feature] Email change * frontend stuff for changing email * docs * tests etc * differentiate more clearly between local user+account and account * populate user
Diffstat (limited to 'internal/processing/admin')
-rw-r--r--internal/processing/admin/signupapprove.go (renamed from internal/processing/admin/accountapprove.go)7
-rw-r--r--internal/processing/admin/signupapprove_test.go (renamed from internal/processing/admin/accountapprove_test.go)2
-rw-r--r--internal/processing/admin/signupreject.go (renamed from internal/processing/admin/accountreject.go)7
-rw-r--r--internal/processing/admin/signupreject_test.go (renamed from internal/processing/admin/accountreject_test.go)6
4 files changed, 14 insertions, 8 deletions
diff --git a/internal/processing/admin/accountapprove.go b/internal/processing/admin/signupapprove.go
index c3f6409c3..84e04fa8d 100644
--- a/internal/processing/admin/accountapprove.go
+++ b/internal/processing/admin/signupapprove.go
@@ -30,7 +30,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
-func (p *Processor) AccountApprove(
+func (p *Processor) SignupApprove(
ctx context.Context,
adminAcct *gtsmodel.Account,
accountID string,
@@ -55,7 +55,10 @@ func (p *Processor) AccountApprove(
if !*user.Approved {
// Process approval side effects asynschronously.
p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{
- APObjectType: ap.ActorPerson,
+ // Use ap.ObjectProfile here to
+ // distinguish this message (user model)
+ // from ap.ActorPerson (account model).
+ APObjectType: ap.ObjectProfile,
APActivityType: ap.ActivityAccept,
GTSModel: user,
Origin: adminAcct,
diff --git a/internal/processing/admin/accountapprove_test.go b/internal/processing/admin/signupapprove_test.go
index b6ca1ed32..58b8fdade 100644
--- a/internal/processing/admin/accountapprove_test.go
+++ b/internal/processing/admin/signupapprove_test.go
@@ -42,7 +42,7 @@ func (suite *AdminApproveTestSuite) TestApprove() {
*targetUser = *suite.testUsers["unconfirmed_account"]
// Approve the sign-up.
- acct, errWithCode := suite.adminProcessor.AccountApprove(
+ acct, errWithCode := suite.adminProcessor.SignupApprove(
ctx,
adminAcct,
targetAcct.ID,
diff --git a/internal/processing/admin/accountreject.go b/internal/processing/admin/signupreject.go
index 8cb54cad6..39eff0b87 100644
--- a/internal/processing/admin/accountreject.go
+++ b/internal/processing/admin/signupreject.go
@@ -30,7 +30,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/messages"
)
-func (p *Processor) AccountReject(
+func (p *Processor) SignupReject(
ctx context.Context,
adminAcct *gtsmodel.Account,
accountID string,
@@ -102,7 +102,10 @@ func (p *Processor) AccountReject(
// Process rejection side effects asynschronously.
p.state.Workers.Client.Queue.Push(&messages.FromClientAPI{
- APObjectType: ap.ActorPerson,
+ // Use ap.ObjectProfile here to
+ // distinguish this message (user model)
+ // from ap.ActorPerson (account model).
+ APObjectType: ap.ObjectProfile,
APActivityType: ap.ActivityReject,
GTSModel: deniedUser,
Origin: adminAcct,
diff --git a/internal/processing/admin/accountreject_test.go b/internal/processing/admin/signupreject_test.go
index 071401afc..cb6a25eb3 100644
--- a/internal/processing/admin/accountreject_test.go
+++ b/internal/processing/admin/signupreject_test.go
@@ -42,7 +42,7 @@ func (suite *AdminRejectTestSuite) TestReject() {
message = "Too stinky."
)
- acct, errWithCode := suite.adminProcessor.AccountReject(
+ acct, errWithCode := suite.adminProcessor.SignupReject(
ctx,
adminAcct,
targetAcct.ID,
@@ -104,7 +104,7 @@ func (suite *AdminRejectTestSuite) TestRejectRemote() {
)
// Try to reject a remote account.
- _, err := suite.adminProcessor.AccountReject(
+ _, err := suite.adminProcessor.SignupReject(
ctx,
adminAcct,
targetAcct.ID,
@@ -126,7 +126,7 @@ func (suite *AdminRejectTestSuite) TestRejectApproved() {
)
// Try to reject an already-approved account.
- _, err := suite.adminProcessor.AccountReject(
+ _, err := suite.adminProcessor.SignupReject(
ctx,
adminAcct,
targetAcct.ID,