summaryrefslogtreecommitdiff
path: root/internal/typeutils
diff options
context:
space:
mode:
Diffstat (limited to 'internal/typeutils')
-rw-r--r--internal/typeutils/internaltoas.go26
-rw-r--r--internal/typeutils/internaltoas_test.go4
2 files changed, 30 insertions, 0 deletions
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go
index d317d6f39..d9d18e1c7 100644
--- a/internal/typeutils/internaltoas.go
+++ b/internal/typeutils/internaltoas.go
@@ -1988,6 +1988,16 @@ func (c *Converter) InteractionReqToASAccept(
return nil, gtserror.Newf("invalid interacting account uri: %w", err)
}
+ publicIRI, err := url.Parse(pub.PublicActivityPubIRI)
+ if err != nil {
+ return nil, gtserror.Newf("invalid public uri: %w", err)
+ }
+
+ followersIRI, err := url.Parse(req.TargetAccount.FollowersURI)
+ if err != nil {
+ return nil, gtserror.Newf("invalid followers uri: %w", err)
+ }
+
// Set id to the URI of
// interaction request.
ap.SetJSONLDId(accept, acceptID)
@@ -2003,6 +2013,9 @@ func (c *Converter) InteractionReqToASAccept(
// of interaction URI.
ap.AppendTo(accept, toIRI)
+ // Cc to the actor's followers, and to Public.
+ ap.AppendCc(accept, publicIRI, followersIRI)
+
return accept, nil
}
@@ -2034,6 +2047,16 @@ func (c *Converter) InteractionReqToASReject(
return nil, gtserror.Newf("invalid interacting account uri: %w", err)
}
+ publicIRI, err := url.Parse(pub.PublicActivityPubIRI)
+ if err != nil {
+ return nil, gtserror.Newf("invalid public uri: %w", err)
+ }
+
+ followersIRI, err := url.Parse(req.TargetAccount.FollowersURI)
+ if err != nil {
+ return nil, gtserror.Newf("invalid followers uri: %w", err)
+ }
+
// Set id to the URI of
// interaction request.
ap.SetJSONLDId(reject, rejectID)
@@ -2049,5 +2072,8 @@ func (c *Converter) InteractionReqToASReject(
// of interaction URI.
ap.AppendTo(reject, toIRI)
+ // Cc to the actor's followers, and to Public.
+ ap.AppendCc(reject, publicIRI, followersIRI)
+
return reject, nil
}
diff --git a/internal/typeutils/internaltoas_test.go b/internal/typeutils/internaltoas_test.go
index f10685aee..d0ed4204c 100644
--- a/internal/typeutils/internaltoas_test.go
+++ b/internal/typeutils/internaltoas_test.go
@@ -1181,6 +1181,10 @@ func (suite *InternalToASTestSuite) TestInteractionReqToASAccept() {
suite.Equal(`{
"@context": "https://www.w3.org/ns/activitystreams",
"actor": "http://localhost:8080/users/the_mighty_zork",
+ "cc": [
+ "https://www.w3.org/ns/activitystreams#Public",
+ "http://localhost:8080/users/the_mighty_zork/followers"
+ ],
"id": "http://localhost:8080/users/the_mighty_zork/accepts/01J1AKMZ8JE5NW0ZSFTRC1JJNE",
"object": "https://fossbros-anonymous.io/users/foss_satan/statuses/01J1AKRRHQ6MDDQHV0TP716T2K",
"to": "http://fossbros-anonymous.io/users/foss_satan",