summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/status/boost.go4
-rw-r--r--internal/processing/status/create.go4
-rw-r--r--internal/processing/status/fave.go4
-rw-r--r--internal/processing/stream/statusupdate_test.go15
4 files changed, 21 insertions, 6 deletions
diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go
index c8c50d3ee..7c7162c12 100644
--- a/internal/processing/status/boost.go
+++ b/internal/processing/status/boost.go
@@ -96,7 +96,7 @@ func (p *Processor) BoostCreate(
// Derive pendingApproval status.
var pendingApproval bool
switch {
- case policyResult.WithApproval():
+ case policyResult.ManualApproval():
// We're allowed to do
// this pending approval.
pendingApproval = true
@@ -117,7 +117,7 @@ func (p *Processor) BoostCreate(
boost.PreApproved = true
}
- case policyResult.Permitted():
+ case policyResult.AutomaticApproval():
// We're permitted to do this
// based on another kind of match.
pendingApproval = false
diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go
index 8596f2f1a..23189411a 100644
--- a/internal/processing/status/create.go
+++ b/internal/processing/status/create.go
@@ -406,7 +406,7 @@ func (p *Processor) processInReplyTo(
// Derive pendingApproval status.
var pendingApproval bool
switch {
- case policyResult.WithApproval():
+ case policyResult.ManualApproval():
// We're allowed to do
// this pending approval.
pendingApproval = true
@@ -427,7 +427,7 @@ func (p *Processor) processInReplyTo(
status.PreApproved = true
}
- case policyResult.Permitted():
+ case policyResult.AutomaticApproval():
// We're permitted to do this
// based on another kind of match.
pendingApproval = false
diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go
index 95eb8bff2..52e6b9d43 100644
--- a/internal/processing/status/fave.go
+++ b/internal/processing/status/fave.go
@@ -112,7 +112,7 @@ func (p *Processor) FaveCreate(
)
switch {
- case policyResult.WithApproval():
+ case policyResult.ManualApproval():
// We're allowed to do
// this pending approval.
pendingApproval = true
@@ -133,7 +133,7 @@ func (p *Processor) FaveCreate(
preApproved = true
}
- case policyResult.Permitted():
+ case policyResult.AutomaticApproval():
// We're permitted to do this
// based on another kind of match.
pendingApproval = false
diff --git a/internal/processing/stream/statusupdate_test.go b/internal/processing/stream/statusupdate_test.go
index 0045cceed..f11ab40a2 100644
--- a/internal/processing/stream/statusupdate_test.go
+++ b/internal/processing/stream/statusupdate_test.go
@@ -135,6 +135,11 @@ func (suite *StatusUpdateTestSuite) TestStreamNotification() {
"poll": null,
"interaction_policy": {
"can_favourite": {
+ "automatic_approval": [
+ "public",
+ "me"
+ ],
+ "manual_approval": [],
"always": [
"public",
"me"
@@ -142,6 +147,11 @@ func (suite *StatusUpdateTestSuite) TestStreamNotification() {
"with_approval": []
},
"can_reply": {
+ "automatic_approval": [
+ "public",
+ "me"
+ ],
+ "manual_approval": [],
"always": [
"public",
"me"
@@ -149,6 +159,11 @@ func (suite *StatusUpdateTestSuite) TestStreamNotification() {
"with_approval": []
},
"can_reblog": {
+ "automatic_approval": [
+ "public",
+ "me"
+ ],
+ "manual_approval": [],
"always": [
"public",
"me"